8000 esp32/boards/GENERIC_S3: Merge with GENERIC_S3_{SPIRAM,SPIRAM_OCT}. · micropython/micropython@d25990e · GitHub
[go: up one dir, main page]
Skip to content

Commit d25990e

Browse files
jimmojimmo
committed
esp32/boards/GENERIC_S3: Merge with GENERIC_S3_{SPIRAM,SPIRAM_OCT}.
These are now variants of the GENERIC_S3 board. This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
1 parent 4dccdec commit d25990e

File tree

12 files changed

+38
-97
lines changed

12 files changed

+38
-97
lines changed

‎ports/esp32/boards/GENERIC_S2/board.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
"product": "ESP32-S2",
1515
"thumbnail": "",
1616
"url": "https://www.espressif.com/en/products/modules",
17-
"vendor": "Espressif"
17+
"vendor": "Espressif",
18+
"variants": {
19+
"wrover": "WROVER module"
20+
}
1821
}

‎ports/esp32/boards/GENERIC_S3/board.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,9 @@
1414
"product": "ESP32-S3",
1515
"thumbnail": "",
1616
"url": "https://www.espressif.com/en/products/modules",
17-
"vendor": "Espressif"
17+
"vendor": "Espressif",
18+
"variants": {
19+
"spiram": "Support for SPIRAM",
20+
"spiram-oct": "Support for Octal-SPIRAM"
21+
}
1822
}

‎ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,29 @@ set(SDKCONFIG_DEFAULTS
66
boards/sdkconfig.ble
77
boards/GENERIC_S3/sdkconfig.board
88
)
9+
10+
if(MICROPY_BOARD_VARIANT STREQUAL "spiram")
11+
set(SDKCONFIG_DEFAULTS
12+
${SDKCONFIG_DEFAULTS}
13+
boards/sdkconfig.spiram_sx
14+
)
15+
16+
target_compile_definitions(${MICROPY_TARGET} PUBLIC
17+
MICROPY_HW_BOARD_NAME=\"Generic ESP32S3 module with SPIRAM\"
18+
)
19+
endif()
20+
21+
if(MICROPY_BOARD_VARIANT STREQUAL "spiram-oct")
22+
set(SDKCONFIG_DEFAULTS
23+
${SDKCONFIG_DEFAULTS}
24+
boards/sdkconfig.spiram_sx
25+
boards/sdkconfig.spiram_oct
26+
)
27+
28+
target_compile_definitions(${MICROPY_TARGET} PUBLIC
29+
MICROPY_HW_BOARD_NAME=\"Generic ESP32S3 module with Octal-SPIRAM\"
30+
)
31+
endif()
32+
33+
# Define the list of supported variants.
34+
set(BOARD_VARIANTS "spiram spiram-oct")

‎ports/esp32/boards/GENERIC_S3/mpconfigboard.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#define MICROPY_HW_BOARD_NAME "ESP32S3 module"
1+
#ifndef MICROPY_HW_BOARD_NAME
2+
#define MICROPY_HW_BOARD_NAME "Generic ESP32S3 module"
3+
#endif
24
#define MICROPY_HW_MCU_NAME "ESP32S3"
35

46
#define MICROPY_PY_MACHINE_DAC (0)

‎ports/esp32/boards/GENERIC_S3_SPIRAM/board.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0