boards: esp32: move board specific kconfig definitions

HEAP_MEM_POOL_ADD_SIZE_BOARD is not a zephyr-defined entry and should be placed into Kconfig instead of Kconfig.defconfig. This PR moves that entry for all ESP32-based boards accordingly. Signed-off-by: Sylvio Alves <[email protected]>
zephyrproject-rtos · Oct 4, 2024 · 9403b08 · 9403b08
1 parent 4ec2661
commit 9403b08
Show file tree

Hide file tree

Showing 73 changed files with 225 additions and 509 deletions.
diff --git a/...pressif/esp8684_devkitm/Kconfig.defconfig → boards/01space/esp32c3_042_oled/Kconfig b/...pressif/esp8684_devkitm/Kconfig.defconfig → boards/01space/esp32c3_042_oled/Kconfig
@@ -1,8 +1,6 @@
-# ESP8684 devkitm board configuration
-
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
  int
- default 8192
+ default 4096
diff --git a/boards/01space/esp32c3_042_oled/Kconfig.defconfig b/boards/01space/esp32c3_042_oled/Kconfig.defconfig
diff --git a/boards/dptechnics/walter/Kconfig b/boards/dptechnics/walter/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096 if BOARD_WALTER_ESP32S3_PROCPU
+ default 256 if BOARD_WALTER_ESP32S3_APPCPU
diff --git a/boards/dptechnics/walter/Kconfig.defconfig b/boards/dptechnics/walter/Kconfig.defconfig
diff --git a/boards/espressif/esp32_devkitc_wroom/Kconfig b/boards/espressif/esp32_devkitc_wroom/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096 if BOARD_ESP32_DEVKITC_WROOM_ESP32_PROCPU
+ default 256 if BOARD_ESP32_DEVKITC_WROOM_ESP32_APPCPU
diff --git a/boards/espressif/esp32_devkitc_wroom/Kconfig.defconfig b/boards/espressif/esp32_devkitc_wroom/Kconfig.defconfig
diff --git a/boards/espressif/esp32_devkitc_wrover/Kconfig b/boards/espressif/esp32_devkitc_wrover/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096 if BOARD_ESP32_DEVKITC_WROVER_ESP32_PROCPU
+ default 256 if BOARD_ESP32_DEVKITC_WROVER_ESP32_APPCPU
diff --git a/boards/espressif/esp32_devkitc_wrover/Kconfig.defconfig b/boards/espressif/esp32_devkitc_wrover/Kconfig.defconfig
diff --git a/boards/espressif/esp32_ethernet_kit/Kconfig b/boards/espressif/esp32_ethernet_kit/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096 if BOARD_ESP32_ETHERNET_KIT_ESP32_PROCPU
+ default 256 if BOARD_ESP32_ETHERNET_KIT_ESP32_APPCPU
diff --git a/boards/espressif/esp32_ethernet_kit/Kconfig.defconfig b/boards/espressif/esp32_ethernet_kit/Kconfig.defconfig
@@ -12,15 +12,4 @@ choice SPIRAM_TYPE
  default SPIRAM_TYPE_ESPPSRAM64
 endchoice
 
-config HEAP_MEM_POOL_ADD_SIZE_BOARD
- int
- default 8192
-
 endif # BOARD_ESP32_ETHERNET_KIT_ESP32_PROCPU
-
-if BOARD_ESP32_ETHERNET_KIT_ESP32_APPCPU
-
-config HEAP_MEM_POOL_ADD_SIZE_BOARD
- default 4096
-
-endif # BOARD_ESP32_ETHERNET_KIT_ESP32_APPCPU
diff --git a/...pressif/esp32c3_devkitc/Kconfig.defconfig → boards/espressif/esp32c3_devkitc/Kconfig b/...pressif/esp32c3_devkitc/Kconfig.defconfig → boards/espressif/esp32c3_devkitc/Kconfig
@@ -1,8 +1,6 @@
-# ESP32C3 devkitc board configuration
-
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
  int
