Skip to content

Commit 63085b1

Browse files
nordicjmnordicjm
committed
soc: espressif_esp32: Port to HWMv2
Ports the SoC configuration to hardware model version 2 Signed-off-by: Jamie McCrae <[email protected]>
1 parent 6816900 commit 63085b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+768
-469
lines changed

‎Kconfig.zephyr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ config BOOTLOADER_SRAM_SIZE_DEPRECATED
905905

906906
config BOOTLOADER_ESP_IDF
907907
bool "ESP-IDF bootloader support"
908-
depends on SOC_FAMILY_ESP32 && !BOOTLOADER_MCUBOOT && !MCUBOOT
908+
depends on SOC_FAMILY_ESPRESSIF_ESP32 && !BOOTLOADER_MCUBOOT && !MCUBOOT
909909
default y
910910
help
911911
This option will trigger the compilation of the ESP-IDF bootloader

‎drivers/hwinfo/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ config HWINFO_SMARTBOND
159159
config HWINFO_ESP32
160160
bool "ESP32 device ID"
161161
default y
162-
depends on SOC_FAMILY_ESP32
162+
depends on SOC_FAMILY_ESPRESSIF_ESP32
163163
help
164164
Enable ESP32 hwinfo driver.
165165

‎drivers/interrupt_controller/Kconfig.esp32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
config INTC_ESP32
77
bool "Interrupt allocator for Xtensa-based Espressif SoCs"
8-
default y if SOC_FAMILY_ESP32 && !SOC_SERIES_ESP32C3
8+
default y if SOC_FAMILY_ESPRESSIF_ESP32 && !SOC_SERIES_ESP32C3
99
help
1010
Enable custom interrupt allocator for Espressif SoCs based on Xtensa
1111
architecture.

‎modules/Kconfig.esp32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
config HAS_ESPRESSIF_HAL
55
bool
6-
depends on SOC_FAMILY_ESP32
6+
depends on SOC_FAMILY_ESPRESSIF_ESP32

‎soc/soc_legacy/riscv/espressif_esp32/CMakeLists.txt renamed to ‎soc/espressif/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
add_subdirectory(${SOC_SERIES})
54
add_subdirectory(common)
5+
add_subdirectory(${SOC_SERIES})

‎soc/soc_legacy/xtensa/espressif_esp32/Kconfig.soc renamed to ‎soc/espressif/Kconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
source "soc/soc_legacy/xtensa/espressif_esp32/*/Kconfig.series"
4+
if SOC_FAMILY_ESPRESSIF_ESP32
5+
6+
rsource "*/Kconfig"
7+
8+
endif # SOC_FAMILY_ESPRESSIF_ESP32

‎soc/soc_legacy/xtensa/espressif_esp32/CMakeLists.txt renamed to ‎soc/espressif/Kconfig.defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
add_subdirectory(${SOC_SERIES})
5-
add_subdirectory(common)
4+
if SOC_FAMILY_ESPRESSIF_ESP32
5+
6+
rsource "*/Kconfig.defconfig"
7+
8+
endif # SOC_FAMILY_ESPRESSIF_ESP32

‎soc/espressif/Kconfig.soc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
config SOC_FAMILY_ESPRESSIF_ESP32
5+
bool
6+
7+
config SOC_FAMILY
8+
default "espressif_esp32" if SOC_FAMILY_ESPRESSIF_ESP32
9+
10+
rsource "*/Kconfig.soc"

‎soc/espressif/common/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
if(CONFIG_SOC_SERIES_ESP32 OR CONFIG_SOC_SERIES_ESP32S2 OR CONFIG_SOC_SERIES_ESP32S3)
5+
zephyr_include_directories(include)
6+
endif()

‎soc/soc_legacy/xtensa/espressif_esp32/common/Kconfig.soc renamed to ‎soc/espressif/common/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
if SOC_FAMILY_ESP32
5-
64
config ESPTOOLPY_FLASHFREQ_80M
75
bool
86

@@ -12,6 +10,8 @@ config FLASH_SIZE
1210
config FLASH_BASE_ADDRESS
1311
hex
1412

13+
if SOC_SERIES_ESP32 || SOC_SERIES_ESP32S2 || SOC_SERIES_ESP32S3
14+
1515
config ESP_SPIRAM
1616
bool "Support for external, SPI-connected RAM"
1717
help
@@ -212,4 +212,4 @@ config SPIRAM
212212

213213
endmenu # SPI RAM config
214214

215-
endif # SOC_FAMILY_ESP32
215+
endif # SOC_SERIES_ESP32 || SOC_SERIES_ESP32S2 || SOC_SERIES_ESP32S3

0 commit comments

Comments
 (0)