Updates to support platformio, maybe.

mhightower83 · mhightower83 · commit edf008abff8f · 2020-03-04T19:30:41.000-08:00
diff --git a/boards.txt b/boards.txt
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
@@ -1215,9 +1215,9 @@
         ( '.menu.mmu.3232.build.mmuflags', '-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000'),
         ( '.menu.mmu.4816', '16KB cache + 48KB IRAM (IRAM)' ),
         ( '.menu.mmu.4816.build.mmuflags', '-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000' ),
-        ( '.menu.mmu.4816H', '16KB cache + 48KB IRAM (IRAM and Heap)' ),
+        ( '.menu.mmu.4816H', '16KB cache + 48KB IRAM and 2nd Heap (shared)' ),
         ( '.menu.mmu.4816H.build.mmuflags', '-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_IRAM_HEAP' ),
-        ( '.menu.mmu.3216', '16KB cache + 32KB IRAM + 16KB sec heap (Heap)' ),
+        ( '.menu.mmu.3216', '16KB cache + 32KB IRAM + 16KB 2nd Heap (not shared)' ),
         ( '.menu.mmu.3216.build.mmuflags', '-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_SEC_HEAP=0x40108000 -DMMU_SEC_HEAP_SIZE=0x4000' ),
         ]),
 
@@ -1399,7 +1399,8 @@ def flash_map (flashsize_kb, fs_kb = 0):
         print("{")
         print("  dport0_0_seg :                        org = 0x3FF00000, len = 0x10")
         print("  dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000")
-        print("  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */")
+        # Moved to ld/eagle.app.v6.common.ld.h as a 2nd MEMORY command.
+        # print("  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE")
         print("  irom0_0_seg :                         org = 0x40201010, len = 0x%x" % max_upload_size)
         print("}")
         print("")
diff --git a/tools/sdk/ld/eagle.app.v6.common.ld.h b/tools/sdk/ld/eagle.app.v6.common.ld.h
@@ -1,6 +1,15 @@
 /* This linker script generated from xt-genldscripts.tpp for LSP . */
 /* Linker Script for ld -N */
 
+/* The restriction to one MEMORY command, appears to be a restriction in
+   past versions. https://stackoverflow.com/a/55673816
+   This 2nd MEMORY command appears to work fine.
+*/
+MEMORY
+{
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
+}
+
 PHDRS
 {
   dport0_0_phdr PT_LOAD;
@@ -88,7 +97,7 @@ SECTIONS
   {
     *(.noinit)
   } >dram0_0_seg :dram0_0_phdr
-  
+
 #ifdef VTABLES_IN_DRAM
 #include "eagle.app.v6.common.ld.vtables.h"
 #endif
diff --git a/tools/sdk/ld/eagle.flash.16m14m.ld b/tools/sdk/ld/eagle.flash.16m14m.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.16m15m.ld b/tools/sdk/ld/eagle.flash.16m15m.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.1m.ld b/tools/sdk/ld/eagle.flash.1m.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xf9ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.1m128.ld b/tools/sdk/ld/eagle.flash.1m128.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xd9ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.1m144.ld b/tools/sdk/ld/eagle.flash.1m144.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xd5ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.1m160.ld b/tools/sdk/ld/eagle.flash.1m160.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xd1ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.1m192.ld b/tools/sdk/ld/eagle.flash.1m192.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xc9ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.1m256.ld b/tools/sdk/ld/eagle.flash.1m256.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xb9ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.1m512.ld b/tools/sdk/ld/eagle.flash.1m512.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0x79ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.1m64.ld b/tools/sdk/ld/eagle.flash.1m64.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xe9ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.2m.ld b/tools/sdk/ld/eagle.flash.2m.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.2m128.ld b/tools/sdk/ld/eagle.flash.2m128.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.2m1m.ld b/tools/sdk/ld/eagle.flash.2m1m.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.2m256.ld b/tools/sdk/ld/eagle.flash.2m256.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.2m512.ld b/tools/sdk/ld/eagle.flash.2m512.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.2m64.ld b/tools/sdk/ld/eagle.flash.2m64.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.4m.ld b/tools/sdk/ld/eagle.flash.4m.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.4m1m.ld b/tools/sdk/ld/eagle.flash.4m1m.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.4m2m.ld b/tools/sdk/ld/eagle.flash.4m2m.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.4m3m.ld b/tools/sdk/ld/eagle.flash.4m3m.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.512k.ld b/tools/sdk/ld/eagle.flash.512k.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0x79ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.512k128.ld b/tools/sdk/ld/eagle.flash.512k128.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0x59ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.512k32.ld b/tools/sdk/ld/eagle.flash.512k32.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0x71ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.512k64.ld b/tools/sdk/ld/eagle.flash.512k64.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0x69ff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.8m6m.ld b/tools/sdk/ld/eagle.flash.8m6m.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.flash.8m7m.ld b/tools/sdk/ld/eagle.flash.8m7m.ld
@@ -10,7 +10,6 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
diff --git a/tools/sdk/ld/eagle.rom.addr.v6.ld b/tools/sdk/ld/eagle.rom.addr.v6.ld
@@ -79,6 +79,11 @@ PROVIDE ( _xtos_l1int_handler = 0x4000048c );
 PROVIDE ( _xtos_p_none = 0x4000dbf8 );
 PROVIDE ( _xtos_restore_intlevel = 0x4000056c );
 PROVIDE ( _xtos_return_from_exc = 0x4000dc54 );
+
+/* Added to support replacing the ROM _xtos_c_wrapper_handler */
+PROVIDE ( _xtos_c_handler_table = 0x3fffc100 );
+PROVIDE ( _xtos_exc_handler_table = 0x3fffc000 );
+
 PROVIDE ( _xtos_set_exception_handler = 0x40000454 );
 PROVIDE ( _xtos_set_interrupt_handler = 0x4000bd70 );
 PROVIDE ( _xtos_set_interrupt_handler_arg = 0x4000bd28 );

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ MEMORY`
`10`	`10`	`{`
`11`	`11`	`dport0_0_seg : org = 0x3FF00000, len = 0x10`
`12`	`12`	`dram0_0_seg : org = 0x3FFE8000, len = 0x14000`
`13`		`- iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */`
`14`	`13`	`irom0_0_seg : org = 0x40201010, len = 0xfeff0`
`15`	`14`	`}`
`16`	`15`