Merge pull request #103 from arduino/new-partition-table

New partition table: move NVS at the end of flash

Author: pennam

Makefile

@@ -27,4 +27,7 @@ include $(IDF_PATH)/make/project.mk
 firmware: all
 	python combine.py
 
-.PHONY: firmware
+clean:
+	rm -rf NINA_W102*
+
+.PHONY: firmware, clean

combine.py

@@ -7,40 +7,73 @@
 phyData = open("data/phy.bin", "rb").read()
 certsData = open("data/roots.pem", "rb").read()
 appData = open("build/nina-fw.bin", "rb").read()
+spiffsData = open("data/spiffs.bin", "rb").read()
 
-# calculate the output binary size, app offset 
+# Offset   Size     Name
+# 0x001000 0x007000 bootloader
+# 0x008000 0x001000 partitions
+# 0x009000 0x001000 phy data
+# 0x00A000 0x026000 certs
+# 0x030000 0x180000 app
+# 0x1B0000 0x040000 spiffs
+# 0x1F0000 0x010000 nvs
+
+# calculate the output binary size, app offset
 outputSize = 0x30000 + len(appData)
 if (outputSize % 1024):
-	outputSize += 1024 - (outputSize % 1024)
+    outputSize += 1024 - (outputSize % 1024)
 
 # allocate and init to 0xff
-outputData = bytearray(b'\xff') * outputSize
+outputData = bytearray(b'\xff') * 0x200000
 
-# copy data: bootloader, partitions, app
+# copy data: bootloader, partitions, phy, certs, app
 for i in range(0, len(booloaderData)):
-	outputData[0x1000 + i] = booloaderData[i]
+    outputData[0x1000 + i] = booloaderData[i]
 
 for i in range(0, len(partitionData)):
-	outputData[0x8000 + i] = partitionData[i]
+    outputData[0x8000 + i] = partitionData[i]
 
 for i in range(0, len(phyData)):
-        outputData[0xf000 + i] = phyData[i]
+    outputData[0x9000 + i] = phyData[i]
 
 for i in range(0, len(certsData)):
-        outputData[0x10000 + i] = certsData[i]
+    outputData[0xA000 + i] = certsData[i]
 
 # zero terminate the pem file
-outputData[0x10000 + len(certsData)] = 0
+outputData[0xA000 + len(certsData)] = 0
 
 for i in range(0, len(appData)):
-	outputData[0x30000 + i] = appData[i]
+    outputData[0x30000 + i] = appData[i]
+
+# add empty spiffs
+for i in range(0, len(spiffsData)):
+    outputData[0x1B0000 + i] = spiffsData[i]
 
 
-outputFilename = "NINA_W102.bin"
+baseFilename = "NINA_W102"
 if (len(sys.argv) > 1):
-	outputFilename = sys.argv[1]
+    baseFilename = sys.argv[1]
+
+outputFilename = baseFilename + ".bin"
+# write out
+with open(outputFilename,"w+b") as f:
+    f.seek(0)
+    f.write(outputData[:outputSize])
+
+outputFilename = baseFilename + "_BOOT_APP.bin"
+# write out
+with open(outputFilename,"w+b") as f:
+    f.seek(0)
+    f.write(outputData[:outputSize])
+
+outputFilename = baseFilename + "_APP.bin"
+# write out
+with open(outputFilename,"w+b") as f:
+    f.seek(0)
+    f.write(outputData[0x30000:outputSize])
 
+outputFilename = baseFilename + "_ALL.bin"
 # write out
 with open(outputFilename,"w+b") as f:
-	f.seek(0)
-	f.write(outputData)
+    f.seek(0)
+    f.write(outputData)

data/spiffs.bin

@@ -1,7 +1,7 @@
 # Name,   Type, SubType, Offset,  Size
 # Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild
-nvs,      data, nvs,     0x9000,  0x6000
-phy_init, data, phy,     0xf000,  0x1000
-certs,    data, 0x04,    0x10000, 0x20000
+phy_init, data, phy,     0x9000,  0x001000
+certs,    data, 0x06,    0xA000,  0x026000
 factory,  app,  factory, 0x30000, 0x180000
-storage,  data, spiffs,  0x1B0000,0x40000
+storage,  data, spiffs,  0x1B0000,0x040000
+nvs,      data, nvs,     0x1F0000,0x010000