regenerate all ldscripts

dist/ld/latest/eagle.flash.1m0k1s.ld

@@ -0,0 +1,20 @@
+/*
+sketch: 999KB
+spiffs: 0KB
+eeprom: 4KB
+*/
+
+MEMORY
+{
+  dport0_0_seg :                        org = 0x3FF00000, len = 0x10
+  dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
+  iram1_0_seg :                         org = 0x40100000, len = 0x8000
+  irom0_0_seg :                         org = 0x40201010, len = 0xf9ff0
+}
+
+PROVIDE ( _SPIFFS_start = 0x402fb000 );
+PROVIDE ( _SPIFFS_end = 0x402fb000 );
+PROVIDE ( _SPIFFS_page = 0x0 );
+PROVIDE ( _SPIFFS_block = 0x0 );
+
+INCLUDE "local.eagle.app.v6.common.ld"

dist/ld/latest/eagle.flash.1m0k2s.ld

@@ -0,0 +1,20 @@
+/*
+sketch: 995KB
+spiffs: 0KB
+eeprom: 8KB
+*/
+
+MEMORY
+{
+  dport0_0_seg :                        org = 0x3FF00000, len = 0x10
+  dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
+  iram1_0_seg :                         org = 0x40100000, len = 0x8000
+  irom0_0_seg :                         org = 0x40201010, len = 0xf8ff0
+}
+
+PROVIDE ( _SPIFFS_start = 0x402fa000 );
+PROVIDE ( _SPIFFS_end = 0x402fa000 );
+PROVIDE ( _SPIFFS_page = 0x0 );
+PROVIDE ( _SPIFFS_block = 0x0 );
+
+INCLUDE "local.eagle.app.v6.common.ld"

dist/ld/latest/eagle.flash.512k0k1s.ld

@@ -0,0 +1,20 @@
+/*
+sketch: 487KB
+spiffs: 0KB
+eeprom: 4KB
+*/
+
+MEMORY
+{
+  dport0_0_seg :                        org = 0x3FF00000, len = 0x10
+  dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
+  iram1_0_seg :                         org = 0x40100000, len = 0x8000
+  irom0_0_seg :                         org = 0x40201010, len = 0x79ff0
+}
+
+PROVIDE ( _SPIFFS_start = 0x4027b000 );
+PROVIDE ( _SPIFFS_end = 0x4027b000 );
+PROVIDE ( _SPIFFS_page = 0x0 );
+PROVIDE ( _SPIFFS_block = 0x0 );
+
+INCLUDE "local.eagle.app.v6.common.ld"

dist/ld/latest/eagle.flash.512k0m1s.ld

@@ -1,7 +1,8 @@
-/* Flash Split for 512K chips, no SPIFFS, 1 sector for EEPROM */
-/* sketch 487KB */
-/* eeprom 4KB */
-/* reserved 16KB */
+/*
+sketch: 487KB
+spiffs: 0KB
+eeprom: 4KB
+*/
 
 MEMORY
 {
@@ -11,8 +12,8 @@ MEMORY
   irom0_0_seg :                         org = 0x40201010, len = 0x79ff0
 }
 
-PROVIDE ( _SPIFFS_start = 0x4027B000 );
-PROVIDE ( _SPIFFS_end = 0x4027B000 );
+PROVIDE ( _SPIFFS_start = 0x4027b000 );
+PROVIDE ( _SPIFFS_end = 0x4027b000 );
 PROVIDE ( _SPIFFS_page = 0x0 );
 PROVIDE ( _SPIFFS_block = 0x0 );
 

dist/ld/pre_2.5.0/eagle.flash.1m0k1s.ld

@@ -0,0 +1,20 @@
+/*
+sketch: 999KB
+spiffs: 0KB
+eeprom: 4KB
+*/
+
+MEMORY
+{
+  dport0_0_seg :                        org = 0x3FF00000, len = 0x10
+  dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
+  iram1_0_seg :                         org = 0x40100000, len = 0x8000
+  irom0_0_seg :                         org = 0x40201010, len = 0xf9ff0
+}
+
+PROVIDE ( _SPIFFS_start = 0x402fb000 );
+PROVIDE ( _SPIFFS_end = 0x402fb000 );
+PROVIDE ( _SPIFFS_page = 0x0 );
+PROVIDE ( _SPIFFS_block = 0x0 );
+
+INCLUDE "eagle.app.v6.common.ld"

