Cleanup part III

mhightower83 · mhightower83 · commit 71e36cbeabc5 · 2020-03-02T19:16:44.000-08:00
diff --git a/libraries/esp8266/examples/MMU48K/MMU48K.ino b/libraries/esp8266/examples/MMU48K/MMU48K.ino
@@ -326,8 +326,6 @@ int divideA_B(int a, int b) {
 extern "C" void _text_end(void);
 
 extern "C" void umm_init_iram(void) {
-
-void umm_init_iram(void) {
   uint32_t sec_heap = (uint32_t)_text_end + 32;
   sec_heap &= ~7;
   size_t   sec_heap_sz = 0xC000UL - (sec_heap - 0x40100000UL);
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
@@ -1399,7 +1399,7 @@ 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: IRAM_SIZE */")
+        print("  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual 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.flash.16m14m.ld b/tools/sdk/ld/eagle.flash.16m14m.ld
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  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,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
+  iram1_0_seg :                         org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ 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: IRAM_SIZE */`
	`13`	`+ iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: MMU_IRAM_SIZE */`
`14`	`14`	`irom0_0_seg : org = 0x40201010, len = 0xfeff0`
`15`	`15`	`}`
`16`	`16`