- default 8192
+ default 4096
diff --git a/.../espressif/esp32c3_rust/Kconfig.defconfig → boards/espressif/esp32c3_devkitm/Kconfig b/.../espressif/esp32c3_rust/Kconfig.defconfig → boards/espressif/esp32c3_devkitm/Kconfig
@@ -3,7 +3,4 @@
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
  int
- default 65535 if WIFI && BT
- default 51200 if WIFI
- default 40960 if BT
  default 4096
diff --git a/boards/espressif/esp32c3_devkitm/Kconfig.defconfig b/boards/espressif/esp32c3_devkitm/Kconfig.defconfig
diff --git a/...pressif/esp32c6_devkitc/Kconfig.defconfig → boards/espressif/esp32c3_rust/Kconfig b/...pressif/esp32c6_devkitc/Kconfig.defconfig → boards/espressif/esp32c3_rust/Kconfig
@@ -1,11 +1,6 @@
-# ESP32C6 devkitc board configuration
-
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
  int
- default 65535 if WIFI && BT
- default 51200 if WIFI
- default 40960 if BT
  default 4096
diff --git a/boards/espressif/esp32c6_devkitc/Kconfig b/boards/espressif/esp32c6_devkitc/Kconfig
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096
diff --git a/boards/espressif/esp32s2_devkitc/Kconfig b/boards/espressif/esp32s2_devkitc/Kconfig
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096
diff --git a/boards/espressif/esp32s2_devkitc/Kconfig.defconfig b/boards/espressif/esp32s2_devkitc/Kconfig.defconfig
@@ -5,7 +5,3 @@
 
 config ENTROPY_GENERATOR
  default y
-
-config HEAP_MEM_POOL_ADD_SIZE_BOARD
- int
- default 8192
diff --git a/boards/espressif/esp32s2_saola/Kconfig b/boards/espressif/esp32s2_saola/Kconfig
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096
diff --git a/boards/espressif/esp32s2_saola/Kconfig.defconfig b/boards/espressif/esp32s2_saola/Kconfig.defconfig
@@ -5,7 +5,3 @@
 
 config ENTROPY_GENERATOR
  default y
-
-config HEAP_MEM_POOL_ADD_SIZE_BOARD
- int
- default 8192
diff --git a/boards/espressif/esp32s3_devkitc/Kconfig b/boards/espressif/esp32s3_devkitc/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096 if BOARD_ESP32S3_DEVKITC_ESP32S3_PROCPU
+ default 256 if BOARD_ESP32S3_DEVKITC_ESP32S3_APPCPU
diff --git a/boards/espressif/esp32s3_devkitc/Kconfig.defconfig b/boards/espressif/esp32s3_devkitc/Kconfig.defconfig
diff --git a/boards/espressif/esp32s3_devkitm/Kconfig b/boards/espressif/esp32s3_devkitm/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096 if BOARD_ESP32S3_DEVKITM_ESP32S3_PROCPU
+ default 256 if BOARD_ESP32S3_DEVKITM_ESP32S3_APPCPU
diff --git a/boards/espressif/esp32s3_devkitm/Kconfig.defconfig b/boards/espressif/esp32s3_devkitm/Kconfig.defconfig
diff --git a/boards/espressif/esp32s3_eye/Kconfig b/boards/espressif/esp32s3_eye/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096 if BOARD_ESP32S3_EYE_ESP32S3_PROCPU
+ default 256 if BOARD_ESP32S3_EYE_ESP32S3_APPCPU
diff --git a/boards/espressif/esp32s3_eye/Kconfig.defconfig b/boards/espressif/esp32s3_eye/Kconfig.defconfig
@@ -8,18 +8,4 @@ if BOARD_ESP32S3_EYE_ESP32S3_PROCPU
 config LV_COLOR_16_SWAP
  default y
 
