patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

soc: espressif: move core identifiers esp32 and esp32s3 to Kconfig.soc

Browse source 
Move the Kconfig symbols SOC_ESP32_PROCPU, SOC_ESP32_APPCPU,
SOC_ESP32S3_PROCPU, and SOC_ESP32S3_APPCPU.

The CPU cluster is defined in espessifc/soc.yml and should therefore
be available in the HWMv2 Kconfig.soc tree.

This will allow sysbuild to test for the CPU cluster when targeting
remote board for a build.

Update espressif boards accordingly.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2024-03-04 11:18:57 +01:00 committed by Carles Cufí
parent d286870b74
commit 4370847c75
40 changed files with 56 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
boards/espressif/esp32_devkitc_wroom/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_ESP32_DEVKITC_WROOM
select SOC_ESP32_PROCPU if BOARD_ESP32_DEVKITC_WROOM_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_ESP32_DEVKITC_WROOM_ESP32_APPCPU

2
boards/espressif/esp32_devkitc_wroom/Kconfig.esp32_devkitc_wroom
View file

@ -3,3 +3,5 @@
config BOARD_ESP32_DEVKITC_WROOM
select SOC_ESP32_WROOM_32UE_N4
select SOC_ESP32_PROCPU if BOARD_ESP32_DEVKITC_WROOM_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_ESP32_DEVKITC_WROOM_ESP32_APPCPU

6
boards/espressif/esp32_devkitc_wrover/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_ESP32_DEVKITC_WROVER
select SOC_ESP32_PROCPU if BOARD_ESP32_DEVKITC_WROVER_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_ESP32_DEVKITC_WROVER_ESP32_APPCPU

2
boards/espressif/esp32_devkitc_wrover/Kconfig.esp32_devkitc_wrover
View file

@ -3,3 +3,5 @@
config BOARD_ESP32_DEVKITC_WROVER
select SOC_ESP32_WROVER_E_N4R8
select SOC_ESP32_PROCPU if BOARD_ESP32_DEVKITC_WROVER_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_ESP32_DEVKITC_WROVER_ESP32_APPCPU

6
boards/espressif/esp32_ethernet_kit/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_ESP32_ETHERNET_KIT
select SOC_ESP32_PROCPU if BOARD_ESP32_ETHERNET_KIT_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_ESP32_ETHERNET_KIT_ESP32_APPCPU

2
boards/espressif/esp32_ethernet_kit/Kconfig.esp32_ethernet_kit
View file

@ -5,3 +5,5 @@
config BOARD_ESP32_ETHERNET_KIT
select SOC_ESP32_WROVER_E_N4R8
select SOC_ESP32_PROCPU if BOARD_ESP32_ETHERNET_KIT_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_ESP32_ETHERNET_KIT_ESP32_APPCPU

6
boards/espressif/esp32s3_devkitm/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_ESP32S3_DEVKITM
select SOC_ESP32S3_PROCPU if BOARD_ESP32S3_DEVKITM_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_ESP32S3_DEVKITM_ESP32S3_APPCPU

2
boards/espressif/esp32s3_devkitm/Kconfig.esp32s3_devkitm
View file

@ -3,3 +3,5 @@
config BOARD_ESP32S3_DEVKITM
select SOC_ESP32S3_MINI_N8
select SOC_ESP32S3_PROCPU if BOARD_ESP32S3_DEVKITM_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_ESP32S3_DEVKITM_ESP32S3_APPCPU

6
boards/espressif/esp_wrover_kit/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_ESP_WROVER_KIT
select SOC_ESP32_PROCPU if BOARD_ESP_WROVER_KIT_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_ESP_WROVER_KIT_ESP32_APPCPU

2
boards/espressif/esp_wrover_kit/Kconfig.esp_wrover_kit
View file

@ -5,3 +5,5 @@
config BOARD_ESP_WROVER_KIT
select SOC_ESP32_WROVER_E_N4R8
select SOC_ESP32_PROCPU if BOARD_ESP_WROVER_KIT_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_ESP_WROVER_KIT_ESP32_APPCPU

6
boards/hardkernel/odroid_go/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_ODROID_GO
select SOC_ESP32_PROCPU if BOARD_ODROID_GO_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_ODROID_GO_ESP32_APPCPU

2
boards/hardkernel/odroid_go/Kconfig.odroid_go
View file

@ -5,3 +5,5 @@
config BOARD_ODROID_GO
select SOC_ESP32_WROVER_E_N16R2
select SOC_ESP32_PROCPU if BOARD_ODROID_GO_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_ODROID_GO_ESP32_APPCPU

6
boards/heltec/heltec_wifi_lora32_v2/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_HELTEC_WIFI_LORA32_V2
select SOC_ESP32_PROCPU if BOARD_HELTEC_WIFI_LORA32_V2_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_HELTEC_WIFI_LORA32_V2_ESP32_APPCPU

2
boards/heltec/heltec_wifi_lora32_v2/Kconfig.heltec_wifi_lora32_v2
View file

