restrict to 2M no FS

Author: d-a-v

boards.txt

@@ -4621,56 +4621,6 @@ agruminolemon.upload.resetmethod=--before default_reset --after hard_reset
 agruminolemon.build.flash_mode=dio
 agruminolemon.build.flash_flags=-DFLASHMODE_DIO
 agruminolemon.build.flash_freq=40
-agruminolemon.menu.eesz.2M64=2MB (FS:64KB OTA:~992KB)
-agruminolemon.menu.eesz.2M64.build.flash_size=2M
-agruminolemon.menu.eesz.2M64.build.flash_size_bytes=0x200000
-agruminolemon.menu.eesz.2M64.build.flash_ld=eagle.flash.2m64.ld
-agruminolemon.menu.eesz.2M64.build.spiffs_pagesize=256
-agruminolemon.menu.eesz.2M64.upload.maximum_size=1044464
-agruminolemon.menu.eesz.2M64.build.rfcal_addr=0x1FC000
-agruminolemon.menu.eesz.2M64.build.spiffs_start=0x1F0000
-agruminolemon.menu.eesz.2M64.build.spiffs_end=0x1FB000
-agruminolemon.menu.eesz.2M64.build.spiffs_blocksize=4096
-agruminolemon.menu.eesz.2M128=2MB (FS:128KB OTA:~960KB)
-agruminolemon.menu.eesz.2M128.build.flash_size=2M
-agruminolemon.menu.eesz.2M128.build.flash_size_bytes=0x200000
-agruminolemon.menu.eesz.2M128.build.flash_ld=eagle.flash.2m128.ld
-agruminolemon.menu.eesz.2M128.build.spiffs_pagesize=256
-agruminolemon.menu.eesz.2M128.upload.maximum_size=1044464
-agruminolemon.menu.eesz.2M128.build.rfcal_addr=0x1FC000
-agruminolemon.menu.eesz.2M128.build.spiffs_start=0x1E0000
-agruminolemon.menu.eesz.2M128.build.spiffs_end=0x1FB000
-agruminolemon.menu.eesz.2M128.build.spiffs_blocksize=4096
-agruminolemon.menu.eesz.2M256=2MB (FS:256KB OTA:~896KB)
-agruminolemon.menu.eesz.2M256.build.flash_size=2M
-agruminolemon.menu.eesz.2M256.build.flash_size_bytes=0x200000
-agruminolemon.menu.eesz.2M256.build.flash_ld=eagle.flash.2m256.ld
-agruminolemon.menu.eesz.2M256.build.spiffs_pagesize=256
-agruminolemon.menu.eesz.2M256.upload.maximum_size=1044464
-agruminolemon.menu.eesz.2M256.build.rfcal_addr=0x1FC000
-agruminolemon.menu.eesz.2M256.build.spiffs_start=0x1C0000
-agruminolemon.menu.eesz.2M256.build.spiffs_end=0x1FB000
-agruminolemon.menu.eesz.2M256.build.spiffs_blocksize=4096
-agruminolemon.menu.eesz.2M512=2MB (FS:512KB OTA:~768KB)
-agruminolemon.menu.eesz.2M512.build.flash_size=2M
-agruminolemon.menu.eesz.2M512.build.flash_size_bytes=0x200000
-agruminolemon.menu.eesz.2M512.build.flash_ld=eagle.flash.2m512.ld
-agruminolemon.menu.eesz.2M512.build.spiffs_pagesize=256
-agruminolemon.menu.eesz.2M512.upload.maximum_size=1044464
-agruminolemon.menu.eesz.2M512.build.rfcal_addr=0x1FC000
-agruminolemon.menu.eesz.2M512.build.spiffs_start=0x180000
-agruminolemon.menu.eesz.2M512.build.spiffs_end=0x1FA000
-agruminolemon.menu.eesz.2M512.build.spiffs_blocksize=8192
-agruminolemon.menu.eesz.2M1M=2MB (FS:1MB OTA:~512KB)
-agruminolemon.menu.eesz.2M1M.build.flash_size=2M
-agruminolemon.menu.eesz.2M1M.build.flash_size_bytes=0x200000
-agruminolemon.menu.eesz.2M1M.build.flash_ld=eagle.flash.2m1m.ld
-agruminolemon.menu.eesz.2M1M.build.spiffs_pagesize=256
-agruminolemon.menu.eesz.2M1M.upload.maximum_size=1044464
-agruminolemon.menu.eesz.2M1M.build.rfcal_addr=0x1FC000
-agruminolemon.menu.eesz.2M1M.build.spiffs_start=0x100000
-agruminolemon.menu.eesz.2M1M.build.spiffs_end=0x1FA000
-agruminolemon.menu.eesz.2M1M.build.spiffs_blocksize=8192
 agruminolemon.menu.eesz.2M=2MB (FS:none OTA:~1019KB)
 agruminolemon.menu.eesz.2M.build.flash_size=2M
 agruminolemon.menu.eesz.2M.build.flash_size_bytes=0x200000

tools/boards.txt.py

@@ -305,7 +305,7 @@
             'resetmethod_nodemcu',
             'flashmode_dio',
             'flashfreq_40',
-            '2M',
+            '2M0',
             ],
         'desc': [ 'Procuct page https://www.lifely.cc',
                   '',
@@ -1445,6 +1445,7 @@ def all_flash_map ():
 
     f512 = collections.OrderedDict([])
     f1m  = collections.OrderedDict([])
+    f2m0 = collections.OrderedDict([])
     f2m  = collections.OrderedDict([])
     f4m  = collections.OrderedDict([])
     f8m  = collections.OrderedDict([])
@@ -1461,6 +1462,8 @@ def all_flash_map ():
     f1m.update( flash_map(    1024,     512 ))
     f1m.update( flash_map(    1024))
 
+    f2m0.update(flash_map(  2*1024))
+
     f2m.update( flash_map(  2*1024,      64 ))
     f2m.update( flash_map(  2*1024,     128 ))
     f2m.update( flash_map(  2*1024,     256 ))
@@ -1490,6 +1493,7 @@ def all_flash_map ():
     return {
         '512K': f512,
           '1M':  f1m,
+          '2M0': f2m0,
           '2M':  f2m,
           '4M':  f4m,
           '8M':  f8m,