move partition table to other default configs

ctag-fh-kiel · Dec 7, 2024 · 491e7f5 · 491e7f5
1 parent 260d5d2
commit 491e7f5
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 21 deletions.
diff --git a/config/esp_sdkconfigs/sdkconfig.defaults.aem b/config/esp_sdkconfigs/sdkconfig.defaults.aem
@@ -333,8 +333,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="config/storage/partitions_tbd.default.csv"
+CONFIG_PARTITION_TABLE_FILENAME="config/storage/partitions_tbd.default.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

diff --git a/config/esp_sdkconfigs/sdkconfig.defaults.bba-serial b/config/esp_sdkconfigs/sdkconfig.defaults.bba-serial
@@ -458,8 +458,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="config/storage/partitions_tbd.default.csv"
+CONFIG_PARTITION_TABLE_FILENAME="config/storage/partitions_tbd.default.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

diff --git a/config/esp_sdkconfigs/sdkconfig.defaults.bba1 b/config/esp_sdkconfigs/sdkconfig.defaults.bba1
@@ -470,8 +470,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="config/storage/partitions_tbd.default.csv"
+CONFIG_PARTITION_TABLE_FILENAME="config/storage/partitions_tbd.default.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

diff --git a/config/esp_sdkconfigs/sdkconfig.defaults.bba2 b/config/esp_sdkconfigs/sdkconfig.defaults.bba2
@@ -458,8 +458,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="config/storage/partitions_tbd.default.csv"
+CONFIG_PARTITION_TABLE_FILENAME="config/storage/partitions_tbd.default.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

diff --git a/config/esp_sdkconfigs/sdkconfig.defaults.dada b/config/esp_sdkconfigs/sdkconfig.defaults.dada
@@ -458,8 +458,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="config/storage/partitions_tbd.default.csv"
+CONFIG_PARTITION_TABLE_FILENAME="config/storage/partitions_tbd.default.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

diff --git a/config/esp_sdkconfigs/sdkconfig.defaults.emu b/config/esp_sdkconfigs/sdkconfig.defaults.emu
@@ -458,8 +458,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="config/storage/partitions_tbd.default.csv"
+CONFIG_PARTITION_TABLE_FILENAME="config/storage/partitions_tbd.default.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

diff --git a/config/esp_sdkconfigs/sdkconfig.defaults.mk2 b/config/esp_sdkconfigs/sdkconfig.defaults.mk2
@@ -334,8 +334,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="config/storage/partitions_tbd.default.csv"
+CONFIG_PARTITION_TABLE_FILENAME="config/storage/partitions_tbd.default.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

diff --git a/config/esp_sdkconfigs/sdkconfig.defaults.str b/config/esp_sdkconfigs/sdkconfig.defaults.str
@@ -113,8 +113,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="config/storage/partitions_tbd.default.csv"
+CONFIG_PARTITION_TABLE_FILENAME="config/storage/partitions_tbd.default.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

diff --git a/config/esp_sdkconfigs/sdkconfig.defaults.v1 b/config/esp_sdkconfigs/sdkconfig.defaults.v1
@@ -334,8 +334,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="config/storage/partitions_tbd.default.csv"
+CONFIG_PARTITION_TABLE_FILENAME="config/storage/partitions_tbd.default.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

diff --git a/config/esp_sdkconfigs/sdkconfig.defaults.v2 b/config/esp_sdkconfigs/sdkconfig.defaults.v2
@@ -334,8 +334,8 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="config/storage/partitions_tbd.default.csv"
+CONFIG_PARTITION_TABLE_FILENAME="config/storage/partitions_tbd.default.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

diff --git a/config/platforms/platform.bba2.json b/config/platforms/platform.bba2.json
@@ -14,7 +14,8 @@
             "type": "midi",
             "n_cvs": 90,
             "n_triggers": 40,
-            "inputs": ["uart", "usb"]
+            "inputs": ["uart"]
+            // "inputs": ["uart", "usb"]
         },
         "audio": {
             "type": "aic3254",

diff --git a/partitions_example.csv → config/storage/partitions_tbd.default.csv b/partitions_example.csv → config/storage/partitions_tbd.default.csv
@@ -6,6 +6,8 @@ phy_init, data, phy,      0xf000,  0x1000
 ota_0,    app,  ota_0,    0x10000,     3M
 ota_1,    app,  ota_1,           ,     3M
 storage,  data, spiffs,          ,     3M
+#samples, data, raw       0xB0000,     5M
+
 # note that by default 5 MB of flash are used outside of partition table for sample ROM
 # starts at 0xB00000 until 0xFFFFFF
 # of the 16MB WROVER FLASH, we still have about 1MB left in case eg. spiffs needs to be increased