-config HEAP_MEM_POOL_ADD_SIZE_BOARD
- int
- default 65535 if WIFI && BT
- default 51200 if WIFI
- default 40960 if BT
- default 4096
-
 endif # BOARD_ESP32S3_EYE_ESP32S3_PROCPU
-
-if BOARD_ESP32S3_EYE_ESP32S3_APPCPU
-
-config HEAP_MEM_POOL_ADD_SIZE_BOARD
- default 256
-
-endif # BOARD_ESP32S3_EYE_ESP32S3_APPCPU
diff --git a/boards/espressif/esp8684_devkitm/Kconfig b/boards/espressif/esp8684_devkitm/Kconfig
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096
diff --git a/boards/espressif/esp_wrover_kit/Kconfig b/boards/espressif/esp_wrover_kit/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096 if BOARD_ESP_WROVER_KIT_ESP32_PROCPU
+ default 256 if BOARD_ESP_WROVER_KIT_ESP32_APPCPU
diff --git a/boards/espressif/esp_wrover_kit/Kconfig.defconfig b/boards/espressif/esp_wrover_kit/Kconfig.defconfig
@@ -5,18 +5,7 @@
 
 if BOARD_ESP_WROVER_KIT_ESP32_PROCPU
 
-config HEAP_MEM_POOL_ADD_SIZE_BOARD
- int
- default 8192
-
 config DISK_DRIVER_SDMMC
  default y
 
 endif # BOARD_ESP_WROVER_KIT_ESP32_PROCPU
-
-if BOARD_ESP_WROVER_KIT_ESP32_APPCPU
-
-config HEAP_MEM_POOL_ADD_SIZE_BOARD
- default 4096
-
-endif # BOARD_ESP_WROVER_KIT_ESP32_APPCPU
diff --git a/boards/franzininho/esp32s2_franzininho/Kconfig b/boards/franzininho/esp32s2_franzininho/Kconfig
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096
diff --git a/boards/franzininho/esp32s2_franzininho/Kconfig.defconfig b/boards/franzininho/esp32s2_franzininho/Kconfig.defconfig
@@ -5,8 +5,3 @@
 
 config ENTROPY_GENERATOR
  default y
-
-config HEAP_MEM_POOL_ADD_SIZE_BOARD
- int
- default 32768 if WIFI
- default 4096
diff --git a/boards/hardkernel/odroid_go/Kconfig b/boards/hardkernel/odroid_go/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096 if BOARD_ODROID_GO_ESP32_PROCPU
+ default 256 if BOARD_ODROID_GO_ESP32_APPCPU
diff --git a/boards/hardkernel/odroid_go/Kconfig.defconfig b/boards/hardkernel/odroid_go/Kconfig.defconfig
@@ -18,18 +18,4 @@ choice SPIRAM_TYPE
  default SPIRAM_TYPE_ESPPSRAM32
 endchoice
 
-config HEAP_MEM_POOL_ADD_SIZE_BOARD
- int
- default 65535 if WIFI && BT
- default 51200 if WIFI
- default 40960 if BT
- default 4096
-
 endif # BOARD_ODROID_GO_ESP32_PROCPU
-
-if BOARD_ODROID_GO_ESP32_APPCPU
-
-config HEAP_MEM_POOL_ADD_SIZE_BOARD
- default 4096
-
-endif # BOARD_ODROID_GO_ESP32_APPCPU
diff --git a/boards/heltec/heltec_wifi_lora32_v2/Kconfig b/boards/heltec/heltec_wifi_lora32_v2/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+ int
+ default 4096 if BOARD_HELTEC_WIFI_LORA32_V2_ESP32_PROCPU
+ default 256 if BOARD_HELTEC_WIFI_LORA32_V2_ESP32_APPCPU
diff --git a/boards/heltec/heltec_wifi_lora32_v2/Kconfig.defconfig b/boards/heltec/heltec_wifi_lora32_v2/Kconfig.defconfig