@ -5,3 +5,5 @@
config BOARD_HELTEC_WIFI_LORA32_V2
select SOC_ESP32_D0WD_V3
select SOC_ESP32_PROCPU if BOARD_HELTEC_WIFI_LORA32_V2_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_HELTEC_WIFI_LORA32_V2_ESP32_APPCPU

6
boards/heltec/heltec_wireless_stick_lite_v3/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_HELTEC_WIRELESS_STICK_LITE_V3
select SOC_ESP32S3_PROCPU if BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_APPCPU

2
boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.heltec_wireless_stick_lite_v3
View file

@ -6,3 +6,5 @@
config BOARD_HELTEC_WIRELESS_STICK_LITE_V3
select SOC_ESP32S3_FN8
select SOC_ESP32S3_PROCPU if BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_APPCPU

6
boards/kincony/kincony_kc868_a32/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_KINCONY_KC868_A32
select SOC_ESP32_PROCPU if BOARD_KINCONY_KC868_A32_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_KINCONY_KC868_A32_ESP32_APPCPU

2
boards/kincony/kincony_kc868_a32/Kconfig.kincony_kc868_a32
View file

@ -3,3 +3,5 @@
config BOARD_KINCONY_KC868_A32
select SOC_ESP32_WROOM_32UE_N4
select SOC_ESP32_PROCPU if BOARD_KINCONY_KC868_A32_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_KINCONY_KC868_A32_ESP32_APPCPU

6
boards/luatos/esp32s3_luatos_core/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_ESP32S3_LUATOS_CORE
select SOC_ESP32S3_PROCPU if BOARD_ESP32S3_LUATOS_CORE_ESP32S3_PROCPU || BOARD_ESP32S3_LUATOS_CORE_ESP32S3_PROCPU_USB
select SOC_ESP32S3_APPCPU if BOARD_ESP32S3_LUATOS_CORE_ESP32S3_APPCPU || BOARD_ESP32S3_LUATOS_CORE_ESP32S3_APPCPU_USB

2
boards/luatos/esp32s3_luatos_core/Kconfig.esp32s3_luatos_core
View file

@ -3,3 +3,5 @@
config BOARD_ESP32S3_LUATOS_CORE
select SOC_ESP32S3_MINI_N8
select SOC_ESP32S3_PROCPU if BOARD_ESP32S3_LUATOS_CORE_ESP32S3_PROCPU || BOARD_ESP32S3_LUATOS_CORE_ESP32S3_PROCPU_USB
select SOC_ESP32S3_APPCPU if BOARD_ESP32S3_LUATOS_CORE_ESP32S3_APPCPU || BOARD_ESP32S3_LUATOS_CORE_ESP32S3_APPCPU_USB

6
boards/m5stack/m5stack_atoms3/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_M5STACK_ATOMS3
select SOC_ESP32S3_PROCPU if BOARD_M5STACK_ATOMS3_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_M5STACK_ATOMS3_ESP32S3_APPCPU

2
boards/m5stack/m5stack_atoms3/Kconfig.m5stack_atoms3
View file

@ -5,3 +5,5 @@
config BOARD_M5STACK_ATOMS3
select SOC_ESP32S3_FN8
select SOC_ESP32S3_PROCPU if BOARD_M5STACK_ATOMS3_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_M5STACK_ATOMS3_ESP32S3_APPCPU

6
boards/m5stack/m5stack_atoms3_lite/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_M5STACK_ATOMS3_LITE
select SOC_ESP32S3_PROCPU if BOARD_M5STACK_ATOMS3_LITE_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_M5STACK_ATOMS3_LITE_ESP32S3_APPCPU

2
boards/m5stack/m5stack_atoms3_lite/Kconfig.m5stack_atoms3_lite
View file

@ -4,3 +4,5 @@
config BOARD_M5STACK_ATOMS3_LITE
select SOC_ESP32S3_FN8
select SOC_ESP32S3_PROCPU if BOARD_M5STACK_ATOMS3_LITE_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_M5STACK_ATOMS3_LITE_ESP32S3_APPCPU

6
boards/m5stack/m5stack_core2/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_M5STACK_CORE2
select SOC_ESP32_PROCPU if BOARD_M5STACK_CORE2_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_M5STACK_CORE2_ESP32_APPCPU

2
boards/m5stack/m5stack_core2/Kconfig.m5stack_core2
View file

@ -5,3 +5,5 @@
config BOARD_M5STACK_CORE2
select SOC_ESP32_D0WD_V3
select SOC_ESP32_PROCPU if BOARD_M5STACK_CORE2_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_M5STACK_CORE2_ESP32_APPCPU

6
boards/m5stack/m5stack_stamps3/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_M5STACK_STAMPS3
select SOC_ESP32S3_PROCPU if BOARD_M5STACK_STAMPS3_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_M5STACK_STAMPS3_ESP32S3_APPCPU