dist/ld/pre_2.5.0/eagle.flash.1m0k2s.ld

@@ -0,0 +1,20 @@
+/*
+sketch: 995KB
+spiffs: 0KB
+eeprom: 8KB
+*/
+
+MEMORY
+{
+  dport0_0_seg :                        org = 0x3FF00000, len = 0x10
+  dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
+  iram1_0_seg :                         org = 0x40100000, len = 0x8000
+  irom0_0_seg :                         org = 0x40201010, len = 0xf8ff0
+}
+
+PROVIDE ( _SPIFFS_start = 0x402fa000 );
+PROVIDE ( _SPIFFS_end = 0x402fa000 );
+PROVIDE ( _SPIFFS_page = 0x0 );
+PROVIDE ( _SPIFFS_block = 0x0 );
+
+INCLUDE "eagle.app.v6.common.ld"

dist/ld/pre_2.5.0/eagle.flash.512k0k1s.ld

@@ -0,0 +1,20 @@
+/*
+sketch: 487KB
+spiffs: 0KB
+eeprom: 4KB
+*/
+
+MEMORY
+{
+  dport0_0_seg :                        org = 0x3FF00000, len = 0x10
+  dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
+  iram1_0_seg :                         org = 0x40100000, len = 0x8000
+  irom0_0_seg :                         org = 0x40201010, len = 0x79ff0
+}
+
+PROVIDE ( _SPIFFS_start = 0x4027b000 );
+PROVIDE ( _SPIFFS_end = 0x4027b000 );
+PROVIDE ( _SPIFFS_page = 0x0 );
+PROVIDE ( _SPIFFS_block = 0x0 );
+
+INCLUDE "eagle.app.v6.common.ld"

dist/ld/pre_2.5.0/eagle.flash.512k0m1s.ld

@@ -1,7 +1,8 @@
-/* Flash Split for 512K chips, no SPIFFS, 1 sector for EEPROM */
-/* sketch 487KB */
-/* eeprom 4KB */
-/* reserved 16KB */
+/*
+sketch: 487KB
+spiffs: 0KB
+eeprom: 4KB
+*/
 
 MEMORY
 {
@@ -11,8 +12,8 @@ MEMORY
   irom0_0_seg :                         org = 0x40201010, len = 0x79ff0
 }
 
-PROVIDE ( _SPIFFS_start = 0x4027B000 );
-PROVIDE ( _SPIFFS_end = 0x4027B000 );
+PROVIDE ( _SPIFFS_start = 0x4027b000 );
+PROVIDE ( _SPIFFS_end = 0x4027b000 );
 PROVIDE ( _SPIFFS_page = 0x0 );
 PROVIDE ( _SPIFFS_block = 0x0 );
 

dist/ldscript_gen.py

@@ -23,6 +23,7 @@
 # supported sizes
 # flash (bytes), spiffs (bytes), eeprom (sectors)
 VARIANTS = [
+    [SIZE[512], 0, 1],
     [SIZE[1024], 0, 1],
     [SIZE[1024], 0, 2],
     [SIZE[2048], SIZE[1024], 4],
@@ -31,15 +32,32 @@
 ]
 
 
+def size_suffix(size):
+    if size >= SIZE[1024] or not size:
+        size = trunc(size / SIZE[1024])
+        suffix = "m"
+    else:
+        size = trunc(size / 1024)
+        suffix = "k"
+
+    return size, suffix
+
+
 def variant_name(variant):
-    tmpl = "{}m{}m{}s"
+    tmpl = "{flash_size}{flash_suffix}{spiffs_size}{spiffs_suffix}{sectors}s"
 
-    size, spiffs, sectors = variant
+    flash_size, spiffs_size, sectors = variant
 
-    size = trunc(size / SIZE[1024])
-    spiffs = trunc(spiffs / SIZE[1024])
+    flash_size, flash_suffix = size_suffix(flash_size)
+    spiffs_size, spiffs_suffix = size_suffix(spiffs_size)
 
-    return tmpl.format(size, spiffs, sectors)
+    return tmpl.format(
+        flash_size=flash_size,
+        flash_suffix=flash_suffix,
+        spiffs_size=spiffs_size,
+        spiffs_suffix=spiffs_suffix,
+        sectors=sectors,
+    )
 
 
 TEMPLATE = """\