diff --git a/boards/alksesp32.json b/boards/alksesp32.json index 860ea4a..6a4ae15 100644 --- a/boards/alksesp32.json +++ b/boards/alksesp32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ALKS", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "alksesp32" }, diff --git a/boards/bpi-bit.json b/boards/bpi-bit.json index a6f8c86..5414abc 100644 --- a/boards/bpi-bit.json +++ b/boards/bpi-bit.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_BPI_BIT", "f_cpu": "160000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "bpi-bit" }, diff --git a/boards/d-duino-32.json b/boards/d-duino-32.json index da1e8ad..43bc24a 100644 --- a/boards/d-duino-32.json +++ b/boards/d-duino-32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_D_DUINO_32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "d-duino-32" }, diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index 299fa03..50d66a7 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -1,5 +1,8 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", @@ -11,7 +14,6 @@ "0x6010" ] ], - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32" }, diff --git a/boards/esp32-devkitlipo.json b/boards/esp32-devkitlipo.json index db173b2..399d084 100644 --- a/boards/esp32-devkitlipo.json +++ b/boards/esp32-devkitlipo.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEVKIT_LIPO", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "qio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32-devkit-lipo" }, diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json index 1420f3c..69dde43 100644 --- a/boards/esp32-evb.json +++ b/boards/esp32-evb.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_EVB", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32-evb" }, diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json index 20cd0cd..1a8aac8 100644 --- a/boards/esp32-gateway.json +++ b/boards/esp32-gateway.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_GATEWAY", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32-gateway" }, diff --git a/boards/esp32-poe-iso.json b/boards/esp32-poe-iso.json index 8fb1268..82898b1 100644 --- a/boards/esp32-poe-iso.json +++ b/boards/esp32-poe-iso.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_POE_ISO", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32-poe-iso" }, diff --git a/boards/esp32-poe.json b/boards/esp32-poe.json index 46a1f9e..60c992e 100644 --- a/boards/esp32-poe.json +++ b/boards/esp32-poe.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_POE", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32-poe" }, diff --git a/boards/esp32-pro.json b/boards/esp32-pro.json index 311ecb1..ab19572 100644 --- a/boards/esp32-pro.json +++ b/boards/esp32-pro.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_PRO", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32-evb" }, diff --git a/boards/esp320.json b/boards/esp320.json index a62b5cc..dfa8720 100644 --- a/boards/esp320.json +++ b/boards/esp320.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP320", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "qio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp320" }, diff --git a/boards/esp32cam.json b/boards/esp32cam.json index 62e5a5a..49c00e6 100644 --- a/boards/esp32cam.json +++ b/boards/esp32cam.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "partitions": "huge_app.csv", "variant": "esp32" diff --git a/boards/esp32dev.json b/boards/esp32dev.json index 2d7bf48..53c81b6 100644 --- a/boards/esp32dev.json +++ b/boards/esp32dev.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32" }, diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json index 0b0c46f..5aff5de 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/boards/esp32doit-devkit-v1.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "doitESP32devkitV1" }, diff --git a/boards/esp32thing.json b/boards/esp32thing.json index c338285..4c168e3 100644 --- a/boards/esp32thing.json +++ b/boards/esp32thing.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_THING", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32thing" }, diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json index 7b3b8d9..83e794e 100644 --- a/boards/esp32vn-iot-uno.json +++ b/boards/esp32vn-iot-uno.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_esp32vn_iot_uno", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32vn-iot-uno" }, diff --git a/boards/espea32.json b/boards/espea32.json index 64f275b..d995b8b 100644 --- a/boards/espea32.json +++ b/boards/espea32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESPea32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "espea32" }, diff --git a/boards/espectro32.json b/boards/espectro32.json index 73d6c46..7a88b3b 100644 --- a/boards/espectro32.json +++ b/boards/espectro32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESPECTRO32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "espectro32" }, diff --git a/boards/espino32.json b/boards/espino32.json index bd725be..162d979 100644 --- a/boards/espino32.json +++ b/boards/espino32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESPino32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "espino32" }, diff --git a/boards/featheresp32.json b/boards/featheresp32.json index 9e37afe..d6d3b18 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_FEATHER_ESP32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "feather_esp32" }, diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index e169ecd..d580c39 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "firebeetle32" }, diff --git a/boards/fm-devkit.json b/boards/fm-devkit.json index 3cac52c..322975a 100644 --- a/boards/fm-devkit.json +++ b/boards/fm-devkit.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_fm_devkit", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "fm-devkit" }, diff --git a/boards/frogboard.json b/boards/frogboard.json index 13eb4d0..b19e802 100644 --- a/boards/frogboard.json +++ b/boards/frogboard.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_FROG_ESP32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "frog32" }, diff --git a/boards/heltec_wifi_kit_32.json b/boards/heltec_wifi_kit_32.json index 893abea..0960dd4 100644 --- a/boards/heltec_wifi_kit_32.json +++ b/boards/heltec_wifi_kit_32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_HELTEC_WIFI_KIT_32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "heltec_wifi_kit_32" }, diff --git a/boards/heltec_wifi_lora_32.json b/boards/heltec_wifi_lora_32.json index 065663c..3937118 100644 --- a/boards/heltec_wifi_lora_32.json +++ b/boards/heltec_wifi_lora_32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_HELTEC_WIFI_LORA_32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "heltec_wifi_lora_32" }, diff --git a/boards/heltec_wifi_lora_32_V2.json b/boards/heltec_wifi_lora_32_V2.json index 8099df9..4fa8a64 100644 --- a/boards/heltec_wifi_lora_32_V2.json +++ b/boards/heltec_wifi_lora_32_V2.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_HELTEC_WIFI_LORA_32_V2", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "partitions": "default_8MB.csv", "variant": "heltec_wifi_lora_32_V2" diff --git a/boards/heltec_wireless_stick.json b/boards/heltec_wireless_stick.json index dd4a8f5..f3a1016 100644 --- a/boards/heltec_wireless_stick.json +++ b/boards/heltec_wireless_stick.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_HELTEC_WIRELESS_STICK", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "partitions": "default_8MB.csv", "variant": "heltec_wireless_stick" diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json index 6b90af6..6d96e58 100644 --- a/boards/hornbill32dev.json +++ b/boards/hornbill32dev.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_HORNBILL_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "hornbill32dev" }, diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json index c1ec6ab..fce2579 100644 --- a/boards/hornbill32minima.json +++ b/boards/hornbill32minima.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_HORNBILL_ESP32_MINIMA", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "hornbill32minima" }, diff --git a/boards/intorobot.json b/boards/intorobot.json index 1853b92..6149bce 100644 --- a/boards/intorobot.json +++ b/boards/intorobot.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_INTOROBOT_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "intorobot-fig" }, diff --git a/boards/iotaap_magnolia.json b/boards/iotaap_magnolia.json index f853783..47c1eba 100644 --- a/boards/iotaap_magnolia.json +++ b/boards/iotaap_magnolia.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32" }, diff --git a/boards/iotbusio.json b/boards/iotbusio.json index 1cbbe7c..11c4264 100644 --- a/boards/iotbusio.json +++ b/boards/iotbusio.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32" }, diff --git a/boards/iotbusproteus.json b/boards/iotbusproteus.json index 6c23456..3859504 100644 --- a/boards/iotbusproteus.json +++ b/boards/iotbusproteus.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32" }, diff --git a/boards/lolin32.json b/boards/lolin32.json index 4b91281..446b2cd 100644 --- a/boards/lolin32.json +++ b/boards/lolin32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_LOLIN32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "lolin32" }, diff --git a/boards/lolin_d32.json b/boards/lolin_d32.json index 3141b1d..bde02b3 100644 --- a/boards/lolin_d32.json +++ b/boards/lolin_d32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_LOLIN_D32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "d32" }, diff --git a/boards/lolin_d32_pro.json b/boards/lolin_d32_pro.json index 7fc268b..18bfcf8 100644 --- a/boards/lolin_d32_pro.json +++ b/boards/lolin_d32_pro.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_LOLIN_D32_PRO", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "d32_pro" }, diff --git a/boards/lopy.json b/boards/lopy.json index b6ae5df..307d06a 100644 --- a/boards/lopy.json +++ b/boards/lopy.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_LoPy", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "lopy" }, diff --git a/boards/lopy4.json b/boards/lopy4.json index 191863f..29062f0 100644 --- a/boards/lopy4.json +++ b/boards/lopy4.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_LoPy4", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "lopy4" }, diff --git a/boards/m5stack-core-esp32.json b/boards/m5stack-core-esp32.json index 11a2311..c80f228 100644 --- a/boards/m5stack-core-esp32.json +++ b/boards/m5stack-core-esp32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_M5Stack_Core_ESP32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "m5stack_core_esp32" }, diff --git a/boards/m5stack-fire.json b/boards/m5stack-fire.json index a9d99d8..36ad0a6 100644 --- a/boards/m5stack-fire.json +++ b/boards/m5stack-fire.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_M5STACK_FIRE", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "partitions": "default_16MB.csv", "variant": "m5stack_fire" diff --git a/boards/m5stack-grey.json b/boards/m5stack-grey.json index 6538f0c..886208e 100644 --- a/boards/m5stack-grey.json +++ b/boards/m5stack-grey.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_M5Stack_Core_ESP32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "m5stack_core_esp32" }, diff --git a/boards/m5stick-c.json b/boards/m5stick-c.json index b5d7425..5c96d7e 100644 --- a/boards/m5stick-c.json +++ b/boards/m5stick-c.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_M5Stick_C", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "m5stick_c" }, diff --git a/boards/magicbit.json b/boards/magicbit.json index 5afeac8..53b939e 100644 --- a/boards/magicbit.json +++ b/boards/magicbit.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "magicbit" }, diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json index 4c9cf1b..7b677c9 100644 --- a/boards/mhetesp32devkit.json +++ b/boards/mhetesp32devkit.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_MH_ET_LIVE_ESP32DEVKIT", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "mhetesp32devkit" }, diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json index 57b60cc..67f451e 100644 --- a/boards/mhetesp32minikit.json +++ b/boards/mhetesp32minikit.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_MH_ET_LIVE_ESP32MINIKIT", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "mhetesp32minikit" }, diff --git a/boards/microduino-core-esp32.json b/boards/microduino-core-esp32.json index 0256b77..f1dddb7 100644 --- a/boards/microduino-core-esp32.json +++ b/boards/microduino-core-esp32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_CoreESP32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "Microduino-esp32" }, diff --git a/boards/nano32.json b/boards/nano32.json index 269ef8c..eeb8a20 100644 --- a/boards/nano32.json +++ b/boards/nano32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_NANO32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "nano32" }, diff --git a/boards/nina_w10.json b/boards/nina_w10.json index 48581e6..3cc9a38 100644 --- a/boards/nina_w10.json +++ b/boards/nina_w10.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_UBLOX_NINA_W10", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "partitions": "minimal.csv", "variant": "nina_w10" diff --git a/boards/node32s.json b/boards/node32s.json index 5b9b1fe..192bda3 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_Node32s", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "esp32" }, diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json index 2588c61..5d30f2c 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_NodeMCU_32S", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "nodemcu-32s" }, diff --git a/boards/odroid_esp32.json b/boards/odroid_esp32.json index a5d226e..cfeb735 100644 --- a/boards/odroid_esp32.json +++ b/boards/odroid_esp32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ODROID_ESP32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "odroid_esp32" }, diff --git a/boards/onehorse32dev.json b/boards/onehorse32dev.json index 965a291..4b23641 100644 --- a/boards/onehorse32dev.json +++ b/boards/onehorse32dev.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ONEHORSE_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dout", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "onehorse32dev" }, diff --git a/boards/oroca_edubot.json b/boards/oroca_edubot.json index 04d7088..52e2149 100644 --- a/boards/oroca_edubot.json +++ b/boards/oroca_edubot.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_OROCA_EDUBOT", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "partitions": "huge_app.csv", "variant": "oroca_edubot" diff --git a/boards/pico32.json b/boards/pico32.json index 312c61a..25733e1 100644 --- a/boards/pico32.json +++ b/boards/pico32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_PICO", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "pico32" }, diff --git a/boards/pocket_32.json b/boards/pocket_32.json index 4bcb131..153ac23 100644 --- a/boards/pocket_32.json +++ b/boards/pocket_32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_Pocket32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "pocket_32" }, diff --git a/boards/pycom_gpy.json b/boards/pycom_gpy.json index 445447e..37cc507 100644 --- a/boards/pycom_gpy.json +++ b/boards/pycom_gpy.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_PYCOM_GPY", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "gpy" }, diff --git a/boards/quantum.json b/boards/quantum.json index 8b6af91..ea5ae27 100644 --- a/boards/quantum.json +++ b/boards/quantum.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_QUANTUM", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "qio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "quantum" }, diff --git a/boards/sparkfun_lora_gateway_1-channel.json b/boards/sparkfun_lora_gateway_1-channel.json index 971e927..8d6cc71 100644 --- a/boards/sparkfun_lora_gateway_1-channel.json +++ b/boards/sparkfun_lora_gateway_1-channel.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "sparkfun_lora_gateway_1-channel" }, diff --git a/boards/tinypico.json b/boards/tinypico.json index 395f529..883abb4 100644 --- a/boards/tinypico.json +++ b/boards/tinypico.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_PICO -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "qio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "pico32" }, diff --git a/boards/ttgo-lora32-v1.json b/boards/ttgo-lora32-v1.json index e93301b..339a8b6 100644 --- a/boards/ttgo-lora32-v1.json +++ b/boards/ttgo-lora32-v1.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_TTGO_LoRa32_V1", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "ttgo-lora32-v1" }, diff --git a/boards/ttgo-t-beam.json b/boards/ttgo-t-beam.json index 462283f..4bd5fe0 100644 --- a/boards/ttgo-t-beam.json +++ b/boards/ttgo-t-beam.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_T_Beam -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "t-beam" }, diff --git a/boards/ttgo-t-watch.json b/boards/ttgo-t-watch.json index aaa23df..a47a4a0 100644 --- a/boards/ttgo-t-watch.json +++ b/boards/ttgo-t-watch.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_T-Watch -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "partitions": "default_16MB.csv", "variant": "twatch" diff --git a/boards/ttgo-t1.json b/boards/ttgo-t1.json index bda2af8..4f428cd 100644 --- a/boards/ttgo-t1.json +++ b/boards/ttgo-t1.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_TTGO_T1", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "qio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "ttgo-t1" }, diff --git a/boards/turta_iot_node.json b/boards/turta_iot_node.json index 8eb5085..3f34825 100644 --- a/boards/turta_iot_node.json +++ b/boards/turta_iot_node.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_PICO", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "pico32" }, diff --git a/boards/vintlabs-devkit-v1.json b/boards/vintlabs-devkit-v1.json index 6a23aeb..4ba1fa1 100644 --- a/boards/vintlabs-devkit-v1.json +++ b/boards/vintlabs-devkit-v1.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "vintlabsdevkitv1" }, diff --git a/boards/wemos_d1_mini32.json b/boards/wemos_d1_mini32.json index 82b9cb7..4770623 100644 --- a/boards/wemos_d1_mini32.json +++ b/boards/wemos_d1_mini32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_D1_MINI32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "d1_mini32" }, diff --git a/boards/wemosbat.json b/boards/wemosbat.json index 94f278a..1312abb 100644 --- a/boards/wemosbat.json +++ b/boards/wemosbat.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_Pocket32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "pocket_32" }, diff --git a/boards/wesp32.json b/boards/wesp32.json index 7c6eb84..9f924ba 100644 --- a/boards/wesp32.json +++ b/boards/wesp32.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_WESP32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "wesp32" }, diff --git a/boards/widora-air.json b/boards/widora-air.json index 5b53347..4dfda27 100644 --- a/boards/widora-air.json +++ b/boards/widora-air.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_WIDORA_AIR", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "widora-air" }, diff --git a/boards/xinabox_cw02.json b/boards/xinabox_cw02.json index d1dc242..88785ab 100644 --- a/boards/xinabox_cw02.json +++ b/boards/xinabox_cw02.json @@ -1,11 +1,13 @@ { "build": { + "arduino":{ + "ldscript": "esp32_out.ld" + }, "core": "esp32", "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", - "ldscript": "esp32_out.ld", "mcu": "esp32", "variant": "xinabox" }, diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 3ec797e..a8eaf22 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -779,14 +779,17 @@ env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", partition_table) # Generate linker script # -linker_script = env.Command( - join("$BUILD_DIR", "esp32_out.ld"), - join(FRAMEWORK_DIR, "components", "esp32", "ld", "esp32.ld"), - env.VerboseAction( - '$CC -I"$PROJECT_SRC_DIR" -C -P -x c -E $SOURCE -o $TARGET', - "Generating LD script $TARGET")) +if not env.BoardConfig().get("build.ldscript", ""): + linker_script = env.Command( + join("$BUILD_DIR", "esp32_out.ld"), + env.BoardConfig().get("build.esp-idf.ldscript", join( + FRAMEWORK_DIR, "components", "esp32", "ld", "esp32.ld")), + env.VerboseAction( + '$CC -I"$PROJECTSRC_DIR" -C -P -x c -E $SOURCE -o $TARGET', + "Generating LD script $TARGET")) -env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", linker_script) + env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", linker_script) + env.Replace(LDSCRIPT_PATH="esp32_out.ld") # # Compile bootloader diff --git a/builder/main.py b/builder/main.py index 9516c48..4e5af77 100644 --- a/builder/main.py +++ b/builder/main.py @@ -376,6 +376,14 @@ AlwaysBuild( env.VerboseAction("$ERASECMD", "Erasing...") ])) +# +# Information about obsolete method of specifying linker scripts +# + +if any("-Wl,-T" in f for f in env.get("LINKFLAGS", [])): + print("Warning! '-Wl,-T' option for specifying linker scripts is deprecated. " + "Please use 'board_build.ldscript' option in your 'platformio.ini' file.") + # # Default targets # diff --git a/platform.json b/platform.json index c319a11..a6a5979 100644 --- a/platform.json +++ b/platform.json @@ -50,7 +50,7 @@ "framework-arduinoespressif32": { "type": "framework", "optional": true, - "version": "~2.10004.191002" + "version": "~3.10004.191002" }, "framework-espidf": { "type": "framework",