2
boards/m5stack/m5stack_stamps3/Kconfig.m5stack_stamps3
View file

@ -5,3 +5,5 @@
config BOARD_M5STACK_STAMPS3
select SOC_ESP32S3_FN8
select SOC_ESP32S3_PROCPU if BOARD_M5STACK_STAMPS3_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_M5STACK_STAMPS3_ESP32S3_APPCPU

6
boards/m5stack/m5stickc_plus/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_M5STICKC_PLUS
select SOC_ESP32_PROCPU if BOARD_M5STICKC_PLUS_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_M5STICKC_PLUS_ESP32_APPCPU

2
boards/m5stack/m5stickc_plus/Kconfig.m5stickc_plus
View file

@ -5,3 +5,5 @@
config BOARD_M5STICKC_PLUS
select SOC_ESP32_PICO_D4
select SOC_ESP32_PROCPU if BOARD_M5STICKC_PLUS_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_M5STICKC_PLUS_ESP32_APPCPU

6
boards/olimex/olimex_esp32_evb/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_OLIMEX_ESP32_EVB
select SOC_ESP32_PROCPU if BOARD_OLIMEX_ESP32_EVB_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_OLIMEX_ESP32_EVB_ESP32_APPCPU

2
boards/olimex/olimex_esp32_evb/Kconfig.olimex_esp32_evb
View file

@ -5,3 +5,5 @@
config BOARD_OLIMEX_ESP32_EVB
select SOC_ESP32_WROVER_E_N8R2
select SOC_ESP32_PROCPU if BOARD_OLIMEX_ESP32_EVB_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_OLIMEX_ESP32_EVB_ESP32_APPCPU

6
boards/seeed/xiao_esp32s3/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_XIAO_ESP32S3
select SOC_ESP32S3_PROCPU if BOARD_XIAO_ESP32S3_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_XIAO_ESP32S3_ESP32S3_APPCPU

2
boards/seeed/xiao_esp32s3/Kconfig.xiao_esp32s3
View file

@ -5,3 +5,5 @@
config BOARD_XIAO_ESP32S3
select SOC_ESP32S3_WROOM_N8R8
select SOC_ESP32S3_PROCPU if BOARD_XIAO_ESP32S3_ESP32S3_PROCPU
select SOC_ESP32S3_APPCPU if BOARD_XIAO_ESP32S3_ESP32S3_APPCPU

6
boards/vcc-gnd/yd_esp32/Kconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
config BOARD_YD_ESP32
select SOC_ESP32_PROCPU if BOARD_YD_ESP32_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_YD_ESP32_ESP32_APPCPU

2
boards/vcc-gnd/yd_esp32/Kconfig.yd_esp32
View file

@ -5,3 +5,5 @@
config BOARD_YD_ESP32
select SOC_ESP32_WROOM_32UE_N4
select SOC_ESP32_PROCPU if BOARD_YD_ESP32_ESP32_PROCPU
select SOC_ESP32_APPCPU if BOARD_YD_ESP32_ESP32_APPCPU

10
soc/espressif/esp32/Kconfig
View file

@ -34,16 +34,6 @@ config ESP32_APPCPU_DRAM
help
Defines APPCPU DRAM area in bytes.
config SOC_ESP32_PROCPU
bool
help
This hidden configuration defines that build is targeted for PROCPU (core 0).
config SOC_ESP32_APPCPU
bool
help
This hidden configuration defines that build is targeted for APPCPU (core 1).
config SOC_ENABLE_APPCPU
bool
default y

10
soc/espressif/esp32/Kconfig.soc
View file

@ -122,6 +122,16 @@ config SOC_ESP32
help
ESP32
config SOC_ESP32_PROCPU
bool
help
This hidden configuration defines that build is targeted for PROCPU (core 0).
config SOC_ESP32_APPCPU
bool
help
This hidden configuration defines that build is targeted for APPCPU (core 1).
config SOC_SERIES
default "esp32" if SOC_SERIES_ESP32

10
soc/espressif/esp32s3/Kconfig
View file

@ -31,16 +31,6 @@ config ESP32S3_APPCPU_DRAM
help
Defines APPCPU DRAM area in bytes.
config SOC_ESP32S3_PROCPU
bool
help
This hidden configuration defines that build is targeted for PROCPU (core 0).
config SOC_ESP32S3_APPCPU
bool
help
This hidden configuration defines that build is targeted for APPCPU (core 1).
config SOC_ENABLE_APPCPU
bool
default y

10
soc/espressif/esp32s3/Kconfig.soc
View file

@ -116,6 +116,16 @@ config SOC_ESP32S3
help
ESP32S3
config SOC_ESP32S3_PROCPU
bool
help
This hidden configuration defines that build is targeted for PROCPU (core 0).
config SOC_ESP32S3_APPCPU
bool
help
This hidden configuration defines that build is targeted for APPCPU (core 1).
config SOC_SERIES
default "esp32s3" if SOC_SERIES_ESP32S3