Skip to content

Commit 2e2ec9d

Browse files
BlueAndiJason2866
andauthored
Fix m5stack_core_esp32 related board variants (#290)
* In the espressif/arduino-esp32 repository the variant m5stack_core_esp32 was renamed to m5stack_core. See espressif/arduino-esp32@a1c86ae#diff-498a5473e69c1931584e14350d29bc3f8b22f7cf7469d3ef81c896298c9f9291 Therefore some m5stack boards were updated correspondingly. * Remove ldscript configuration from M5Stack JSON Removed Arduino ldscript configuration from build settings. * Remove ldscript configuration from m5stack-core-esp32 Removed Arduino ldscript configuration from build settings. * Remove ldscript configuration from m5stack-grey.json Removed Arduino ldscript configuration from build settings. --------- Co-authored-by: Jason2866 <[email protected]>
1 parent 8ee272a commit 2e2ec9d

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

boards/m5stack-core-esp32-16M.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
{
22
"build": {
3-
"arduino":{
4-
"ldscript": "esp32_out.ld"
5-
},
63
"core": "esp32",
7-
"extra_flags": "-DARDUINO_M5Stack_Core_ESP32",
4+
"extra_flags": "-DARDUINO_M5Stack_Core",
85
"f_cpu": "240000000L",
96
"f_flash": "80000000L",
107
"flash_mode": "qio",
118
"mcu": "esp32",
12-
"variant": "m5stack_core_esp32"
9+
"variant": "m5stack_core"
1310
},
1411
"connectivity": [
1512
"wifi",

boards/m5stack-core-esp32.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
{
22
"build": {
3-
"arduino":{
4-
"ldscript": "esp32_out.ld"
5-
},
63
"core": "esp32",
7-
"extra_flags": "-DARDUINO_M5Stack_Core_ESP32",
4+
"extra_flags": "-DARDUINO_M5Stack_Core",
85
"f_cpu": "240000000L",
96
"f_flash": "80000000L",
107
"flash_mode": "qio",
118
"mcu": "esp32",
12-
"variant": "m5stack_core_esp32"
9+
"variant": "m5stack_core"
1310
},
1411
"connectivity": [
1512
"wifi",

boards/m5stack-grey.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
{
22
"build": {
3-
"arduino":{
4-
"ldscript": "esp32_out.ld"
5-
},
63
"core": "esp32",
7-
"extra_flags": "-DARDUINO_M5Stack_Core_ESP32",
4+
"extra_flags": "-DARDUINO_M5Stack_Core",
85
"f_cpu": "240000000L",
96
"f_flash": "40000000L",
107
"flash_mode": "dio",
118
"mcu": "esp32",
12-
"variant": "m5stack_core_esp32"
9+
"variant": "m5stack_core"
1310
},
1411
"connectivity": [
1512
"wifi",

0 commit comments

Comments
 (0)