Merge pull request #15538 from Jason2866/rename_partitions

remove SPIFFS naming
This commit is contained in:
Theo Arends 2022-05-05 09:41:52 +02:00 committed by GitHub
commit 9afcd1155f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 64 additions and 12 deletions

View File

@ -10,7 +10,7 @@
"flash_mode": "dout",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app2880k_spiffs320k.csv"
"partitions": "esp32_partition_app2880k_fs320k.csv"
},
"connectivity": [
"wifi",

View File

@ -10,7 +10,7 @@
"flash_mode": "dout",
"mcu": "esp32",
"variant": "m5stack_core2",
"partitions": "esp32_partition_app2944k_spiffs10M.csv"
"partitions": "esp32_partition_app2944k_fs10M.csv"
},
"connectivity": [
"wifi",

View File

@ -10,7 +10,7 @@
"flash_mode": "dout",
"mcu": "esp32",
"variant": "odroid_esp32",
"partitions": "esp32_partition_app2944k_spiffs10M.csv"
"partitions": "esp32_partition_app2944k_fs10M.csv"
},
"connectivity": [
"wifi",

View File

@ -10,7 +10,7 @@
"flash_mode": "dout",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app2944k_spiffs10M.csv"
"partitions": "esp32_partition_app2944k_fs10M.csv"
},
"connectivity": [
"wifi",

View File

@ -10,7 +10,7 @@
"flash_mode": "dout",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app2880k_spiffs320k.csv"
"partitions": "esp32_partition_app2880k_fs320k.csv"
},
"connectivity": [
"wifi",

46
boards/esp32_4M_FS.json Normal file
View File

@ -0,0 +1,46 @@
{
"build": {
"arduino":{
"ldscript": "esp32_out.ld"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app1856k_fs1344k.csv"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"debug": {
"openocd_target": "esp32.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Espressif Generic ESP32 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
"upload": {
"arduino": {
"flash_extra_images": [
[
"0x10000",
"variants/tasmota/tasmota32-safemode.bin"
]
]
},
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"require_upload_port": true,
"speed": 460800
},
"url": "https://en.wikipedia.org/wiki/ESP32",
"vendor": "Espressif"
}

View File

@ -10,7 +10,7 @@
"flash_mode": "dout",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app2944k_spiffs2M.csv"
"partitions": "esp32_partition_app2944k_fs2M.csv"
},
"connectivity": [
"wifi",

View File

@ -10,7 +10,7 @@
"flash_mode": "dout",
"mcu": "esp32",
"variant": "esp32",
"partitions": "esp32_partition_app2880k_spiffs320k.csv"
"partitions": "esp32_partition_app2880k_fs320k.csv"
},
"connectivity": [
"wifi",

View File

@ -10,7 +10,7 @@
"flash_mode": "dout",
"mcu": "esp32c3",
"variant": "esp32c3",
"partitions": "esp32_partition_app2880k_spiffs320k.csv"
"partitions": "esp32_partition_app2880k_fs320k.csv"
},
"connectivity": [
"wifi"

View File

@ -10,7 +10,7 @@
"flash_mode": "dout",
"mcu": "esp32s2",
"variant": "esp32s2",
"partitions": "esp32_partition_app2880k_spiffs320k.csv"
"partitions": "esp32_partition_app2880k_fs320k.csv"
},
"connectivity": [
"wifi"

View File

@ -11,7 +11,7 @@
"flash_mode": "dio",
"mcu": "esp32s3",
"variant": "esp32s3",
"partitions": "esp32_partition_app2880k_spiffs320k.csv"
"partitions": "esp32_partition_app2880k_fs320k.csv"
},
"connectivity": [
"wifi",

View File

@ -11,7 +11,7 @@
"flash_mode": "dio",
"mcu": "esp32s3",
"variant": "esp32s3",
"partitions": "esp32_partition_app2944k_spiffs2M.csv"
"partitions": "esp32_partition_app2944k_fs2M.csv"
},
"connectivity": [
"wifi",

View File

@ -0,0 +1,6 @@
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
safeboot, app, factory, 0x10000, 0xD0000,
app0, app, ota_0, 0xE0000, 0x1D0000,
spiffs, data, spiffs, 0x2B0000,0x150000,
1 # Name Type SubType Offset Size Flags
2 nvs data nvs 0x9000 0x5000
3 otadata data ota 0xe000 0x2000
4 safeboot app factory 0x10000 0xD0000
5 app0 app ota_0 0xE0000 0x1D0000
6 spiffs data spiffs 0x2B0000 0x150000

View File

@ -1,6 +1,6 @@
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
factory, app, factory, 0x10000, 0xD0000,
safeboot, app, factory, 0x10000, 0xD0000,
app0, app, ota_0, 0xE0000, 0x2D0000,
spiffs, data, spiffs, 0x3B0000,0x50000,
1 # Name Type SubType Offset Size Flags
2 nvs data nvs 0x9000 0x5000
3 otadata data ota 0xe000 0x2000
4 factory safeboot app factory 0x10000 0xD0000
5 app0 app ota_0 0xE0000 0x2D0000
6 spiffs data spiffs 0x3B0000 0x50000