diff --git a/boards/Kconfig b/boards/Kconfig index faa576ef6d2..4d8c44911e8 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -3299,15 +3299,9 @@ endif if ARCH_BOARD_ESP32C3_DEVKIT source "boards/risc-v/esp32c3/esp32c3-devkit/Kconfig" endif -if ARCH_CHIP_ESP32S2 && !ARCH_BOARD_CUSTOM -source "boards/xtensa/esp32s2/common/Kconfig" -endif if ARCH_BOARD_ESP32S2_SAOLA_1 source "boards/xtensa/esp32s2/esp32s2-saola-1/Kconfig" endif -if ARCH_CHIP_ESP32S3 && !ARCH_BOARD_CUSTOM -source "boards/xtensa/esp32s3/common/Kconfig" -endif if ARCH_BOARD_ESP32S3_DEVKIT source "boards/xtensa/esp32s3/esp32s3-devkit/Kconfig" endif @@ -3332,9 +3326,6 @@ endif if ARCH_BOARD_RX65N_GRROSE source "boards/renesas/rx65n/rx65n-grrose/Kconfig" endif -if ARCH_CHIP_ESP32 && !ARCH_BOARD_CUSTOM -source "boards/xtensa/esp32/common/Kconfig" -endif if ARCH_BOARD_ESP32_DEVKITC source "boards/xtensa/esp32/esp32-devkitc/Kconfig" endif @@ -3389,12 +3380,29 @@ endif comment "Board-Common Options" +config ARCH_BOARD_COMMON + bool "Board common logic" + default n + ---help--- + Board common logic located in each board/common folder. + +if ARCH_BOARD_COMMON +if ARCH_CHIP_ESP32 +source "boards/xtensa/esp32/common/Kconfig" +endif +if ARCH_CHIP_ESP32S2 +source "boards/xtensa/esp32s2/common/Kconfig" +endif +if ARCH_CHIP_ESP32S3 +source "boards/xtensa/esp32s3/common/Kconfig" +endif if ARCH_CHIP_SAMV7 source "boards/arm/samv7/common/Kconfig" endif if ARCH_CHIP_STM32 source "boards/arm/stm32/common/Kconfig" endif +endif config BOARD_CRASHDUMP bool "Enable Board level logging of crash dumps" diff --git a/boards/arm/cxd56xx/common/Kconfig b/boards/arm/cxd56xx/common/Kconfig deleted file mode 100644 index f72f3c094ce..00000000000 --- a/boards/arm/cxd56xx/common/Kconfig +++ /dev/null @@ -1,4 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# diff --git a/boards/arm/cxd56xx/common/src/Make.defs b/boards/arm/cxd56xx/common/src/Make.defs index 97c02dea490..0dae7616378 100644 --- a/boards/arm/cxd56xx/common/src/Make.defs +++ b/boards/arm/cxd56xx/common/src/Make.defs @@ -18,13 +18,15 @@ # ############################################################################ +ifeq ($(CONFIG_ARCH_BOARD_COMMON),y) + CSRCS += cxd56_boot.c -ifeq ($(CONFIG_AUDIO_CXD56), y) +ifeq ($(CONFIG_AUDIO_CXD56),y) CSRCS += cxd56_audio.c endif -ifeq ($(CONFIG_CXD56_AUDIO), y) +ifeq ($(CONFIG_CXD56_AUDIO),y) CSRCS += cxd56_audio.c endif @@ -171,3 +173,5 @@ endif DEPPATH += --dep-path src VPATH += :src CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src) + +endif diff --git a/boards/arm/cxd56xx/spresense/configs/audio/defconfig b/boards/arm/cxd56xx/spresense/configs/audio/defconfig index 6bf9013d8de..e21e870ec4e 100644 --- a/boards/arm/cxd56xx/spresense/configs/audio/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/audio/defconfig @@ -12,6 +12,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig b/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig index 3334c20ec9f..f306891b77e 100644 --- a/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig @@ -12,6 +12,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/camera/defconfig b/boards/arm/cxd56xx/spresense/configs/camera/defconfig index 4421e9cdf1b..51c75f874bf 100644 --- a/boards/arm/cxd56xx/spresense/configs/camera/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/camera/defconfig @@ -12,6 +12,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/charger/defconfig b/boards/arm/cxd56xx/spresense/configs/charger/defconfig index 259139f9a34..548cdf4914f 100644 --- a/boards/arm/cxd56xx/spresense/configs/charger/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/charger/defconfig @@ -9,6 +9,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/elf/defconfig b/boards/arm/cxd56xx/spresense/configs/elf/defconfig index 97e65999aee..848f9e3339d 100644 --- a/boards/arm/cxd56xx/spresense/configs/elf/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/elf/defconfig @@ -9,6 +9,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig b/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig index d6490d320bb..800a5b05fe5 100644 --- a/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig @@ -14,6 +14,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig index e185b1d7c8b..0015ab5dd1c 100644 --- a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig @@ -14,6 +14,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig index 1cc2eb6d53e..f808854b164 100644 --- a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig @@ -12,6 +12,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/lte/defconfig b/boards/arm/cxd56xx/spresense/configs/lte/defconfig index a478b05e5c5..3b090c159bb 100644 --- a/boards/arm/cxd56xx/spresense/configs/lte/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/lte/defconfig @@ -12,6 +12,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/module/defconfig b/boards/arm/cxd56xx/spresense/configs/module/defconfig index 059b286adbd..d91a4df0bde 100644 --- a/boards/arm/cxd56xx/spresense/configs/module/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/module/defconfig @@ -9,6 +9,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig index 49491fa4f23..ed773a280ab 100644 --- a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig @@ -12,6 +12,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/nsh/defconfig b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig index 04d9ba3e1ad..3903265caa4 100644 --- a/boards/arm/cxd56xx/spresense/configs/nsh/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig @@ -9,6 +9,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/nsh_trace/defconfig b/boards/arm/cxd56xx/spresense/configs/nsh_trace/defconfig index 75e38376cec..593f945ef4d 100644 --- a/boards/arm/cxd56xx/spresense/configs/nsh_trace/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/nsh_trace/defconfig @@ -9,6 +9,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig index f03c7e882a6..5618664019c 100644 --- a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig @@ -9,6 +9,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig index a3675e4fcc7..00e277734d0 100644 --- a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig index 32ced276e0f..903de5f57d9 100644 --- a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/smp/defconfig b/boards/arm/cxd56xx/spresense/configs/smp/defconfig index df70daa198b..bbf2211f225 100644 --- a/boards/arm/cxd56xx/spresense/configs/smp/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/smp/defconfig @@ -9,6 +9,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig index 88fbf41b7d7..b6bfebece89 100644 --- a/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig @@ -12,6 +12,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig index 0aa76e8d6e3..16076a35cdd 100644 --- a/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig @@ -12,6 +12,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig index 5de3b6af7b8..13e23908577 100644 --- a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig @@ -13,6 +13,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig index 0ec8d6663d8..0151beabf28 100644 --- a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig @@ -13,6 +13,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y diff --git a/boards/arm/cxd56xx/spresense/scripts/Make.defs b/boards/arm/cxd56xx/spresense/scripts/Make.defs index de0a530ab1b..48b963c06f0 100644 --- a/boards/arm/cxd56xx/spresense/scripts/Make.defs +++ b/boards/arm/cxd56xx/spresense/scripts/Make.defs @@ -25,7 +25,7 @@ include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs # Setup for the kind of memory that we are executing from -ifeq ($(CONFIG_CXD56_USE_SYSBUS), y) +ifeq ($(CONFIG_CXD56_USE_SYSBUS),y) LDSCRIPT = ramconfig-new.ld else LDSCRIPT = ramconfig.ld diff --git a/boards/arm/rp2040/common/Makefile b/boards/arm/rp2040/common/Makefile index 44a345c756f..727ea8b9019 100644 --- a/boards/arm/rp2040/common/Makefile +++ b/boards/arm/rp2040/common/Makefile @@ -31,4 +31,3 @@ include $(TOPDIR)/boards/Board.mk ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src BOARDDIR = $(ARCHSRCDIR)$(DELIM)board CFLAGS += $(shell $(INCDIR) "$(CC)" $(BOARDDIR)$(DELIM)include) - diff --git a/boards/arm/rp2040/common/src/Make.defs b/boards/arm/rp2040/common/src/Make.defs index 752224b42c6..1fa5ecb93a7 100644 --- a/boards/arm/rp2040/common/src/Make.defs +++ b/boards/arm/rp2040/common/src/Make.defs @@ -18,6 +18,8 @@ # ############################################################################# +ifeq ($(CONFIG_ARCH_BOARD_COMMON),y) + ifeq ($(CONFIG_RP2040_I2C_DRIVER),y) CSRCS += rp2040_i2cdev.c endif @@ -73,3 +75,5 @@ endif DEPPATH += --dep-path src VPATH += :src CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src) + +endif diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/composite/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/composite/defconfig index db17a643a5b..573206543a7 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/composite/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/composite/defconfig @@ -17,6 +17,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pimoroni-tiny2040" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_PIMORONI_TINY2040=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/gpio/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/gpio/defconfig index 3ad6d6cb19a..a25898b3372 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/gpio/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/gpio/defconfig @@ -14,6 +14,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pimoroni-tiny2040" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_PIMORONI_TINY2040=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh/defconfig index 70964dd7f69..8c9b8172f68 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/nsh/defconfig @@ -14,6 +14,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pimoroni-tiny2040" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_PIMORONI_TINY2040=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/nshsram/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/nshsram/defconfig index f0e347c9bf5..99dbb282a93 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/nshsram/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/nshsram/defconfig @@ -15,6 +15,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pimoroni-tiny2040" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_PIMORONI_TINY2040=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/smp/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/smp/defconfig index 3512946e546..235ce75b963 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/smp/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/smp/defconfig @@ -14,6 +14,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pimoroni-tiny2040" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_PIMORONI_TINY2040=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/spisd/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/spisd/defconfig index 1a340335bb4..de1e4d5a482 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/spisd/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/spisd/defconfig @@ -17,6 +17,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pimoroni-tiny2040" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_PIMORONI_TINY2040=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/usbmsc/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/usbmsc/defconfig index 6fd91563277..57cddbec76c 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/usbmsc/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/usbmsc/defconfig @@ -17,6 +17,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pimoroni-tiny2040" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_PIMORONI_TINY2040=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/pimoroni-tiny2040/configs/usbnsh/defconfig b/boards/arm/rp2040/pimoroni-tiny2040/configs/usbnsh/defconfig index 95042150897..d1af1ca2e9a 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/configs/usbnsh/defconfig +++ b/boards/arm/rp2040/pimoroni-tiny2040/configs/usbnsh/defconfig @@ -15,6 +15,7 @@ # CONFIG_RP2040_UART0 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pimoroni-tiny2040" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_PIMORONI_TINY2040=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig index c692b597025..41d32edef72 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/audiopack/defconfig @@ -21,6 +21,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig index b04617574c7..38484216bc7 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/composite/defconfig @@ -17,6 +17,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig index 998a0bf346d..f48923f4ae7 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig @@ -20,6 +20,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig index 59dfa705846..89c73fc0c7b 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig @@ -14,6 +14,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig index a22a0b22fef..db9f390dec2 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/lcd1602/defconfig @@ -14,6 +14,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig index 545734df1e9..421ba0692a1 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig @@ -14,6 +14,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig index e90297c3120..854cb64d539 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig @@ -15,6 +15,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig index 40de6373963..e7fc281bcd6 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig @@ -14,6 +14,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig index fc65e17f358..b662bbaa520 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig @@ -17,6 +17,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig index 3c4902da588..e9ebc400d26 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig @@ -17,6 +17,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig index e14cc0034c4..9e7d8caaab3 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/st7735/defconfig @@ -14,6 +14,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig index ce32a2e51e0..fc4af6e603b 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/usbmsc/defconfig @@ -17,6 +17,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig index e45f7ee4c63..1944655f00b 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/usbnsh/defconfig @@ -15,6 +15,7 @@ # CONFIG_RP2040_UART0 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig index 4a63b15d54b..b4748ad3df3 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.14/defconfig @@ -19,6 +19,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig index 66d6cee8027..70ffeac581e 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/waveshare-lcd-1.3/defconfig @@ -19,6 +19,7 @@ # CONFIG_STANDARD_SERIAL is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="raspberrypi-pico" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_RASPBERRYPI_PICO=y CONFIG_ARCH_CHIP="rp2040" CONFIG_ARCH_CHIP_RP2040=y diff --git a/boards/arm/samd5e5/same54-xplained-pro/src/Makefile b/boards/arm/samd5e5/same54-xplained-pro/src/Makefile index dc3b6d42db3..e21e1bbd50f 100644 --- a/boards/arm/samd5e5/same54-xplained-pro/src/Makefile +++ b/boards/arm/samd5e5/same54-xplained-pro/src/Makefile @@ -32,7 +32,7 @@ else CSRCS += sam_userleds.c endif -ifeq ($(CONFIG_SAMD5E5_GMAC_PHYINIT), y) +ifeq ($(CONFIG_SAMD5E5_GMAC_PHYINIT),y) CSRCS += sam_phyinit.c endif diff --git a/boards/arm/samv7/common/Kconfig b/boards/arm/samv7/common/Kconfig index 7a7f91bae76..a0c7bb963b5 100644 --- a/boards/arm/samv7/common/Kconfig +++ b/boards/arm/samv7/common/Kconfig @@ -3,14 +3,6 @@ # see the file kconfiglanguage.txt in the NuttX tools repository. # -config BOARD_SAMV7_COMMON - bool "Board common logic" - default n - ---help--- - Board common logic located in each board/common folder. - -if BOARD_SAMV7_COMMON - config SAMV7_HSMCI0_AUTOMOUNT bool "HSMCI0 automounter" default n @@ -130,5 +122,3 @@ config SAMV7_OTA_SCRATCH_SIZE default 0x20000 endif # SAMV7_FORMAT_MCUBOOT - -endif # BOARD_SAMV7_COMMON diff --git a/boards/arm/samv7/common/src/Make.defs b/boards/arm/samv7/common/src/Make.defs index 3e4f296d50d..9b060b89524 100644 --- a/boards/arm/samv7/common/src/Make.defs +++ b/boards/arm/samv7/common/src/Make.defs @@ -18,8 +18,7 @@ # ############################################################################# -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += sam_progmem.c +ifeq ($(CONFIG_ARCH_BOARD_COMMON),y) ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += sam_reset.c @@ -29,9 +28,11 @@ ifeq ($(CONFIG_BOARDCTL_BOOT_IMAGE),y) CSRCS += sam_boot_image.c endif -else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y) +ifeq ($(CONFIG_SAMV7_PROGMEM),y) +ifeq ($(CONFIG_MTD_PROGMEM),y) CSRCS += sam_progmem.c endif +endif ifeq ($(CONFIG_SAMV7_HSMCI0),y) CSRCS += sam_hsmci.c @@ -44,3 +45,5 @@ endif DEPPATH += --dep-path src VPATH += :src CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src) + +endif diff --git a/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig b/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig index 1f8d9f48520..bf2d8a76404 100644 --- a/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig +++ b/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig @@ -10,6 +10,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-qmtech" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAME70_QMTECH=y CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAME70=y @@ -25,7 +26,6 @@ CONFIG_ARMV7M_ICACHE=y CONFIG_ARMV7M_LAZYFPU=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=51262 -CONFIG_BOARD_SAMV7_COMMON=y CONFIG_BOOT_MCUBOOT=y CONFIG_BUILTIN=y CONFIG_FAT_LCNAMES=y diff --git a/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig b/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig index 56dc3196754..81b43d28361 100644 --- a/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig +++ b/boards/arm/samv7/same70-qmtech/configs/mcuboot-loader/defconfig @@ -10,6 +10,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-qmtech" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAME70_QMTECH=y CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAME70=y @@ -25,7 +26,6 @@ CONFIG_ARMV7M_ICACHE=y CONFIG_ARMV7M_LAZYFPU=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=51262 -CONFIG_BOARD_SAMV7_COMMON=y CONFIG_BOOT_MCUBOOT=y CONFIG_BUILTIN=y CONFIG_FAT_LCNAMES=y diff --git a/boards/arm/samv7/same70-qmtech/configs/nsh/defconfig b/boards/arm/samv7/same70-qmtech/configs/nsh/defconfig index 871c2e65370..8b4dc914d97 100644 --- a/boards/arm/samv7/same70-qmtech/configs/nsh/defconfig +++ b/boards/arm/samv7/same70-qmtech/configs/nsh/defconfig @@ -11,6 +11,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-qmtech" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAME70_QMTECH=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/same70-xplained/configs/adc/defconfig b/boards/arm/samv7/same70-xplained/configs/adc/defconfig index 740c160b58e..43c01122a74 100644 --- a/boards/arm/samv7/same70-xplained/configs/adc/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/adc/defconfig @@ -16,6 +16,7 @@ CONFIG_ADC=y CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig b/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig index 3d8edfc5984..f84923a889d 100644 --- a/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig @@ -13,6 +13,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" @@ -34,7 +35,6 @@ CONFIG_AT24XX_EXTSIZE=160 CONFIG_AT24XX_SIZE=2 CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=51262 -CONFIG_BOARD_SAMV7_COMMON=y CONFIG_BOOT_MCUBOOT=y CONFIG_BUILTIN=y CONFIG_FAT_LCNAMES=y diff --git a/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig b/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig index eedc79c3133..1c5570a36d4 100644 --- a/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig @@ -13,6 +13,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" @@ -34,7 +35,6 @@ CONFIG_AT24XX_EXTSIZE=160 CONFIG_AT24XX_SIZE=2 CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=51262 -CONFIG_BOARD_SAMV7_COMMON=y CONFIG_BOOT_MCUBOOT=y CONFIG_BUILTIN=y CONFIG_FAT_LCNAMES=y diff --git a/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig b/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig index 048dfdb459f..0f89b0a0bb3 100644 --- a/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig @@ -13,6 +13,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/same70-xplained/configs/nsh/defconfig b/boards/arm/samv7/same70-xplained/configs/nsh/defconfig index c0e98c5a358..9a514099325 100644 --- a/boards/arm/samv7/same70-xplained/configs/nsh/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/nsh/defconfig @@ -14,6 +14,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/same70-xplained/configs/pwm/defconfig b/boards/arm/samv7/same70-xplained/configs/pwm/defconfig index 7db8c81a112..f2cc60be7e1 100644 --- a/boards/arm/samv7/same70-xplained/configs/pwm/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/pwm/defconfig @@ -14,6 +14,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/same70-xplained/configs/pysim/defconfig b/boards/arm/samv7/same70-xplained/configs/pysim/defconfig index 367dbaa0309..5fcceda26b1 100644 --- a/boards/arm/samv7/same70-xplained/configs/pysim/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/pysim/defconfig @@ -15,6 +15,7 @@ CONFIG_ADC=y CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig index a605ef7d707..af4e782e156 100644 --- a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig @@ -14,6 +14,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/samv71-xult/configs/knsh/defconfig b/boards/arm/samv7/samv71-xult/configs/knsh/defconfig index 27f36c2ba6f..87a699b4845 100644 --- a/boards/arm/samv7/samv71-xult/configs/knsh/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/knsh/defconfig @@ -14,6 +14,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig b/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig index 2d361eb5761..0f7a9afecf4 100644 --- a/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig @@ -10,6 +10,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" @@ -28,7 +29,6 @@ CONFIG_ARMV7M_LAZYFPU=y CONFIG_BOARDCTL_RESET=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=51262 -CONFIG_BOARD_SAMV7_COMMON=y CONFIG_BOOT_MCUBOOT=y CONFIG_BUILTIN=y CONFIG_FS_PROCFS=y diff --git a/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig b/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig index de7615149c1..9371e405105 100644 --- a/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig @@ -10,6 +10,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" @@ -28,7 +29,6 @@ CONFIG_ARMV7M_LAZYFPU=y CONFIG_BOARDCTL_RESET=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=51262 -CONFIG_BOARD_SAMV7_COMMON=y CONFIG_BOOT_MCUBOOT=y CONFIG_BUILTIN=y CONFIG_FS_PROCFS=y diff --git a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig index e7982520537..52a906f8195 100644 --- a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig @@ -12,6 +12,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig b/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig index a1b06bac04b..65d0fb8812f 100644 --- a/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig @@ -15,6 +15,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig b/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig index 13ef1a07db3..09990555e0b 100644 --- a/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig @@ -13,6 +13,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/samv71-xult/configs/nsh/defconfig b/boards/arm/samv7/samv71-xult/configs/nsh/defconfig index 5c489295dd0..81d946ad04b 100644 --- a/boards/arm/samv7/samv71-xult/configs/nsh/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/nsh/defconfig @@ -14,6 +14,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig b/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig index 28df58093fb..ba00d20ffad 100644 --- a/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig @@ -17,6 +17,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/samv71-xult/configs/vnc/defconfig b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig index 932194deff6..46f1328c578 100644 --- a/boards/arm/samv7/samv71-xult/configs/vnc/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig @@ -14,6 +14,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig index c3764067dfc..6337925e9ac 100644 --- a/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig @@ -14,6 +14,7 @@ # CONFIG_SAMV7_UART4 is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="samv7" diff --git a/boards/arm/stm32/common/Kconfig b/boards/arm/stm32/common/Kconfig index 40ec72bfe8e..3e611724880 100644 --- a/boards/arm/stm32/common/Kconfig +++ b/boards/arm/stm32/common/Kconfig @@ -3,14 +3,6 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -config BOARD_STM32_COMMON - bool "Board common logic" - default n - ---help--- - Board common logic located in each board/common folder. - -if BOARD_STM32_COMMON - if STM32_FOC menuconfig BOARD_STM32_IHM07M1 @@ -77,5 +69,3 @@ config BOARD_STM32_HALL3PHASE_SAMPLES default 10 endif # SENSORS_HALL3PHASE - -endif # BOARD_STM32_COMMON diff --git a/boards/arm/stm32/common/Makefile b/boards/arm/stm32/common/Makefile index 18f3dadb6fd..ad361f5a00b 100644 --- a/boards/arm/stm32/common/Makefile +++ b/boards/arm/stm32/common/Makefile @@ -31,4 +31,3 @@ include $(TOPDIR)/boards/Board.mk ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src BOARDDIR = $(ARCHSRCDIR)$(DELIM)board CFLAGS += $(shell $(INCDIR) "$(CC)" $(BOARDDIR)$(DELIM)include) - diff --git a/boards/arm/stm32/common/src/Make.defs b/boards/arm/stm32/common/src/Make.defs index 7120c81d34c..cb5737f5f9b 100644 --- a/boards/arm/stm32/common/src/Make.defs +++ b/boards/arm/stm32/common/src/Make.defs @@ -18,6 +18,8 @@ # ############################################################################# +ifeq ($(CONFIG_ARCH_BOARD_COMMON),y) + ifeq ($(CONFIG_SENSORS_BMP180),y) CSRCS += stm32_bmp180.c endif @@ -137,3 +139,5 @@ endif DEPPATH += --dep-path src VPATH += :src CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src) + +endif diff --git a/boards/arm/stm32/nucleo-f103rb/configs/ihm07m1_b16/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/ihm07m1_b16/defconfig index 1f435df9101..80fdccd8eee 100644 --- a/boards/arm/stm32/nucleo-f103rb/configs/ihm07m1_b16/defconfig +++ b/boards/arm/stm32/nucleo-f103rb/configs/ihm07m1_b16/defconfig @@ -12,6 +12,7 @@ CONFIG_ADC_FIFOSIZE=3 CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f103rb" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_F103RB=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" @@ -20,7 +21,6 @@ CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_IRQBUTTONS=y CONFIG_BOARD_LOOPSPERMSEC=8499 -CONFIG_BOARD_STM32_COMMON=y CONFIG_BOARD_STM32_IHM07M1=y CONFIG_BOARD_STM32_IHM07M1_POT=y CONFIG_BOARD_STM32_IHM07M1_VBUS=y diff --git a/boards/arm/stm32/nucleo-f103rb/configs/qenco/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/qenco/defconfig index 9747cf1f491..ebfac051572 100644 --- a/boards/arm/stm32/nucleo-f103rb/configs/qenco/defconfig +++ b/boards/arm/stm32/nucleo-f103rb/configs/qenco/defconfig @@ -7,6 +7,7 @@ # CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f103rb" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_F103RB=y CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y diff --git a/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_b16/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_b16/defconfig index 1bcb3ba92db..8bf343c1df3 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_b16/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_b16/defconfig @@ -12,6 +12,7 @@ CONFIG_ADC_FIFOSIZE=3 CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f302r8" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_F302R8=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" @@ -21,7 +22,6 @@ CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARMV7M_LIBM=y CONFIG_BOARD_LOOPSPERMSEC=8499 -CONFIG_BOARD_STM32_COMMON=y CONFIG_BOARD_STM32_IHM07M1=y CONFIG_BOARD_STM32_IHM07M1_POT=y CONFIG_BOARD_STM32_IHM07M1_VBUS=y diff --git a/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_f32/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_f32/defconfig index 1209343098e..d0742009ccc 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_f32/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_f32/defconfig @@ -12,6 +12,7 @@ CONFIG_ADC_FIFOSIZE=3 CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f302r8" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_F302R8=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" @@ -21,7 +22,6 @@ CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARMV7M_LIBM=y CONFIG_BOARD_LOOPSPERMSEC=8499 -CONFIG_BOARD_STM32_COMMON=y CONFIG_BOARD_STM32_IHM07M1=y CONFIG_BOARD_STM32_IHM07M1_POT=y CONFIG_BOARD_STM32_IHM07M1_VBUS=y diff --git a/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig index d4d9b5305ce..9346cace5b8 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig @@ -7,6 +7,7 @@ # CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f302r8" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_F302R8=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" @@ -15,7 +16,6 @@ CONFIG_ARCH_CHIP_STM32F302R8=y CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_IRQPRIO=y CONFIG_BOARD_LOOPSPERMSEC=8499 -CONFIG_BOARD_STM32_COMMON=y CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y diff --git a/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig index 69ecd6e51e5..3c09c2da600 100644 --- a/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig @@ -10,6 +10,7 @@ # CONFIG_NX_DISABLE_1BPP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303ze" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_F303ZE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" diff --git a/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_b16/defconfig b/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_b16/defconfig index 94a2545f513..248f932a9c6 100644 --- a/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_b16/defconfig +++ b/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_b16/defconfig @@ -12,6 +12,7 @@ CONFIG_ADC_FIFOSIZE=3 CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f446re" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_F446RE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" @@ -21,7 +22,6 @@ CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARMV7M_LIBM=y CONFIG_BOARD_LOOPSPERMSEC=8499 -CONFIG_BOARD_STM32_COMMON=y CONFIG_BOARD_STM32_IHM08M1=y CONFIG_BOARD_STM32_IHM08M1_POT=y CONFIG_BOARD_STM32_IHM08M1_VBUS=y diff --git a/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_f32/defconfig b/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_f32/defconfig index 96b37ae8e25..60726db213b 100644 --- a/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_f32/defconfig +++ b/boards/arm/stm32/nucleo-f446re/configs/ihm08m1_f32/defconfig @@ -12,6 +12,7 @@ CONFIG_ADC_FIFOSIZE=3 CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f446re" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_F446RE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" @@ -21,7 +22,6 @@ CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARMV7M_LIBM=y CONFIG_BOARD_LOOPSPERMSEC=8499 -CONFIG_BOARD_STM32_COMMON=y CONFIG_BOARD_STM32_IHM08M1=y CONFIG_BOARD_STM32_IHM08M1_POT=y CONFIG_BOARD_STM32_IHM08M1_VBUS=y diff --git a/boards/arm/stm32/nucleo-f446re/configs/qenco/defconfig b/boards/arm/stm32/nucleo-f446re/configs/qenco/defconfig index ea1d1581fd5..fdf01718331 100644 --- a/boards/arm/stm32/nucleo-f446re/configs/qenco/defconfig +++ b/boards/arm/stm32/nucleo-f446re/configs/qenco/defconfig @@ -7,6 +7,7 @@ # CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f446re" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_F446RE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" @@ -15,7 +16,6 @@ CONFIG_ARCH_CHIP_STM32F446R=y CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_IRQPRIO=y CONFIG_BOARD_LOOPSPERMSEC=8499 -CONFIG_BOARD_STM32_COMMON=y CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_EXAMPLES_QENCODER=y diff --git a/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_b16/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_b16/defconfig index 5ea806d4b91..a02caa36be8 100644 --- a/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_b16/defconfig +++ b/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_b16/defconfig @@ -12,6 +12,7 @@ CONFIG_ADC_FIFOSIZE=3 CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-g431rb" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_G431RB=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" @@ -21,7 +22,6 @@ CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARMV7M_LIBM=y CONFIG_BOARD_LOOPSPERMSEC=8499 -CONFIG_BOARD_STM32_COMMON=y CONFIG_BOARD_STM32_IHM16M1=y CONFIG_BOARD_STM32_IHM16M1_POT=y CONFIG_BOARD_STM32_IHM16M1_VBUS=y diff --git a/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_f32/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_f32/defconfig index e533e8239e0..ea95c5633b6 100644 --- a/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_f32/defconfig +++ b/boards/arm/stm32/nucleo-g431rb/configs/ihm16m1_f32/defconfig @@ -12,6 +12,7 @@ CONFIG_ADC_FIFOSIZE=3 CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-g431rb" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_G431RB=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" @@ -21,7 +22,6 @@ CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARMV7M_LIBM=y CONFIG_BOARD_LOOPSPERMSEC=8499 -CONFIG_BOARD_STM32_COMMON=y CONFIG_BOARD_STM32_IHM16M1=y CONFIG_BOARD_STM32_IHM16M1_POT=y CONFIG_BOARD_STM32_IHM16M1_VBUS=y diff --git a/boards/arm/stm32/nucleo-g431rb/configs/qenco/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/qenco/defconfig index d1699991367..3b62c97f5c3 100644 --- a/boards/arm/stm32/nucleo-g431rb/configs/qenco/defconfig +++ b/boards/arm/stm32/nucleo-g431rb/configs/qenco/defconfig @@ -13,6 +13,7 @@ # CONFIG_NSH_DISABLE_PS is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-g431rb" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NUCLEO_G431RB=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig index 5f0e7b0400e..92e82349081 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig index 48cf7c73491..1500f52308b 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig @@ -9,6 +9,7 @@ # CONFIG_DEV_CONSOLE is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig index 2dea33f8730..127f02ee65a 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig @@ -7,6 +7,7 @@ # CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p407" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" diff --git a/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig b/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig index a66a2187e06..a13384fae39 100644 --- a/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig @@ -19,6 +19,7 @@ # CONFIG_NSH_DISABLE_XD is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32_tiny" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_STM32_TINY=y CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y diff --git a/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig index 158da8e3f49..a213d10df4d 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig @@ -19,6 +19,7 @@ # CONFIG_NSH_DISABLE_XD is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y diff --git a/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig index 925813385e6..cf526d4e69d 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig @@ -19,6 +19,7 @@ # CONFIG_NSH_DISABLE_XD is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y diff --git a/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig index d9b56efe5c5..aa72ac8aec7 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig @@ -19,6 +19,7 @@ # CONFIG_NSH_DISABLE_XD is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y diff --git a/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig index ad54ae6fc32..68b956e6a40 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig @@ -19,6 +19,7 @@ # CONFIG_NSH_DISABLE_XD is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y diff --git a/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig index 394e5a2621a..493d8651b30 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig @@ -19,6 +19,7 @@ # CONFIG_NSH_DISABLE_XD is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig b/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig index 1b7addf4c8e..4ef089c06bc 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" diff --git a/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig index 41bd3e6a42a..01f9501b354 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" diff --git a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig index f1380b3dede..29309da1611 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/Makefile b/boards/arm/stm32f7/stm32f746g-disco/src/Makefile index cf5120f6ea9..7ce6fed1dad 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/Makefile +++ b/boards/arm/stm32f7/stm32f746g-disco/src/Makefile @@ -64,11 +64,11 @@ ifeq ($(CONFIG_MTD_N25QXXX),y) CSRCS += stm32_n25q.c endif -ifeq ($(CONFIG_STM32F7_SDMMC), y) +ifeq ($(CONFIG_STM32F7_SDMMC),y) CSRCS += stm32_sdmmc.c endif -ifeq ($(CONFIG_AUDIO_WM8994), y) +ifeq ($(CONFIG_AUDIO_WM8994),y) CSRCS += stm32_wm8994.c endif diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/Makefile b/boards/arm/stm32h7/nucleo-h743zi/src/Makefile index 616789e171c..b07d4c507b9 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/Makefile +++ b/boards/arm/stm32h7/nucleo-h743zi/src/Makefile @@ -88,7 +88,7 @@ ifeq ($(CONFIG_PWM),y) CSRCS += stm32_pwm.c endif -ifeq ($(CONFIG_BOARDCTL_RESET), y) +ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += stm32_reset.c endif diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/Makefile b/boards/arm/stm32h7/stm32h747i-disco/src/Makefile index 76ad1323cd1..626e11f8dad 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/Makefile +++ b/boards/arm/stm32h7/stm32h747i-disco/src/Makefile @@ -52,11 +52,11 @@ ifeq ($(CONFIG_BOARDCTL),y) CSRCS += stm32_appinitialize.c endif -ifeq ($(CONFIG_STM32H7_SDMMC), y) +ifeq ($(CONFIG_STM32H7_SDMMC),y) CSRCS += stm32_sdmmc.c endif -ifeq ($(CONFIG_FAT_DMAMEMORY), y) +ifeq ($(CONFIG_FAT_DMAMEMORY),y) CSRCS += stm32_dma_alloc.c endif diff --git a/boards/risc-v/mpfs/common/Makefile b/boards/risc-v/mpfs/common/Makefile index 113f4a106b0..dd13c8f96b9 100644 --- a/boards/risc-v/mpfs/common/Makefile +++ b/boards/risc-v/mpfs/common/Makefile @@ -31,4 +31,3 @@ include $(TOPDIR)/boards/Board.mk ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src BOARDDIR = $(ARCHSRCDIR)$(DELIM)board CFLAGS += $(shell $(INCDIR) "$(CC)" $(BOARDDIR)$(DELIM)include) - diff --git a/boards/risc-v/mpfs/common/src/Make.defs b/boards/risc-v/mpfs/common/src/Make.defs index 9ed96cfc652..2d9465b58a7 100755 --- a/boards/risc-v/mpfs/common/src/Make.defs +++ b/boards/risc-v/mpfs/common/src/Make.defs @@ -18,6 +18,8 @@ # ############################################################################ +ifeq ($(CONFIG_ARCH_BOARD_COMMON),y) + CSRCS += mpfs_boot.c ifeq ($(CONFIG_I2C),y) @@ -47,3 +49,5 @@ endif DEPPATH += --dep-path src VPATH += :src CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src) + +endif diff --git a/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig index fb1b7e81719..4f6dc139a1a 100644 --- a/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="icicle" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ICICLE_MPFS=y CONFIG_ARCH_CHIP="mpfs" CONFIG_ARCH_CHIP_MPFS250T_FCVG484=y diff --git a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig index 66f90ab782b..e53d5639d9c 100644 --- a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig @@ -9,6 +9,7 @@ # CONFIG_NSH_DISABLE_LOSMART is not set CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="icicle" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ICICLE_MPFS=y CONFIG_ARCH_CHIP="mpfs" CONFIG_ARCH_CHIP_MPFS250T_FCVG484=y diff --git a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig index 8ee7466ed2d..0940f456773 100644 --- a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig @@ -10,6 +10,7 @@ # CONFIG_NSH_DISABLE_LOSMART is not set CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="icicle" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ICICLE_MPFS=y CONFIG_ARCH_CHIP="mpfs" CONFIG_ARCH_CHIP_MPFS250T_FCVG484=y diff --git a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig index 3a2e4d77c65..5699b659c54 100644 --- a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig @@ -9,6 +9,7 @@ # CONFIG_DISABLE_OS_API is not set CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="icicle" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ICICLE_MPFS=y CONFIG_ARCH_CHIP="mpfs" CONFIG_ARCH_CHIP_MPFS250T_FCVG484=y diff --git a/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig b/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig index 8ee7466ed2d..0940f456773 100644 --- a/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig +++ b/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig @@ -10,6 +10,7 @@ # CONFIG_NSH_DISABLE_LOSMART is not set CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="icicle" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ICICLE_MPFS=y CONFIG_ARCH_CHIP="mpfs" CONFIG_ARCH_CHIP_MPFS250T_FCVG484=y diff --git a/boards/xtensa/esp32/common/Kconfig b/boards/xtensa/esp32/common/Kconfig index 7448a6d6c9e..afc26b70b66 100644 --- a/boards/xtensa/esp32/common/Kconfig +++ b/boards/xtensa/esp32/common/Kconfig @@ -2,6 +2,7 @@ # For a description of the syntax of this configuration file, # see the file kconfig-language.txt in the NuttX tools repository. # + config ESP32_MERGE_BINS bool "Merge raw binary files into a single file" default n diff --git a/boards/xtensa/esp32/common/src/Make.defs b/boards/xtensa/esp32/common/src/Make.defs index 5de05384de5..e027873dec9 100644 --- a/boards/xtensa/esp32/common/src/Make.defs +++ b/boards/xtensa/esp32/common/src/Make.defs @@ -18,6 +18,8 @@ # ############################################################################# +ifeq ($(CONFIG_ARCH_BOARD_COMMON),y) + ifeq ($(CONFIG_WATCHDOG),y) CSRCS += esp32_board_wdt.c endif @@ -85,3 +87,5 @@ endif DEPPATH += --dep-path src VPATH += :src CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src) + +endif diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig index 26c2266c0a6..7c5449cb966 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig index c25583fba43..851fd3a13d4 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/ble/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig index 25a05cf3e2f..f11654b3666 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/buttons/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/buttons/defconfig index 72b510a757c..8fe571010d3 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/buttons/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/buttons/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="esp32" diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/coex/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/coex/defconfig index fa980a78615..75b4de612e5 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/coex/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/coex/defconfig @@ -36,6 +36,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig index 358b595fc80..114b07ca6ad 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig index d26d664f33f..beb69be0060 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig index c07fdc45d5d..c3b581a23a2 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig @@ -12,6 +12,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig index 09ce2d3f779..44a2650bb03 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig index 54e5b0b32bd..6ce4311ad97 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig index 9d3bd015e72..c2319f801a5 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig @@ -16,6 +16,7 @@ # CONFIG_SPI_EXCHANGE is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/modbus/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/modbus/defconfig index ad5d714e52b..d0b0d1a43dd 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/modbus/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/modbus/defconfig @@ -12,6 +12,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/module/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/module/defconfig index 70f75a6fa63..d571918d8f0 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/module/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/module/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig index 67de0b39f5e..984282af338 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/ms5611/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/ms5611/defconfig index 2c9b66c4ed1..aac280520c8 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/ms5611/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/ms5611/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig index f62029b6e9f..45f7514ff8c 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig index f8ae759ca2b..3f8aea59615 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/oneshot/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/oneshot/defconfig index 17107627b6d..83dcfb1fb79 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/oneshot/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/oneshot/defconfig @@ -12,6 +12,7 @@ CONFIG_ALARM_ARCH=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig index 62bc9b6311b..643ed46e7fe 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig index 7fa292fdd3e..8244d7fa1b8 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig index b0132877127..d6771faa677 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/pwm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/pwm/defconfig index 6cc748d9859..67ca30b020b 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/pwm/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/pwm/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig index 18c480b4fd1..f8114226743 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/rtc/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/rtc/defconfig index a509aa9e49e..8a20ad81d6b 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/rtc/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/rtc/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig index c6478f1cba9..7f148e0eadf 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/sotest/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/sotest/defconfig index a8563e04485..766fd33e33c 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/sotest/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/sotest/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig index 1ba0f0b4d78..a62d9ed873d 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig index b14830eda32..6134e4935e7 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig @@ -13,6 +13,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/tickless/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/tickless/defconfig index 879b568f241..c4796577074 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/tickless/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/tickless/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig index a53434100f2..91c8cb80c69 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig index e4b30fcc5de..e1a37be77e1 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig index 2016fe35b92..d97162c3932 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig index 99a707cbf50..456839d08f7 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig index d428eea1e9b..627345a2d60 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig index 57cc13d8d44..6edf072afbb 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-devkitc" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_DEVKITC=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig index b8fa78c75e8..8384a356aa4 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig @@ -11,6 +11,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-ethernet-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/buttons/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/buttons/defconfig index c9ec8c72c60..d4dec0a1bc5 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/buttons/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/buttons/defconfig @@ -10,6 +10,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-ethernet-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="esp32" diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig index c759a208ded..284064ef979 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig @@ -10,6 +10,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-ethernet-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig index 02f0c50e00b..6aa69892e7f 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig @@ -10,6 +10,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-ethernet-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig index fcbbe27a98a..4e41506eece 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig @@ -10,6 +10,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-ethernet-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig index ded092058e7..70e66356d59 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig @@ -10,6 +10,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-ethernet-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/oneshot/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/oneshot/defconfig index 8a5f6df6744..812aa899ed3 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/oneshot/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/oneshot/defconfig @@ -11,6 +11,7 @@ CONFIG_ALARM_ARCH=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-ethernet-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/rtc/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/rtc/defconfig index bbf67d8710f..509b04b2c1b 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/rtc/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/rtc/defconfig @@ -10,6 +10,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-ethernet-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/tickless/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/tickless/defconfig index afc0b8d0505..b834cbf8159 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/tickless/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/tickless/defconfig @@ -10,6 +10,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-ethernet-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig index dbb50e91df0..bbc40eaa7ce 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig @@ -11,6 +11,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-ethernet-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_ETHERNETKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig index eae63477dcb..caf877de72f 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig index db94c666763..2f484c07082 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/buttons/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/buttons/defconfig index 3aade112326..417ec12919d 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/buttons/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/buttons/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="esp32" diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig index 2285875ba6e..440eeae6373 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/lcd1602/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/lcd1602/defconfig index e146b48cfc2..364c23ec250 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/lcd1602/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/lcd1602/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig index 3b314af3eb3..86f2f58c682 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/lvgl/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/lvgl/defconfig index 1d6221410f2..a04535c1c76 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/lvgl/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/lvgl/defconfig @@ -13,6 +13,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig index a065381e560..4cd880b8ec3 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig index 3454be25760..23b0a363b5f 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig index 842407b17be..dbf32580ed4 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/nx/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/nx/defconfig index 43c02e1e3d8..680e1d14bcc 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/nx/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/nx/defconfig @@ -15,6 +15,7 @@ # CONFIG_NX_DISABLE_16BPP is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/oneshot/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/oneshot/defconfig index cbd1ef0a972..21b054090fe 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/oneshot/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/oneshot/defconfig @@ -11,6 +11,7 @@ CONFIG_ALARM_ARCH=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/rtc/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/rtc/defconfig index bfe58fe2309..f8099ed8d47 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/rtc/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/rtc/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/tickless/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/tickless/defconfig index c99c08a4fb4..9e36dfa0145 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/tickless/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/tickless/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig index d4d651b8842..355d50cc6eb 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig @@ -12,6 +12,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32-wrover-kit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/configs/nsh/defconfig b/boards/xtensa/esp32/ttgo_lora_esp32/configs/nsh/defconfig index 0758e79ba47..a10d689fc8d 100644 --- a/boards/xtensa/esp32/ttgo_lora_esp32/configs/nsh/defconfig +++ b/boards/xtensa/esp32/ttgo_lora_esp32/configs/nsh/defconfig @@ -12,6 +12,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="ttgo_lora_esp32" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_TTGO_LORA_ESP32=y CONFIG_ARCH_CHIP="esp32" CONFIG_ARCH_CHIP_ESP32=y diff --git a/boards/xtensa/esp32s2/common/src/Make.defs b/boards/xtensa/esp32s2/common/src/Make.defs index 6fc1ebe0bde..9be45d4cbf1 100644 --- a/boards/xtensa/esp32s2/common/src/Make.defs +++ b/boards/xtensa/esp32s2/common/src/Make.defs @@ -18,6 +18,8 @@ # ############################################################################# +ifeq ($(CONFIG_ARCH_BOARD_COMMON),y) + ifeq ($(CONFIG_WATCHDOG),y) CSRCS += esp32s2_board_wdt.c endif @@ -25,3 +27,5 @@ endif DEPPATH += --dep-path src VPATH += :src CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src) + +endif diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/gpio/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/gpio/defconfig index 4bd6175cb1c..d6c4dbc79ff 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/gpio/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/gpio/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s2-saola-1" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S2_SAOLA_1=y CONFIG_ARCH_CHIP="esp32s2" CONFIG_ARCH_CHIP_ESP32S2=y diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig index 83d8f7b473e..8873d2a0e0e 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s2-saola-1" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S2_SAOLA_1=y CONFIG_ARCH_CHIP="esp32s2" CONFIG_ARCH_CHIP_ESP32S2=y diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nsh/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nsh/defconfig index f26ed8720a5..2b5e2070f72 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nsh/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nsh/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s2-saola-1" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S2_SAOLA_1=y CONFIG_ARCH_CHIP="esp32s2" CONFIG_ARCH_CHIP_ESP32S2=y diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/oneshot/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/oneshot/defconfig index bf168c32726..c48e561ffaa 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/oneshot/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/oneshot/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s2-saola-1" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S2_SAOLA_1=y CONFIG_ARCH_CHIP="esp32s2" CONFIG_ARCH_CHIP_ESP32S2=y diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/random/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/random/defconfig index d17d670f3d9..6b5ba4badfc 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/random/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/random/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s2-saola-1" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S2_SAOLA_1=y CONFIG_ARCH_CHIP="esp32s2" CONFIG_ARCH_CHIP_ESP32S2=y diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/timer/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/timer/defconfig index 5a8b4728548..16fac0d5d17 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/timer/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/timer/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s2-saola-1" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S2_SAOLA_1=y CONFIG_ARCH_CHIP="esp32s2" CONFIG_ARCH_CHIP_ESP32S2=y diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/watchdog/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/watchdog/defconfig index 7ec127967e0..7089f732cb0 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/watchdog/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/watchdog/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s2-saola-1" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S2_SAOLA_1=y CONFIG_ARCH_CHIP="esp32s2" CONFIG_ARCH_CHIP_ESP32S2=y diff --git a/boards/xtensa/esp32s3/common/src/Make.defs b/boards/xtensa/esp32s3/common/src/Make.defs index da97e34c891..26685e67682 100644 --- a/boards/xtensa/esp32s3/common/src/Make.defs +++ b/boards/xtensa/esp32s3/common/src/Make.defs @@ -18,6 +18,8 @@ # ############################################################################# +ifeq ($(CONFIG_ARCH_BOARD_COMMON),y) + ifeq ($(CONFIG_ESP32S3_TIMER),y) CSRCS += esp32s3_board_tim.c endif @@ -33,3 +35,5 @@ endif DEPPATH += --dep-path src VPATH += :src CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src) + +endif diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/nsh/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/nsh/defconfig index 0426fc7ab9c..81a8fb76158 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/nsh/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/nsh/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s3-devkit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S3_DEVKIT=y CONFIG_ARCH_CHIP="esp32s3" CONFIG_ARCH_CHIP_ESP32S3=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/oneshot/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/oneshot/defconfig index 4b40d854773..e35347e6658 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/oneshot/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/oneshot/defconfig @@ -12,6 +12,7 @@ CONFIG_ALARM_ARCH=y CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s3-devkit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S3_DEVKIT=y CONFIG_ARCH_CHIP="esp32s3" CONFIG_ARCH_CHIP_ESP32S3=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/smp/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/smp/defconfig index e2c9d543cae..a411037e55c 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/smp/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/smp/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s3-devkit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S3_DEVKIT=y CONFIG_ARCH_CHIP="esp32s3" CONFIG_ARCH_CHIP_ESP32S3=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/spiflash/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/spiflash/defconfig index 1dcc6a8f8ab..c874e957427 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/spiflash/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/spiflash/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s3-devkit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S3_DEVKIT=y CONFIG_ARCH_CHIP="esp32s3" CONFIG_ARCH_CHIP_ESP32S3=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/tickless/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/tickless/defconfig index 5c6d5af52d6..f458cbe81b9 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/tickless/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/tickless/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s3-devkit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S3_DEVKIT=y CONFIG_ARCH_CHIP="esp32s3" CONFIG_ARCH_CHIP_ESP32S3=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/timer/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/timer/defconfig index a86e6e9e416..019aa241c15 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/timer/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/timer/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s3-devkit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S3_DEVKIT=y CONFIG_ARCH_CHIP="esp32s3" CONFIG_ARCH_CHIP_ESP32S3=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/watchdog/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/watchdog/defconfig index 19d61e1394c..ff0d72462ce 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/watchdog/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/watchdog/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_CMDPARMS is not set CONFIG_ARCH="xtensa" CONFIG_ARCH_BOARD="esp32s3-devkit" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_ESP32S3_DEVKIT=y CONFIG_ARCH_CHIP="esp32s3" CONFIG_ARCH_CHIP_ESP32S3=y