]> granicus.if.org Git - esp-idf/commitdiff
component/bt : new coexist lib
authorTian Hao <tianhao@espressif.com>
Mon, 17 Oct 2016 07:47:45 +0000 (15:47 +0800)
committerTian Hao <tianhao@espressif.com>
Mon, 17 Oct 2016 07:47:45 +0000 (15:47 +0800)
change boot loader.ld , the 0x40098000 may set other instructions

components/bootloader/src/main/esp32.bootloader.ld
components/bt/lib
components/esp32/lib
examples/07_blufi/main/demo_main.c

index af97bda3ad67aafcb55af9a94bcb397091a6921f..58935fe5005c9991791ab4b8271e4942ef31d01c 100644 (file)
@@ -15,7 +15,7 @@ MEMORY
   of the various regions. The 'data access port' dram/drom regions map to the same iram/irom regions but
   are connected to the data port of the CPU and eg allow bytewise access. */
   dport0_seg (RW) :                    org = 0x3FF00000, len = 0x10            /* IO */
-  iram_seg (RWX) :                     org = 0x40098000, len = 0x1000          
+  iram_seg (RWX) :                     org = 0x4009A000, len = 0x1000          
   iram_pool_1_seg (RWX) :           org = 0x40078000, len = 0x8000    /* IRAM POOL1, used for APP CPU cache. We can abuse it in bootloader because APP CPU is still held in reset, until we enable APP CPU cache */
   dram_seg (RW) :                      org = 0x3FFC0000, len = 0x20000         /* Shared RAM, minus rom bss/data/stack.*/
 }
index 079b86ab34b57a6d62beb3f171af99399d45eb09..0c3df46cb357b795ff217e68f7a8fb56d68c537f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 079b86ab34b57a6d62beb3f171af99399d45eb09
+Subproject commit 0c3df46cb357b795ff217e68f7a8fb56d68c537f
index ae7d66f7edb4f30372c9a620ac07e4559f55a85a..0ee9babfd9a9c95ff0395d442153df894df550f2 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ae7d66f7edb4f30372c9a620ac07e4559f55a85a
+Subproject commit 0ee9babfd9a9c95ff0395d442153df894df550f2
index ff6526c49249876117eccbbd10b4d7043281fc59..ec96c20c0400a971cf8bc8e0d960dc1d5c73f3fb 100644 (file)
@@ -113,7 +113,6 @@ void app_main()
 {
     esp_err_t ret;
 
-    phy_set_wifi_mode_only(0);
     nvs_flash_init();
     system_init();
     initialise_wifi();