diff --git a/Kconfig.zephyr b/Kconfig.zephyr index b623b2892c0b4..c7c18edf51bb0 100644 --- a/Kconfig.zephyr +++ b/Kconfig.zephyr @@ -19,7 +19,7 @@ osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig" # This loads Zephyr base shield defconfigs source "boards/shields/*/Kconfig.defconfig" -source "$(BOARD_DIR)/Kconfig.defconfig" +osource "$(BOARD_DIR)/Kconfig.defconfig" # This loads custom SoC root defconfigs osource "$(KCONFIG_BINARY_DIR)/Kconfig.soc.defconfig" diff --git a/boards/Kconfig b/boards/Kconfig index 5a0adb67ea59d..6dabe6a89875f 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -2,6 +2,7 @@ config BOARD string + default "$(BOARD)" help This option holds the name of the board and is used to locate the files related to the board in the source tree (under boards/). @@ -39,13 +40,7 @@ config NET_DRIVERS enabled to allow for easy use of SLIP or PPP # Note: $BOARD_DIR might be a glob pattern - -choice - prompt "Board Selection" - -source "$(BOARD_DIR)/Kconfig.board" - -endchoice +source "$(BOARD_DIR)/Kconfig.$(BOARD)" # Parse shields references # Don't do it as a menuconfig, as shield selection is a CMake feature. diff --git a/boards/arc/em_starterkit/Kconfig b/boards/arc/em_starterkit/Kconfig index 45cf1bd243126..b9b6d51152097 100644 --- a/boards/arc/em_starterkit/Kconfig +++ b/boards/arc/em_starterkit/Kconfig @@ -3,10 +3,10 @@ # Copyright (c) 2017 Synopsys, Inc. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Board Firmware Version" - default BOARD_EM_STARTERKIT_R23 - depends on BOARD_EM_STARTERKIT +#choice +# prompt "Board Firmware Version" +# default BOARD_EM_STARTERKIT_R23 +# depends on BOARD_EM_STARTERKIT config BOARD_EM_STARTERKIT_R22 bool "2.2" @@ -14,4 +14,4 @@ choice config BOARD_EM_STARTERKIT_R23 bool "2.3" -endchoice +#endchoice diff --git a/boards/arc/em_starterkit/Kconfig.defconfig b/boards/arc/em_starterkit/Kconfig.defconfig index 05f0ee7b4c2e2..5d32a1c8f622e 100644 --- a/boards/arc/em_starterkit/Kconfig.defconfig +++ b/boards/arc/em_starterkit/Kconfig.defconfig @@ -1,9 +1,9 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_EM_STARTERKIT +#if BOARD_EM_STARTERKIT -config BOARD - default "em_starterkit" +#config BOARD +# default "em_starterkit" if GPIO @@ -29,4 +29,4 @@ config SPI_DW_ARC_AUX_REGS endif # SPI_DW -endif # BOARD_EM_STARTERKIT +#endif # BOARD_EM_STARTERKIT diff --git a/boards/arc/em_starterkit/Kconfig.em_starterkit b/boards/arc/em_starterkit/Kconfig.em_starterkit new file mode 100644 index 0000000000000..1788fad5ec404 --- /dev/null +++ b/boards/arc/em_starterkit/Kconfig.em_starterkit @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EM_STARTERKIT_R23 + bool + default y + select SOC_EMSK + select SOC_EMSK_EM9D diff --git a/boards/arc/em_starterkit/Kconfig.em_starterkit_em11d b/boards/arc/em_starterkit/Kconfig.em_starterkit_em11d new file mode 100644 index 0000000000000..054b403947e13 --- /dev/null +++ b/boards/arc/em_starterkit/Kconfig.em_starterkit_em11d @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EM_STARTERKIT_R23 + bool + default y + select SOC_EMSK + select SOC_EMSK_EM11D diff --git a/boards/arc/em_starterkit/Kconfig.em_starterkit_em7d b/boards/arc/em_starterkit/Kconfig.em_starterkit_em7d new file mode 100644 index 0000000000000..cf9aafa376b58 --- /dev/null +++ b/boards/arc/em_starterkit/Kconfig.em_starterkit_em7d @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EM_STARTERKIT_R23 + bool + default y + select SOC_EMSK + select SOC_EMSK_EM7D diff --git a/boards/arc/em_starterkit/Kconfig.em_starterkit_em7d_v22 b/boards/arc/em_starterkit/Kconfig.em_starterkit_em7d_v22 new file mode 100644 index 0000000000000..766395a302c77 --- /dev/null +++ b/boards/arc/em_starterkit/Kconfig.em_starterkit_em7d_v22 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EM_STARTERKIT_R22 + bool + default y + select SOC_EMSK + select SOC_EMSK_EM7D diff --git a/boards/arc/em_starterkit/Kconfig.em_starterkit_r23 b/boards/arc/em_starterkit/Kconfig.em_starterkit_r23 new file mode 100644 index 0000000000000..1788fad5ec404 --- /dev/null +++ b/boards/arc/em_starterkit/Kconfig.em_starterkit_r23 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EM_STARTERKIT_R23 + bool + default y + select SOC_EMSK + select SOC_EMSK_EM9D diff --git a/boards/arc/em_starterkit/em_starterkit_defconfig b/boards/arc/em_starterkit/em_starterkit_defconfig index 3bc77c1b6f857..a3705396e408f 100644 --- a/boards/arc/em_starterkit/em_starterkit_defconfig +++ b/boards/arc/em_starterkit/em_starterkit_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_EMSK=y -CONFIG_SOC_EMSK_EM9D=y -CONFIG_BOARD_EM_STARTERKIT=y -CONFIG_BOARD_EM_STARTERKIT_R23=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/em_starterkit/em_starterkit_em11d_defconfig b/boards/arc/em_starterkit/em_starterkit_em11d_defconfig index 7146e82d57bf7..a9009c5821118 100644 --- a/boards/arc/em_starterkit/em_starterkit_em11d_defconfig +++ b/boards/arc/em_starterkit/em_starterkit_em11d_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_EMSK=y -CONFIG_SOC_EMSK_EM11D=y -CONFIG_BOARD_EM_STARTERKIT=y -CONFIG_BOARD_EM_STARTERKIT_R23=y CONFIG_XIP=n CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/em_starterkit/em_starterkit_em7d_defconfig b/boards/arc/em_starterkit/em_starterkit_em7d_defconfig index 345776e14f182..9111a3a9b21c3 100644 --- a/boards/arc/em_starterkit/em_starterkit_em7d_defconfig +++ b/boards/arc/em_starterkit/em_starterkit_em7d_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_EMSK=y -CONFIG_SOC_EMSK_EM7D=y -CONFIG_BOARD_EM_STARTERKIT=y -CONFIG_BOARD_EM_STARTERKIT_R23=y CONFIG_XIP=n CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/em_starterkit/em_starterkit_em7d_v22_defconfig b/boards/arc/em_starterkit/em_starterkit_em7d_v22_defconfig index 70af0aafedcef..39e0149c89f9f 100644 --- a/boards/arc/em_starterkit/em_starterkit_em7d_v22_defconfig +++ b/boards/arc/em_starterkit/em_starterkit_em7d_v22_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_EMSK=y -CONFIG_SOC_EMSK_EM7D=y -CONFIG_BOARD_EM_STARTERKIT=y -CONFIG_BOARD_EM_STARTERKIT_R22=y CONFIG_XIP=n CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/emsdp/Kconfig.board b/boards/arc/emsdp/Kconfig.board deleted file mode 100644 index c27a4d2c07bb2..0000000000000 --- a/boards/arc/emsdp/Kconfig.board +++ /dev/null @@ -1,15 +0,0 @@ -# DesignWare ARC EM Software Development Platform board configuration - -# Copyright (c) 2019 Synopsys, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_EMSDP - bool "EM Software Development Platform" - depends on SOC_ARC_EMSDP - help - The ARC EM Software Development Platform (emsdp) is an FPGA based - development platform intended to support ARC licenses in developing - their software for the ARC EM processor family and ARC EM Subsystems. - It has the support for ARC EM4, EM5D, EM6, EM7D, EM9D and EM11D - processors. ARC EM Enhanced Security Package (ESP) and ARC EM - Subsystems (DFSS, SCSS, DSS) are also supported. diff --git a/boards/arc/emsdp/Kconfig.defconfig b/boards/arc/emsdp/Kconfig.defconfig index 95a3a4493469e..f54835981d6b5 100644 --- a/boards/arc/emsdp/Kconfig.defconfig +++ b/boards/arc/emsdp/Kconfig.defconfig @@ -3,10 +3,10 @@ # Copyright (c) 2019 Synopsys, Inc. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if BOARD_EMSDP +#if BOARD_EMSDP -config BOARD - default "emsdp" +#config BOARD +# default "emsdp" if GPIO @@ -16,4 +16,4 @@ config GPIO_INIT_PRIORITY endif # GPIO -endif # BOARD_EMSDP +#endif # BOARD_EMSDP diff --git a/boards/arc/emsdp/Kconfig.emsdp b/boards/arc/emsdp/Kconfig.emsdp new file mode 100644 index 0000000000000..706bf86035f5a --- /dev/null +++ b/boards/arc/emsdp/Kconfig.emsdp @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EMSDP + bool + default y + select SOC_ARC_EMSDP + select SOC_EMSDP_EM11D diff --git a/boards/arc/emsdp/Kconfig.emsdp_em4 b/boards/arc/emsdp/Kconfig.emsdp_em4 new file mode 100644 index 0000000000000..020b9e1727df6 --- /dev/null +++ b/boards/arc/emsdp/Kconfig.emsdp_em4 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EMSDP_EM4 + bool + default y + select SOC_ARC_EMSDP + select SOC_EMSDP_EM4 diff --git a/boards/arc/emsdp/Kconfig.emsdp_em5d b/boards/arc/emsdp/Kconfig.emsdp_em5d new file mode 100644 index 0000000000000..9fa66843f312e --- /dev/null +++ b/boards/arc/emsdp/Kconfig.emsdp_em5d @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EMSDP_EM5D + bool + default y + select SOC_ARC_EMSDP + select SOC_EMSDP_EM5D diff --git a/boards/arc/emsdp/Kconfig.emsdp_em6 b/boards/arc/emsdp/Kconfig.emsdp_em6 new file mode 100644 index 0000000000000..f83f748c2f845 --- /dev/null +++ b/boards/arc/emsdp/Kconfig.emsdp_em6 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EMSDP_EM6 + bool + default y + select SOC_ARC_EMSDP + select SOC_EMSDP_EM6 diff --git a/boards/arc/emsdp/Kconfig.emsdp_em7d b/boards/arc/emsdp/Kconfig.emsdp_em7d new file mode 100644 index 0000000000000..957f31d150339 --- /dev/null +++ b/boards/arc/emsdp/Kconfig.emsdp_em7d @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EMSDP_EM7D + bool + default y + select SOC_ARC_EMSDP + select SOC_EMSDP_EM7D diff --git a/boards/arc/emsdp/Kconfig.emsdp_em7d_esp b/boards/arc/emsdp/Kconfig.emsdp_em7d_esp new file mode 100644 index 0000000000000..12a955bc762ff --- /dev/null +++ b/boards/arc/emsdp/Kconfig.emsdp_em7d_esp @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EMSDP_EM7D_ESP + bool + default y + select SOC_ARC_EMSDP + select SOC_EMSDP_EM7D_ESP diff --git a/boards/arc/emsdp/Kconfig.emsdp_em9d b/boards/arc/emsdp/Kconfig.emsdp_em9d new file mode 100644 index 0000000000000..5639790dfffbd --- /dev/null +++ b/boards/arc/emsdp/Kconfig.emsdp_em9d @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EMSDP_EM9D + bool + default y + select SOC_ARC_EMSDP + select SOC_EMSDP_EM9D diff --git a/boards/arc/emsdp/emsdp_defconfig b/boards/arc/emsdp/emsdp_defconfig index 4485333327367..d8581e40fabca 100644 --- a/boards/arc/emsdp/emsdp_defconfig +++ b/boards/arc/emsdp/emsdp_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ARC_EMSDP=y -CONFIG_SOC_EMSDP_EM11D=y -CONFIG_BOARD_EMSDP=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/emsdp/emsdp_em4_defconfig b/boards/arc/emsdp/emsdp_em4_defconfig index 40c816b1db491..d8581e40fabca 100644 --- a/boards/arc/emsdp/emsdp_em4_defconfig +++ b/boards/arc/emsdp/emsdp_em4_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ARC_EMSDP=y -CONFIG_SOC_EMSDP_EM4=y -CONFIG_BOARD_EMSDP=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/emsdp/emsdp_em5d_defconfig b/boards/arc/emsdp/emsdp_em5d_defconfig index 1739ed4befe15..d8581e40fabca 100644 --- a/boards/arc/emsdp/emsdp_em5d_defconfig +++ b/boards/arc/emsdp/emsdp_em5d_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ARC_EMSDP=y -CONFIG_SOC_EMSDP_EM5D=y -CONFIG_BOARD_EMSDP=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/emsdp/emsdp_em6_defconfig b/boards/arc/emsdp/emsdp_em6_defconfig index 1dae91b7382da..d8581e40fabca 100644 --- a/boards/arc/emsdp/emsdp_em6_defconfig +++ b/boards/arc/emsdp/emsdp_em6_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ARC_EMSDP=y -CONFIG_SOC_EMSDP_EM6=y -CONFIG_BOARD_EMSDP=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/emsdp/emsdp_em7d_defconfig b/boards/arc/emsdp/emsdp_em7d_defconfig index 5c10716fe75b5..d8581e40fabca 100644 --- a/boards/arc/emsdp/emsdp_em7d_defconfig +++ b/boards/arc/emsdp/emsdp_em7d_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ARC_EMSDP=y -CONFIG_SOC_EMSDP_EM7D=y -CONFIG_BOARD_EMSDP=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/emsdp/emsdp_em7d_esp_defconfig b/boards/arc/emsdp/emsdp_em7d_esp_defconfig index 5ebd6a5da1249..4bceffeb18fab 100644 --- a/boards/arc/emsdp/emsdp_em7d_esp_defconfig +++ b/boards/arc/emsdp/emsdp_em7d_esp_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ARC_EMSDP=y -CONFIG_SOC_EMSDP_EM7D_ESP=y -CONFIG_BOARD_EMSDP=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/emsdp/emsdp_em9d_defconfig b/boards/arc/emsdp/emsdp_em9d_defconfig index afbdae66c3d32..d8581e40fabca 100644 --- a/boards/arc/emsdp/emsdp_em9d_defconfig +++ b/boards/arc/emsdp/emsdp_em9d_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ARC_EMSDP=y -CONFIG_SOC_EMSDP_EM9D=y -CONFIG_BOARD_EMSDP=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/hsdk/Kconfig.board b/boards/arc/hsdk/Kconfig.board deleted file mode 100644 index 975d2f5ab245a..0000000000000 --- a/boards/arc/hsdk/Kconfig.board +++ /dev/null @@ -1,13 +0,0 @@ -# DesignWare ARC HS Development Kit board configuration - -# Copyright (c) 2019 Synopsys, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_HSDK - bool "ARC HS Development Kit" - depends on SOC_ARC_HSDK - help - The DesignWare ARC HS Development Kit is a ready-to-use platform for - rapid software development on the ARC HS3x family of processors. It - supports single- and multi-core ARC HS34, HS36 and HS38 processors - and offers a wide range of interfaces diff --git a/boards/arc/hsdk/Kconfig.defconfig b/boards/arc/hsdk/Kconfig.defconfig index fbf0a91e8cc55..956ab68e36fd3 100644 --- a/boards/arc/hsdk/Kconfig.defconfig +++ b/boards/arc/hsdk/Kconfig.defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2019 Synopsys, Inc. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if BOARD_HSDK - -config BOARD - default "hsdk" - if GPIO config GPIO_INIT_PRIORITY @@ -35,5 +30,3 @@ config I2C_DW_CLOCK_SPEED default 200 endif #I2C_DW - -endif # BOARD_HSDK diff --git a/boards/arc/hsdk/Kconfig.hsdk b/boards/arc/hsdk/Kconfig.hsdk new file mode 100644 index 0000000000000..d670fc54e3d5b --- /dev/null +++ b/boards/arc/hsdk/Kconfig.hsdk @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HSDK + bool + default y + select SOC_ARC_HSDK diff --git a/boards/arc/hsdk/Kconfig.hsdk_2cores b/boards/arc/hsdk/Kconfig.hsdk_2cores new file mode 100644 index 0000000000000..4951fadd1d7d1 --- /dev/null +++ b/boards/arc/hsdk/Kconfig.hsdk_2cores @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HSDK_2CORES + bool + default y + select SOC_ARC_HSDK diff --git a/boards/arc/hsdk/hsdk_2cores_defconfig b/boards/arc/hsdk/hsdk_2cores_defconfig index 08342f602b452..5d43728602429 100644 --- a/boards/arc/hsdk/hsdk_2cores_defconfig +++ b/boards/arc/hsdk/hsdk_2cores_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ARC_HSDK=y -CONFIG_BOARD_HSDK=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/hsdk/hsdk_defconfig b/boards/arc/hsdk/hsdk_defconfig index 1fe225cb0f4ed..bd1ec9bc6836c 100644 --- a/boards/arc/hsdk/hsdk_defconfig +++ b/boards/arc/hsdk/hsdk_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ARC_HSDK=y -CONFIG_BOARD_HSDK=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_NO_GAP_FILL=y diff --git a/boards/arc/iotdk/Kconfig.board b/boards/arc/iotdk/Kconfig.board deleted file mode 100644 index a92c55ec740d3..0000000000000 --- a/boards/arc/iotdk/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# DesignWare ARC IoT Development Kit board configuration - -# Copyright (c) 2018 Synopsys, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_IOTDK - bool "ARC IoT Development Kit" - depends on SOC_ARC_IOT - help - The DesignWare ARC IoT Development Kit board is a versatile platform that includes the necessary hardware and software to accelerate software development and debugging of sensor fusion, voice recognition and face detection designs. It includes a silicon implementation of the ARC Data Fusion IP Subsystem running at 144 MHz on SMIC's 55-nm ultra-low power process, and a rich set of peripherals commonly used in IoT designs such as USB, UART, SPI, I2C, PWM, SDIO and ADCs. diff --git a/boards/arc/iotdk/Kconfig.defconfig b/boards/arc/iotdk/Kconfig.defconfig deleted file mode 100644 index 93f707a0afba5..0000000000000 --- a/boards/arc/iotdk/Kconfig.defconfig +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "iotdk" - depends on BOARD_IOTDK diff --git a/boards/arc/iotdk/Kconfig.iotdk b/boards/arc/iotdk/Kconfig.iotdk new file mode 100644 index 0000000000000..8d8a3a39cc2ec --- /dev/null +++ b/boards/arc/iotdk/Kconfig.iotdk @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_IOTDK + bool + default y + select SOC_ARC_IOT diff --git a/boards/arc/iotdk/iotdk_defconfig b/boards/arc/iotdk/iotdk_defconfig index afb2569dadd64..d95ae77772983 100644 --- a/boards/arc/iotdk/iotdk_defconfig +++ b/boards/arc/iotdk/iotdk_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ARC_IOT=y -CONFIG_BOARD_IOTDK=y CONFIG_XIP=n CONFIG_BUILD_NO_GAP_FILL=y CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/nsim/Kconfig.board b/boards/arc/nsim/Kconfig.board deleted file mode 100644 index 6bec8088323d4..0000000000000 --- a/boards/arc/nsim/Kconfig.board +++ /dev/null @@ -1,13 +0,0 @@ -# DesignWare ARC nSIM simulated platform configuration - -# Copyright (c) 2016, 2019 Synopsys, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NSIM - bool "ARC nSIM simulator" - depends on SOC_NSIM - select HAS_COVERAGE_SUPPORT - help - The DesignWare ARC nSIM board is a virtual board based on - the ARC nSIM simulator. It demonstrates the ARC core features - and a console based on the ns16550 UART model. diff --git a/boards/arc/nsim/Kconfig.defconfig b/boards/arc/nsim/Kconfig.defconfig deleted file mode 100644 index 1f1e19ee38abc..0000000000000 --- a/boards/arc/nsim/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NSIM - -config BOARD - default "nsim" - -endif # BOARD_NSIM diff --git a/boards/arc/nsim/Kconfig.nsim_em b/boards/arc/nsim/Kconfig.nsim_em new file mode 100644 index 0000000000000..328c866a3be9f --- /dev/null +++ b/boards/arc/nsim/Kconfig.nsim_em @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM_EM + bool + default y + select SOC_NSIM + select SOC_NSIM_EM + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/nsim/Kconfig.nsim_em7d_v22 b/boards/arc/nsim/Kconfig.nsim_em7d_v22 new file mode 100644 index 0000000000000..d3a009edbb2e2 --- /dev/null +++ b/boards/arc/nsim/Kconfig.nsim_em7d_v22 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM_EM7D_V22 + bool + default y + select SOC_NSIM + select SOC_NSIM_EM7D_V22 + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/nsim/Kconfig.nsim_hs b/boards/arc/nsim/Kconfig.nsim_hs new file mode 100644 index 0000000000000..c6ad3a7666989 --- /dev/null +++ b/boards/arc/nsim/Kconfig.nsim_hs @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM_HS + bool + default y + select SOC_NSIM + select SOC_NSIM_HS + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/nsim/Kconfig.nsim_hs5x b/boards/arc/nsim/Kconfig.nsim_hs5x new file mode 100644 index 0000000000000..b5f0436ba5d76 --- /dev/null +++ b/boards/arc/nsim/Kconfig.nsim_hs5x @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM_HS5X + bool + default y + select SOC_NSIM + select SOC_NSIM_HS5X + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/nsim/Kconfig.nsim_hs5x_smp b/boards/arc/nsim/Kconfig.nsim_hs5x_smp new file mode 100644 index 0000000000000..81611a88a7f93 --- /dev/null +++ b/boards/arc/nsim/Kconfig.nsim_hs5x_smp @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM_HS5X_SMP + bool + default y + select SOC_NSIM + select SOC_NSIM_HS5X_SMP + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/nsim/Kconfig.nsim_hs6x b/boards/arc/nsim/Kconfig.nsim_hs6x new file mode 100644 index 0000000000000..db7a25eb57d61 --- /dev/null +++ b/boards/arc/nsim/Kconfig.nsim_hs6x @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM_HS6X + bool + default y + select SOC_NSIM + select SOC_NSIM_HS6X + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/nsim/Kconfig.nsim_hs6x_smp b/boards/arc/nsim/Kconfig.nsim_hs6x_smp new file mode 100644 index 0000000000000..a1587e3a5a37f --- /dev/null +++ b/boards/arc/nsim/Kconfig.nsim_hs6x_smp @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM_HS6X_SMP + bool + default y + select SOC_NSIM + select SOC_NSIM_HS6X_SMP + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/nsim/Kconfig.nsim_hs_mpuv6 b/boards/arc/nsim/Kconfig.nsim_hs_mpuv6 new file mode 100644 index 0000000000000..873897aebdc8a --- /dev/null +++ b/boards/arc/nsim/Kconfig.nsim_hs_mpuv6 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM_HS_MPUV6 + bool + default y + select SOC_NSIM + select SOC_NSIM_HS_MPUV6 + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/nsim/Kconfig.nsim_hs_smp b/boards/arc/nsim/Kconfig.nsim_hs_smp new file mode 100644 index 0000000000000..d76e48f66c31b --- /dev/null +++ b/boards/arc/nsim/Kconfig.nsim_hs_smp @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM_HS_SMP + bool + default y + select SOC_NSIM + select SOC_NSIM_HS_SMP + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/nsim/Kconfig.nsim_sem b/boards/arc/nsim/Kconfig.nsim_sem new file mode 100644 index 0000000000000..d211a33454ab8 --- /dev/null +++ b/boards/arc/nsim/Kconfig.nsim_sem @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM_SEM + bool + default y + select SOC_NSIM + select SOC_NSIM_SEM + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/nsim/Kconfig.nsim_sem_mpu_stack_guard b/boards/arc/nsim/Kconfig.nsim_sem_mpu_stack_guard new file mode 100644 index 0000000000000..2797b80fa3aae --- /dev/null +++ b/boards/arc/nsim/Kconfig.nsim_sem_mpu_stack_guard @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM_SEM_MPU_STACK_GUARD + bool + default y + select SOC_NSIM + select SOC_NSIM_SEM + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/nsim/nsim_em7d_v22_defconfig b/boards/arc/nsim/nsim_em7d_v22_defconfig index 6f44addd50b7e..2465931499c2f 100644 --- a/boards/arc/nsim/nsim_em7d_v22_defconfig +++ b/boards/arc/nsim/nsim_em7d_v22_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_EM7D_V22=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/nsim/nsim_em_defconfig b/boards/arc/nsim/nsim_em_defconfig index f55dce205176a..2465931499c2f 100644 --- a/boards/arc/nsim/nsim_em_defconfig +++ b/boards/arc/nsim/nsim_em_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_EM=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/nsim/nsim_hs5x_defconfig b/boards/arc/nsim/nsim_hs5x_defconfig index f87e1dfdcba07..ddaea1c562c5c 100644 --- a/boards/arc/nsim/nsim_hs5x_defconfig +++ b/boards/arc/nsim/nsim_hs5x_defconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ISA_ARCV3=y -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS5X=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/nsim/nsim_hs5x_smp_defconfig b/boards/arc/nsim/nsim_hs5x_smp_defconfig index 74c2420ef0527..5e1651cc38d0d 100644 --- a/boards/arc/nsim/nsim_hs5x_smp_defconfig +++ b/boards/arc/nsim/nsim_hs5x_smp_defconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ISA_ARCV3=y -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS5X_SMP=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/nsim/nsim_hs6x_defconfig b/boards/arc/nsim/nsim_hs6x_defconfig index 4db6e16b61e45..ddaea1c562c5c 100644 --- a/boards/arc/nsim/nsim_hs6x_defconfig +++ b/boards/arc/nsim/nsim_hs6x_defconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ISA_ARCV3=y -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS6X=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/nsim/nsim_hs6x_smp_defconfig b/boards/arc/nsim/nsim_hs6x_smp_defconfig index 0a4416e5cbee1..5e1651cc38d0d 100644 --- a/boards/arc/nsim/nsim_hs6x_smp_defconfig +++ b/boards/arc/nsim/nsim_hs6x_smp_defconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ISA_ARCV3=y -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS6X_SMP=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/nsim/nsim_hs_defconfig b/boards/arc/nsim/nsim_hs_defconfig index f1525d8d11145..df7c03e072be1 100644 --- a/boards/arc/nsim/nsim_hs_defconfig +++ b/boards/arc/nsim/nsim_hs_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/nsim/nsim_hs_mpuv6_defconfig b/boards/arc/nsim/nsim_hs_mpuv6_defconfig index 33b9af526d661..ae32094c2572a 100644 --- a/boards/arc/nsim/nsim_hs_mpuv6_defconfig +++ b/boards/arc/nsim/nsim_hs_mpuv6_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS_MPUV6=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/nsim/nsim_hs_smp_defconfig b/boards/arc/nsim/nsim_hs_smp_defconfig index 678605a305f94..f31bca9205d35 100644 --- a/boards/arc/nsim/nsim_hs_smp_defconfig +++ b/boards/arc/nsim/nsim_hs_smp_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS_SMP=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/nsim/nsim_sem_defconfig b/boards/arc/nsim/nsim_sem_defconfig index 2ec15d063f545..6bedbda03293f 100644 --- a/boards/arc/nsim/nsim_sem_defconfig +++ b/boards/arc/nsim/nsim_sem_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_SEM=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/nsim/nsim_sem_mpu_stack_guard_defconfig b/boards/arc/nsim/nsim_sem_mpu_stack_guard_defconfig index 56e4a729daf42..79d5108022810 100644 --- a/boards/arc/nsim/nsim_sem_mpu_stack_guard_defconfig +++ b/boards/arc/nsim/nsim_sem_mpu_stack_guard_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_SEM=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/boards/arc/qemu_arc/Kconfig.board b/boards/arc/qemu_arc/Kconfig.board deleted file mode 100644 index 1ea1a6bd77efd..0000000000000 --- a/boards/arc/qemu_arc/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2020 Synopsys, Inc. All rights reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_ARC - bool "ARC QEMU for EM & HS cores" - depends on SOC_QEMU_ARC - select QEMU_TARGET - select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/qemu_arc/Kconfig.defconfig b/boards/arc/qemu_arc/Kconfig.defconfig index 54319f18bf377..e00a66f23071f 100644 --- a/boards/arc/qemu_arc/Kconfig.defconfig +++ b/boards/arc/qemu_arc/Kconfig.defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2020,2021 Synopsys, Inc. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if BOARD_QEMU_ARC - -config BOARD - default "qemu_arc" - if NETWORKING config NET_L2_ETHERNET @@ -16,5 +11,3 @@ if NETWORKING default y endif # NETWORKING - -endif diff --git a/boards/arc/qemu_arc/Kconfig.qemu_arc_em b/boards/arc/qemu_arc/Kconfig.qemu_arc_em new file mode 100644 index 0000000000000..d955c1cb8eac0 --- /dev/null +++ b/boards/arc/qemu_arc/Kconfig.qemu_arc_em @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_ARC_EM + bool + default y + select SOC_QEMU_ARC + select SOC_QEMU_ARC_EM + select QEMU_TARGET + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/qemu_arc/Kconfig.qemu_arc_hs b/boards/arc/qemu_arc/Kconfig.qemu_arc_hs new file mode 100644 index 0000000000000..97c2fb77a55ac --- /dev/null +++ b/boards/arc/qemu_arc/Kconfig.qemu_arc_hs @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_ARC_HS + bool + default y + select SOC_QEMU_ARC + select SOC_QEMU_ARC_HS + select QEMU_TARGET + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/qemu_arc/Kconfig.qemu_arc_hs5x b/boards/arc/qemu_arc/Kconfig.qemu_arc_hs5x new file mode 100644 index 0000000000000..28ff220ff282d --- /dev/null +++ b/boards/arc/qemu_arc/Kconfig.qemu_arc_hs5x @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_ARC_HS5X + bool + default y + select SOC_QEMU_ARC + select SOC_QEMU_ARC_HS5X + select QEMU_TARGET + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/qemu_arc/Kconfig.qemu_arc_hs6x b/boards/arc/qemu_arc/Kconfig.qemu_arc_hs6x new file mode 100644 index 0000000000000..cf7b1f5979dfc --- /dev/null +++ b/boards/arc/qemu_arc/Kconfig.qemu_arc_hs6x @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_ARC_HS6X + bool + default y + select SOC_QEMU_ARC + select SOC_QEMU_ARC_HS6X + select QEMU_TARGET + select HAS_COVERAGE_SUPPORT diff --git a/boards/arc/qemu_arc/qemu_arc_em_defconfig b/boards/arc/qemu_arc/qemu_arc_em_defconfig index 0d6f4052e64c3..681d200814773 100644 --- a/boards/arc/qemu_arc/qemu_arc_em_defconfig +++ b/boards/arc/qemu_arc/qemu_arc_em_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_ARC=y -CONFIG_SOC_QEMU_ARC_EM=y CONFIG_XIP=y CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y diff --git a/boards/arc/qemu_arc/qemu_arc_hs5x_defconfig b/boards/arc/qemu_arc/qemu_arc_hs5x_defconfig index f8e50bcf3f8a5..31f5cff2f42c1 100644 --- a/boards/arc/qemu_arc/qemu_arc_hs5x_defconfig +++ b/boards/arc/qemu_arc/qemu_arc_hs5x_defconfig @@ -1,6 +1,4 @@ CONFIG_ISA_ARCV3=y -CONFIG_SOC_QEMU_ARC=y -CONFIG_SOC_QEMU_ARC_HS5X=y CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y diff --git a/boards/arc/qemu_arc/qemu_arc_hs6x_defconfig b/boards/arc/qemu_arc/qemu_arc_hs6x_defconfig index 8ab0d4ae0f0a6..31f5cff2f42c1 100644 --- a/boards/arc/qemu_arc/qemu_arc_hs6x_defconfig +++ b/boards/arc/qemu_arc/qemu_arc_hs6x_defconfig @@ -1,6 +1,4 @@ CONFIG_ISA_ARCV3=y -CONFIG_SOC_QEMU_ARC=y -CONFIG_SOC_QEMU_ARC_HS6X=y CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y diff --git a/boards/arc/qemu_arc/qemu_arc_hs_defconfig b/boards/arc/qemu_arc/qemu_arc_hs_defconfig index bec83e7c5ae56..681d200814773 100644 --- a/boards/arc/qemu_arc/qemu_arc_hs_defconfig +++ b/boards/arc/qemu_arc/qemu_arc_hs_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_ARC=y -CONFIG_SOC_QEMU_ARC_HS=y CONFIG_XIP=y CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y diff --git a/boards/arm/96b_aerocore2/96b_aerocore2_defconfig b/boards/arm/96b_aerocore2/96b_aerocore2_defconfig index 8cd955fe1cbe8..490ce68a742b4 100644 --- a/boards/arm/96b_aerocore2/96b_aerocore2_defconfig +++ b/boards/arm/96b_aerocore2/96b_aerocore2_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2020 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F427XX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/96b_aerocore2/Kconfig.96b_aerocore2 b/boards/arm/96b_aerocore2/Kconfig.96b_aerocore2 new file mode 100644 index 0000000000000..8bb6ea27eba64 --- /dev/null +++ b/boards/arm/96b_aerocore2/Kconfig.96b_aerocore2 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_96B_AEROCORE2 + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F427XX diff --git a/boards/arm/96b_aerocore2/Kconfig.board b/boards/arm/96b_aerocore2/Kconfig.board deleted file mode 100644 index 55d8a706d1b87..0000000000000 --- a/boards/arm/96b_aerocore2/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2020 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_96B_AEROCORE2 - bool "96Boards AEROCORE2 (STM32F427)" - depends on SOC_STM32F427XX diff --git a/boards/arm/96b_aerocore2/Kconfig.defconfig b/boards/arm/96b_aerocore2/Kconfig.defconfig deleted file mode 100644 index 02d82f6f25a01..0000000000000 --- a/boards/arm/96b_aerocore2/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2020 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_96B_AEROCORE2 - -config BOARD - default "96b_aerocore2" - -endif # BOARD_96B_AEROCORE2 diff --git a/boards/arm/96b_argonkey/96b_argonkey_defconfig b/boards/arm/96b_argonkey/96b_argonkey_defconfig index 76869d633452f..82ee7285d52d8 100644 --- a/boards/arm/96b_argonkey/96b_argonkey_defconfig +++ b/boards/arm/96b_argonkey/96b_argonkey_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F412CX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/96b_argonkey/Kconfig.96b_argonkey b/boards/arm/96b_argonkey/Kconfig.96b_argonkey new file mode 100644 index 0000000000000..0a22480506a18 --- /dev/null +++ b/boards/arm/96b_argonkey/Kconfig.96b_argonkey @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_96B_ARGONKEY + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F412CX diff --git a/boards/arm/96b_argonkey/Kconfig.board b/boards/arm/96b_argonkey/Kconfig.board deleted file mode 100644 index e259d3b23f2c6..0000000000000 --- a/boards/arm/96b_argonkey/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# 96Boards Argonkey Board Configuration - -# Copyright (c) 2018 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_96B_ARGONKEY - bool "96Boards Argonkey" - depends on SOC_STM32F412CX diff --git a/boards/arm/96b_argonkey/Kconfig.defconfig b/boards/arm/96b_argonkey/Kconfig.defconfig index e9c35748996a1..19415ea39637f 100644 --- a/boards/arm/96b_argonkey/Kconfig.defconfig +++ b/boards/arm/96b_argonkey/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 -if BOARD_96B_ARGONKEY - -config BOARD - default "96b_argonkey" - if I2S # configure PLLI2S to generate a I2SxCLK=128MHz @@ -39,5 +34,3 @@ choice LSM6DSL_EXTERNAL_SENSOR_0 endchoice endif # LSM6DSL - -endif # BOARD_96B_ARGONKEY diff --git a/boards/arm/96b_avenger96/96b_avenger96_defconfig b/boards/arm/96b_avenger96/96b_avenger96_defconfig index 05be01fbb36ec..11db7ac995f04 100644 --- a/boards/arm/96b_avenger96/96b_avenger96_defconfig +++ b/boards/arm/96b_avenger96/96b_avenger96_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_STM32MP1X=y -CONFIG_SOC_STM32MP15_M4=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/96b_avenger96/Kconfig.96b_avenger96 b/boards/arm/96b_avenger96/Kconfig.96b_avenger96 new file mode 100644 index 0000000000000..ea5376fe08adf --- /dev/null +++ b/boards/arm/96b_avenger96/Kconfig.96b_avenger96 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_96B_AVENGER96 + bool + default y + select SOC_SERIES_STM32MP1X + select SOC_STM32MP15_M4 diff --git a/boards/arm/96b_avenger96/Kconfig.board b/boards/arm/96b_avenger96/Kconfig.board deleted file mode 100644 index 78012ba940c1b..0000000000000 --- a/boards/arm/96b_avenger96/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# 96Boards Avenger96 board configuration - -# Copyright (c) 2019 Linaro Ltd. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_96B_AVENGER96 - bool "96Boards Avenger96 Board" - depends on SOC_STM32MP15_M4 diff --git a/boards/arm/96b_avenger96/Kconfig.defconfig b/boards/arm/96b_avenger96/Kconfig.defconfig deleted file mode 100644 index b5cf5e03d493a..0000000000000 --- a/boards/arm/96b_avenger96/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# 96Boards Avenger96 board configuration - -# Copyright (c) 2019 Linaro Ltd. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_96B_AVENGER96 - -config BOARD - default "96b_avenger96" - -endif # BOARD_96B_AVENGER96 diff --git a/boards/arm/96b_carbon/96b_carbon_defconfig b/boards/arm/96b_carbon/96b_carbon_defconfig index 92cb9c88b9dde..c729b83e3d050 100644 --- a/boards/arm/96b_carbon/96b_carbon_defconfig +++ b/boards/arm/96b_carbon/96b_carbon_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F401XE=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/96b_carbon/Kconfig.96b_carbon b/boards/arm/96b_carbon/Kconfig.96b_carbon new file mode 100644 index 0000000000000..50ad60ed8fed2 --- /dev/null +++ b/boards/arm/96b_carbon/Kconfig.96b_carbon @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_96B_CARBON + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F401XE diff --git a/boards/arm/96b_carbon/Kconfig.board b/boards/arm/96b_carbon/Kconfig.board deleted file mode 100644 index fc9e1d5df4137..0000000000000 --- a/boards/arm/96b_carbon/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# 96boards Carbon STMF401RE board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_96B_CARBON - bool "96Boards Carbon (STM32F401)" - depends on SOC_STM32F401XE diff --git a/boards/arm/96b_carbon/Kconfig.defconfig b/boards/arm/96b_carbon/Kconfig.defconfig index e7d7a1bd3f807..ee11284a25589 100644 --- a/boards/arm/96b_carbon/Kconfig.defconfig +++ b/boards/arm/96b_carbon/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2016 Linaro Limited. # SPDX-License-Identifier: Apache-2.0 -if BOARD_96B_CARBON - -config BOARD - default "96b_carbon" - config SPI_STM32_INTERRUPT default y depends on SPI @@ -53,5 +48,3 @@ config NET_L2_BT_ZEP1656 default BT endif # NETWORKING - -endif # BOARD_96B_CARBON diff --git a/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig b/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig index 91a90e7986ac6..46dc69d74cde7 100644 --- a/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig +++ b/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF51X=y -CONFIG_SOC_NRF51822_QFAC=y - # enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/96b_carbon_nrf51/Kconfig.96b_carbon_nrf51 b/boards/arm/96b_carbon_nrf51/Kconfig.96b_carbon_nrf51 new file mode 100644 index 0000000000000..015ee7fb376bd --- /dev/null +++ b/boards/arm/96b_carbon_nrf51/Kconfig.96b_carbon_nrf51 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_96B_CARBON_NRF51 + bool + default y + select SOC_SERIES_NRF51X + select SOC_NRF51822_QFAC diff --git a/boards/arm/96b_carbon_nrf51/Kconfig.board b/boards/arm/96b_carbon_nrf51/Kconfig.board deleted file mode 100644 index 71833ec87c878..0000000000000 --- a/boards/arm/96b_carbon_nrf51/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# 96Boards Carbon nRF51 board configuration - -# Copyright (c) 2016, 2017 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_96B_CARBON_NRF51 - bool "96Boards Carbon (nRF51)" - depends on SOC_NRF51822_QFAC diff --git a/boards/arm/96b_carbon_nrf51/Kconfig.defconfig b/boards/arm/96b_carbon_nrf51/Kconfig.defconfig index 87875314cd36d..af9549391cf6b 100644 --- a/boards/arm/96b_carbon_nrf51/Kconfig.defconfig +++ b/boards/arm/96b_carbon_nrf51/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2016, 2017 Linaro Limited. # SPDX-License-Identifier: Apache-2.0 -if BOARD_96B_CARBON_NRF51 - -config BOARD - default "96b_carbon_nrf51" - config BT_CTLR default BT - -endif # BOARD_96B_CARBON_NRF51 diff --git a/boards/arm/96b_meerkat96/96b_meerkat96_defconfig b/boards/arm/96b_meerkat96/96b_meerkat96_defconfig index 0bed95b7b32e1..90dfb85138a02 100644 --- a/boards/arm/96b_meerkat96/96b_meerkat96_defconfig +++ b/boards/arm/96b_meerkat96/96b_meerkat96_defconfig @@ -4,10 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_IMX7_M4=y -CONFIG_SOC_MCIMX7_M4=y -CONFIG_BOARD_96B_MEERKAT96=y - # enable uart driver CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/boards/arm/96b_meerkat96/Kconfig.96b_meerkat96 b/boards/arm/96b_meerkat96/Kconfig.96b_meerkat96 new file mode 100644 index 0000000000000..830dc08a8f386 --- /dev/null +++ b/boards/arm/96b_meerkat96/Kconfig.96b_meerkat96 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_96B_MEERKAT96 + bool + default y + select SOC_SERIES_IMX7_M4 + select SOC_MCIMX7_M4 + select SOC_PART_NUMBER_MCIMX7D5EVM10SC diff --git a/boards/arm/96b_meerkat96/Kconfig.board b/boards/arm/96b_meerkat96/Kconfig.board deleted file mode 100644 index 85c6c55a3229f..0000000000000 --- a/boards/arm/96b_meerkat96/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# 96Boards Meerkat96 board - -# Copyright (c) 2019, Linaro Ltd. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_96B_MEERKAT96 - bool "96Boards Meerkat96 board" - depends on SOC_SERIES_IMX7_M4 - select SOC_PART_NUMBER_MCIMX7D5EVM10SC diff --git a/boards/arm/96b_meerkat96/Kconfig.defconfig b/boards/arm/96b_meerkat96/Kconfig.defconfig index 7e758a53fa346..ac76f67e5ab07 100644 --- a/boards/arm/96b_meerkat96/Kconfig.defconfig +++ b/boards/arm/96b_meerkat96/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2019, Linaro Ltd. # SPDX-License-Identifier: Apache-2.0 -if BOARD_96B_MEERKAT96 - -config BOARD - default "96b_meerkat96" - if !XIP config FLASH_SIZE default 0 config FLASH_BASE_ADDRESS default 0 endif - -endif # BOARD_96B_MEERKAT96 diff --git a/boards/arm/96b_neonkey/96b_neonkey_defconfig b/boards/arm/96b_neonkey/96b_neonkey_defconfig index 1b51c0cc14ad3..82ee7285d52d8 100644 --- a/boards/arm/96b_neonkey/96b_neonkey_defconfig +++ b/boards/arm/96b_neonkey/96b_neonkey_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F411XE=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/96b_neonkey/Kconfig.96b_neonkey b/boards/arm/96b_neonkey/Kconfig.96b_neonkey new file mode 100644 index 0000000000000..833de73e0fe77 --- /dev/null +++ b/boards/arm/96b_neonkey/Kconfig.96b_neonkey @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_96B_NEONKEY + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F411XE diff --git a/boards/arm/96b_neonkey/Kconfig.board b/boards/arm/96b_neonkey/Kconfig.board deleted file mode 100644 index 2246b448ec9ac..0000000000000 --- a/boards/arm/96b_neonkey/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# 96Boards Neonkey Board Configuration - -# Copyright (c) 2017 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_96B_NEONKEY - bool "96Boards Neonkey" - depends on SOC_STM32F411XE diff --git a/boards/arm/96b_neonkey/Kconfig.defconfig b/boards/arm/96b_neonkey/Kconfig.defconfig index 54371886f7361..dba30b65d0da4 100644 --- a/boards/arm/96b_neonkey/Kconfig.defconfig +++ b/boards/arm/96b_neonkey/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2017 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_96B_NEONKEY - -config BOARD - default "96b_neonkey" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_96B_NEONKEY diff --git a/boards/arm/96b_nitrogen/96b_nitrogen_defconfig b/boards/arm/96b_nitrogen/96b_nitrogen_defconfig index 500c469813b17..98dc42cf3fa15 100644 --- a/boards/arm/96b_nitrogen/96b_nitrogen_defconfig +++ b/boards/arm/96b_nitrogen/96b_nitrogen_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/96b_nitrogen/Kconfig b/boards/arm/96b_nitrogen/Kconfig deleted file mode 100644 index acaec810c794d..0000000000000 --- a/boards/arm/96b_nitrogen/Kconfig +++ /dev/null @@ -1,8 +0,0 @@ -# 96Boards NITROGEN board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_96B_NITROGEN - -endif # BOARD_96B_NITROGEN diff --git a/boards/arm/96b_nitrogen/Kconfig.96b_nitrogen b/boards/arm/96b_nitrogen/Kconfig.96b_nitrogen new file mode 100644 index 0000000000000..5a738896a5bb6 --- /dev/null +++ b/boards/arm/96b_nitrogen/Kconfig.96b_nitrogen @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_96B_NITROGEN + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/96b_nitrogen/Kconfig.board b/boards/arm/96b_nitrogen/Kconfig.board deleted file mode 100644 index a771ff2701987..0000000000000 --- a/boards/arm/96b_nitrogen/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# 96Boards NITROGEN board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_96B_NITROGEN - bool "96Boards Nitrogen" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/96b_nitrogen/Kconfig.defconfig b/boards/arm/96b_nitrogen/Kconfig.defconfig index 00ff29cb2bc46..dd41bd9ae869e 100644 --- a/boards/arm/96b_nitrogen/Kconfig.defconfig +++ b/boards/arm/96b_nitrogen/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_96B_NITROGEN - -config BOARD - default "96b_nitrogen" - config BT_CTLR default BT - -endif # BOARD_96B_NITROGEN diff --git a/boards/arm/96b_stm32_sensor_mez/96b_stm32_sensor_mez_defconfig b/boards/arm/96b_stm32_sensor_mez/96b_stm32_sensor_mez_defconfig index a9e0141c1258c..c729b83e3d050 100644 --- a/boards/arm/96b_stm32_sensor_mez/96b_stm32_sensor_mez_defconfig +++ b/boards/arm/96b_stm32_sensor_mez/96b_stm32_sensor_mez_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F446XX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/96b_stm32_sensor_mez/Kconfig.96b_stm32_sensor_mez b/boards/arm/96b_stm32_sensor_mez/Kconfig.96b_stm32_sensor_mez new file mode 100644 index 0000000000000..bc56863e3e68d --- /dev/null +++ b/boards/arm/96b_stm32_sensor_mez/Kconfig.96b_stm32_sensor_mez @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_96B_STM32_SENSOR_MEZ + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F446XX diff --git a/boards/arm/96b_stm32_sensor_mez/Kconfig.board b/boards/arm/96b_stm32_sensor_mez/Kconfig.board deleted file mode 100644 index 3d17d091ae451..0000000000000 --- a/boards/arm/96b_stm32_sensor_mez/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# 96Boards STM32 Sensor Mezzanine board configuration - -# Copyright (c) 2018 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_96B_STM32_SENSOR_MEZ - bool "96Boards STM32 Sensor Mezzanine Board" - depends on SOC_STM32F446XX diff --git a/boards/arm/96b_stm32_sensor_mez/Kconfig.defconfig b/boards/arm/96b_stm32_sensor_mez/Kconfig.defconfig index cb3d196df0669..bc1f76e2de713 100644 --- a/boards/arm/96b_stm32_sensor_mez/Kconfig.defconfig +++ b/boards/arm/96b_stm32_sensor_mez/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018 Linaro Limited. # SPDX-License-Identifier: Apache-2.0 -if BOARD_96B_STM32_SENSOR_MEZ - -config BOARD - default "96b_stm32_sensor_mez" - if I2S # configure PLLI2S to generate a I2SxCLK=128MHz @@ -28,5 +23,3 @@ endif # I2S config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_96B_STM32_SENSOR_MEZ diff --git a/boards/arm/96b_wistrio/96b_wistrio_defconfig b/boards/arm/96b_wistrio/96b_wistrio_defconfig index 9520805e917d8..23d51e28afa2d 100644 --- a/boards/arm/96b_wistrio/96b_wistrio_defconfig +++ b/boards/arm/96b_wistrio/96b_wistrio_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_STM32L1X=y -CONFIG_SOC_STM32L151XBA=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/96b_wistrio/Kconfig.96b_wistrio b/boards/arm/96b_wistrio/Kconfig.96b_wistrio new file mode 100644 index 0000000000000..dacd10f1271a0 --- /dev/null +++ b/boards/arm/96b_wistrio/Kconfig.96b_wistrio @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_96B_WISTRIO + bool + default y + select SOC_SERIES_STM32L1X + select SOC_STM32L151XBA diff --git a/boards/arm/96b_wistrio/Kconfig.board b/boards/arm/96b_wistrio/Kconfig.board deleted file mode 100644 index ac527a671b7d4..0000000000000 --- a/boards/arm/96b_wistrio/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# 96boards WisTrio board configuration - -# Copyright (c) 2019 Linaro Ltd. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_96B_WISTRIO - bool "96boards WisTrio Development Board" - depends on SOC_STM32L151XBA diff --git a/boards/arm/96b_wistrio/Kconfig.defconfig b/boards/arm/96b_wistrio/Kconfig.defconfig index 0bb9b83220db7..dc2b7e436ce76 100644 --- a/boards/arm/96b_wistrio/Kconfig.defconfig +++ b/boards/arm/96b_wistrio/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2019 Linaro Ltd. # SPDX-License-Identifier: Apache-2.0 -if BOARD_96B_WISTRIO - -config BOARD - default "96b_wistrio" - config REGULATOR default y if LORA - -endif # BOARD_96B_WISTRIO diff --git a/boards/arm/actinius_icarus/Kconfig b/boards/arm/actinius_icarus/Kconfig index 503debb00f7c5..77089a33e0b0d 100644 --- a/boards/arm/actinius_icarus/Kconfig +++ b/boards/arm/actinius_icarus/Kconfig @@ -3,10 +3,6 @@ # Copyright (c) 2019 Actinius # SPDX-License-Identifier: Apache-2.0 -if BOARD_ACTINIUS_ICARUS || BOARD_ACTINIUS_ICARUS_NS - module = BOARD_ICARUS module-str = Board Control source "subsys/logging/Kconfig.template.log_config" - -endif # BOARD_ACTINIUS_ICARUS || BOARD_ACTINIUS_ICARUS_NS diff --git a/boards/arm/actinius_icarus/Kconfig.actinius_icarus b/boards/arm/actinius_icarus/Kconfig.actinius_icarus new file mode 100644 index 0000000000000..6e0024691b896 --- /dev/null +++ b/boards/arm/actinius_icarus/Kconfig.actinius_icarus @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACTINIUS_ICARUS + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/actinius_icarus/Kconfig.actinius_icarus_ns b/boards/arm/actinius_icarus/Kconfig.actinius_icarus_ns new file mode 100644 index 0000000000000..b3e41c76ed8cf --- /dev/null +++ b/boards/arm/actinius_icarus/Kconfig.actinius_icarus_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACTINIUS_ICARUS_NS + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/actinius_icarus/Kconfig.board b/boards/arm/actinius_icarus/Kconfig.board deleted file mode 100644 index bdf4d8e2c3661..0000000000000 --- a/boards/arm/actinius_icarus/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# Actinius Icarus board configuration - -# Copyright (c) 2019 Actinius -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_ACTINIUS_ICARUS - bool "Actinius Icarus" - -config BOARD_ACTINIUS_ICARUS_NS - bool "Actinius Icarus Non-Secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/arm/actinius_icarus/Kconfig.defconfig b/boards/arm/actinius_icarus/Kconfig.defconfig index 9d81e1a511acf..5f98d3b8754d0 100644 --- a/boards/arm/actinius_icarus/Kconfig.defconfig +++ b/boards/arm/actinius_icarus/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2019 Actinius # SPDX-License-Identifier: Apache-2.0 -if BOARD_ACTINIUS_ICARUS || BOARD_ACTINIUS_ICARUS_NS - -config BOARD - default "actinius_icarus" - # For the secure version of the board the firmware is linked at the beginning # of the flash, or into the code-partition defined in DT if it is intended to # be loaded by MCUboot. If the secure firmware is to be combined with a non- @@ -34,5 +29,3 @@ config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) endif # BOARD_ACTINIUS_ICARUS_NS - -endif # BOARD_ACTINIUS_ICARUS || BOARD_ACTINIUS_ICARUS_NS diff --git a/boards/arm/actinius_icarus/actinius_icarus_defconfig b/boards/arm/actinius_icarus/actinius_icarus_defconfig index 6e00f0578306e..b930856fe4b44 100644 --- a/boards/arm/actinius_icarus/actinius_icarus_defconfig +++ b/boards/arm/actinius_icarus/actinius_icarus_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_ACTINIUS_ICARUS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/actinius_icarus/actinius_icarus_ns_defconfig b/boards/arm/actinius_icarus/actinius_icarus_ns_defconfig index 2eafce1cfb66d..f6b4865a049b5 100644 --- a/boards/arm/actinius_icarus/actinius_icarus_ns_defconfig +++ b/boards/arm/actinius_icarus/actinius_icarus_ns_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_ACTINIUS_ICARUS_NS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/actinius_icarus_bee/Kconfig b/boards/arm/actinius_icarus_bee/Kconfig index 8f62907cde21d..ad2f0782a5ce6 100644 --- a/boards/arm/actinius_icarus_bee/Kconfig +++ b/boards/arm/actinius_icarus_bee/Kconfig @@ -3,10 +3,6 @@ # Copyright (c) 2021 Actinius # SPDX-License-Identifier: Apache-2.0 -if BOARD_ACTINIUS_ICARUS_BEE || BOARD_ACTINIUS_ICARUS_BEE_NS - module = BOARD_ICARUS_BEE module-str = Board Control source "subsys/logging/Kconfig.template.log_config" - -endif # BOARD_ACTINIUS_ICARUS_BEE || BOARD_ACTINIUS_ICARUS_BEE_NS diff --git a/boards/arm/actinius_icarus_bee/Kconfig.actinius_icarus_bee b/boards/arm/actinius_icarus_bee/Kconfig.actinius_icarus_bee new file mode 100644 index 0000000000000..c663c7ec9bd73 --- /dev/null +++ b/boards/arm/actinius_icarus_bee/Kconfig.actinius_icarus_bee @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACTINIUS_ICARUS_BEE + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/actinius_icarus_bee/Kconfig.actinius_icarus_bee_ns b/boards/arm/actinius_icarus_bee/Kconfig.actinius_icarus_bee_ns new file mode 100644 index 0000000000000..b878685210bf1 --- /dev/null +++ b/boards/arm/actinius_icarus_bee/Kconfig.actinius_icarus_bee_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACTINIUS_ICARUS_BEE_NS + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/actinius_icarus_bee/Kconfig.board b/boards/arm/actinius_icarus_bee/Kconfig.board deleted file mode 100644 index 39081152558f4..0000000000000 --- a/boards/arm/actinius_icarus_bee/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# Actinius Icarus Bee board configuration - -# Copyright (c) 2021 Actinius -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_ACTINIUS_ICARUS_BEE - bool "Actinius Icarus Bee" - -config BOARD_ACTINIUS_ICARUS_BEE_NS - bool "Actinius Icarus Bee Non-Secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/arm/actinius_icarus_bee/Kconfig.defconfig b/boards/arm/actinius_icarus_bee/Kconfig.defconfig index 4090031177446..cc2eae320b2c8 100644 --- a/boards/arm/actinius_icarus_bee/Kconfig.defconfig +++ b/boards/arm/actinius_icarus_bee/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2021 Actinius # SPDX-License-Identifier: Apache-2.0 -if BOARD_ACTINIUS_ICARUS_BEE || BOARD_ACTINIUS_ICARUS_BEE_NS - -config BOARD - default "actinius_icarus_bee" - # For the secure version of the board the firmware is linked at the beginning # of the flash, or into the code-partition defined in DT if it is intended to # be loaded by MCUboot. If the secure firmware is to be combined with a non- @@ -34,5 +29,3 @@ config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) endif # BOARD_ACTINIUS_ICARUS_BEE_NS - -endif # BOARD_ACTINIUS_ICARUS_BEE || BOARD_ACTINIUS_ICARUS_BEE_NS diff --git a/boards/arm/actinius_icarus_bee/actinius_icarus_bee_defconfig b/boards/arm/actinius_icarus_bee/actinius_icarus_bee_defconfig index 504bbcadae593..b930856fe4b44 100644 --- a/boards/arm/actinius_icarus_bee/actinius_icarus_bee_defconfig +++ b/boards/arm/actinius_icarus_bee/actinius_icarus_bee_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_ACTINIUS_ICARUS_BEE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/actinius_icarus_bee/actinius_icarus_bee_ns_defconfig b/boards/arm/actinius_icarus_bee/actinius_icarus_bee_ns_defconfig index 73e3c4a84cee0..f6b4865a049b5 100644 --- a/boards/arm/actinius_icarus_bee/actinius_icarus_bee_ns_defconfig +++ b/boards/arm/actinius_icarus_bee/actinius_icarus_bee_ns_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_ACTINIUS_ICARUS_BEE_NS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/actinius_icarus_som/Kconfig b/boards/arm/actinius_icarus_som/Kconfig index b2ce51901e702..723c52a425966 100644 --- a/boards/arm/actinius_icarus_som/Kconfig +++ b/boards/arm/actinius_icarus_som/Kconfig @@ -3,10 +3,6 @@ # Copyright (c) 2021 Actinius # SPDX-License-Identifier: Apache-2.0 -if BOARD_ACTINIUS_ICARUS_SOM || BOARD_ACTINIUS_ICARUS_SOM_NS - module = BOARD_ICARUS_SOM module-str = Board Control source "subsys/logging/Kconfig.template.log_config" - -endif # BOARD_ACTINIUS_ICARUS_SOM || BOARD_ACTINIUS_ICARUS_SOM_NS diff --git a/boards/arm/actinius_icarus_som/Kconfig.actinius_icarus_som b/boards/arm/actinius_icarus_som/Kconfig.actinius_icarus_som new file mode 100644 index 0000000000000..82cdefbee68ab --- /dev/null +++ b/boards/arm/actinius_icarus_som/Kconfig.actinius_icarus_som @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACTINIUS_ICARUS_SOM + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/actinius_icarus_som/Kconfig.actinius_icarus_som_ns b/boards/arm/actinius_icarus_som/Kconfig.actinius_icarus_som_ns new file mode 100644 index 0000000000000..70ef4978c5849 --- /dev/null +++ b/boards/arm/actinius_icarus_som/Kconfig.actinius_icarus_som_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACTINIUS_ICARUS_SOM_NS + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/actinius_icarus_som/Kconfig.board b/boards/arm/actinius_icarus_som/Kconfig.board deleted file mode 100644 index e661fb2a00bc5..0000000000000 --- a/boards/arm/actinius_icarus_som/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# Actinius Icarus SoM board configuration - -# Copyright (c) 2021 Actinius -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_ACTINIUS_ICARUS_SOM - bool "Actinius Icarus SoM" - -config BOARD_ACTINIUS_ICARUS_SOM_NS - bool "Actinius Icarus SoM Non-Secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/arm/actinius_icarus_som/Kconfig.defconfig b/boards/arm/actinius_icarus_som/Kconfig.defconfig index 185d8f0758d8f..b6dd0e2b3a4d8 100644 --- a/boards/arm/actinius_icarus_som/Kconfig.defconfig +++ b/boards/arm/actinius_icarus_som/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2021 Actinius # SPDX-License-Identifier: Apache-2.0 -if BOARD_ACTINIUS_ICARUS_SOM || BOARD_ACTINIUS_ICARUS_SOM_NS - -config BOARD - default "actinius_icarus_som" - # For the secure version of the board the firmware is linked at the beginning # of the flash, or into the code-partition defined in DT if it is intended to # be loaded by MCUboot. If the secure firmware is to be combined with a non- @@ -34,5 +29,3 @@ config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) endif # BOARD_ACTINIUS_ICARUS_SOM_NS - -endif # BOARD_ACTINIUS_ICARUS_SOM || BOARD_ACTINIUS_ICARUS_SOM_NS diff --git a/boards/arm/actinius_icarus_som/actinius_icarus_som_defconfig b/boards/arm/actinius_icarus_som/actinius_icarus_som_defconfig index e51d63709b96b..b930856fe4b44 100644 --- a/boards/arm/actinius_icarus_som/actinius_icarus_som_defconfig +++ b/boards/arm/actinius_icarus_som/actinius_icarus_som_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_ACTINIUS_ICARUS_SOM=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/actinius_icarus_som/actinius_icarus_som_ns_defconfig b/boards/arm/actinius_icarus_som/actinius_icarus_som_ns_defconfig index 6ebb20a599485..f6b4865a049b5 100644 --- a/boards/arm/actinius_icarus_som/actinius_icarus_som_ns_defconfig +++ b/boards/arm/actinius_icarus_som/actinius_icarus_som_ns_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_ACTINIUS_ICARUS_SOM_NS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.adafruit_feather_m0_basic_proto b/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.adafruit_feather_m0_basic_proto new file mode 100644 index 0000000000000..00df050fb39af --- /dev/null +++ b/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.adafruit_feather_m0_basic_proto @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ADAFRUIT_FEATHER_M0_BASIC_PROTO + bool + default y + select SOC_SERIES_SAMD21 + select SOC_PART_NUMBER_SAMD21G18A diff --git a/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.board b/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.board deleted file mode 100644 index 9f33d8c05b71b..0000000000000 --- a/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Adafruit Feather M0 Basic Proto board configuration - -# Copyright (c) 2018 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ADAFRUIT_FEATHER_M0_BASIC_PROTO - bool "Adafruit Feather M0 Basic Proto" - depends on SOC_PART_NUMBER_SAMD21G18A diff --git a/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.defconfig b/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.defconfig deleted file mode 100644 index 834c8c14cea2c..0000000000000 --- a/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# Adafruit Feather M0 Basic Proto board configuration - -# Copyright (c) 2018 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "adafruit_feather_m0_basic_proto" - depends on BOARD_ADAFRUIT_FEATHER_M0_BASIC_PROTO diff --git a/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto_defconfig b/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto_defconfig index ef43a41674d95..2244072088048 100644 --- a/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto_defconfig +++ b/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMD21=y -CONFIG_SOC_PART_NUMBER_SAMD21G18A=y -CONFIG_BOARD_ADAFRUIT_FEATHER_M0_BASIC_PROTO=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/adafruit_feather_nrf52840/Kconfig.adafruit_feather_nrf52840 b/boards/arm/adafruit_feather_nrf52840/Kconfig.adafruit_feather_nrf52840 new file mode 100644 index 0000000000000..b3231477cb994 --- /dev/null +++ b/boards/arm/adafruit_feather_nrf52840/Kconfig.adafruit_feather_nrf52840 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ADAFRUIT_FEATHER_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/adafruit_feather_nrf52840/Kconfig.board b/boards/arm/adafruit_feather_nrf52840/Kconfig.board deleted file mode 100644 index 4e37d05303a0c..0000000000000 --- a/boards/arm/adafruit_feather_nrf52840/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Adafruit Feather nRF52840 Express board configuration - -# Copyright (c) 2020 Tobias Svehagen -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ADAFRUIT_FEATHER_NRF52840 - bool "Adafruit Feather nRF52840 Express" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/adafruit_feather_nrf52840/Kconfig.defconfig b/boards/arm/adafruit_feather_nrf52840/Kconfig.defconfig index f2d04d6cc4884..6f46151337abe 100644 --- a/boards/arm/adafruit_feather_nrf52840/Kconfig.defconfig +++ b/boards/arm/adafruit_feather_nrf52840/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2020 Tobias Svehagen # SPDX-License-Identifier: Apache-2.0 -if BOARD_ADAFRUIT_FEATHER_NRF52840 - -config BOARD - default "adafruit_feather_nrf52840" - config BT_CTLR default BT - -endif # BOARD_ADAFRUIT_FEATHER_NRF52840 diff --git a/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840_defconfig b/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840_defconfig index 8d892db30f21b..4781339a59ec8 100644 --- a/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840_defconfig +++ b/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_ADAFRUIT_FEATHER_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/adafruit_feather_stm32f405/Kconfig.adafruit_feather_stm32f405 b/boards/arm/adafruit_feather_stm32f405/Kconfig.adafruit_feather_stm32f405 new file mode 100644 index 0000000000000..e6108f27aa53c --- /dev/null +++ b/boards/arm/adafruit_feather_stm32f405/Kconfig.adafruit_feather_stm32f405 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ADAFRUIT_FEATHER_STM32F405 + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F405XG diff --git a/boards/arm/adafruit_feather_stm32f405/Kconfig.board b/boards/arm/adafruit_feather_stm32f405/Kconfig.board deleted file mode 100644 index 8f563963fee32..0000000000000 --- a/boards/arm/adafruit_feather_stm32f405/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Adafruit Feather STM32F405 Express board configuration - -# Copyright (c) 2020 Lucian Copeland for Adafruit Industries -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ADAFRUIT_FEATHER_STM32F405 - bool "Feather STM32F405 Express Board" - depends on SOC_STM32F405XG diff --git a/boards/arm/adafruit_feather_stm32f405/Kconfig.defconfig b/boards/arm/adafruit_feather_stm32f405/Kconfig.defconfig deleted file mode 100644 index 1e7e3593d3412..0000000000000 --- a/boards/arm/adafruit_feather_stm32f405/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Adafruit Feather STM32F405 Express board configuration - -# Copyright (c) 2020 Lucian Copeland for Adafruit Industries. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_ADAFRUIT_FEATHER_STM32F405 - -config BOARD - default "adafruit_feather_stm32f405" - -endif # BOARD_ADAFRUIT_FEATHER_STM32F405 diff --git a/boards/arm/adafruit_feather_stm32f405/adafruit_feather_stm32f405_defconfig b/boards/arm/adafruit_feather_stm32f405/adafruit_feather_stm32f405_defconfig index ca015a21976c5..bc6020b2f192f 100644 --- a/boards/arm/adafruit_feather_stm32f405/adafruit_feather_stm32f405_defconfig +++ b/boards/arm/adafruit_feather_stm32f405/adafruit_feather_stm32f405_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F405XG=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/adafruit_itsybitsy_m4_express/Kconfig.adafruit_itsybitsy_m4_express b/boards/arm/adafruit_itsybitsy_m4_express/Kconfig.adafruit_itsybitsy_m4_express new file mode 100644 index 0000000000000..9b68559716657 --- /dev/null +++ b/boards/arm/adafruit_itsybitsy_m4_express/Kconfig.adafruit_itsybitsy_m4_express @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ADAFRUIT_ITSYBITSY_M4_EXPRESS + bool + default y + select SOC_SERIES_SAMD51 + select SOC_PART_NUMBER_SAMD51G19A diff --git a/boards/arm/adafruit_itsybitsy_m4_express/Kconfig.board b/boards/arm/adafruit_itsybitsy_m4_express/Kconfig.board deleted file mode 100644 index 79fd1eb629337..0000000000000 --- a/boards/arm/adafruit_itsybitsy_m4_express/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Adafruit ItsyBitsy M4 Express board configuration - -# Copyright (c) 2020 Google LLC. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ADAFRUIT_ITSYBITSY_M4_EXPRESS - bool "Adafruit ItsyBitsy M4 Express" - depends on SOC_PART_NUMBER_SAMD51G19A diff --git a/boards/arm/adafruit_itsybitsy_m4_express/Kconfig.defconfig b/boards/arm/adafruit_itsybitsy_m4_express/Kconfig.defconfig deleted file mode 100644 index 922a2ab58bddb..0000000000000 --- a/boards/arm/adafruit_itsybitsy_m4_express/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# Adafruit ItsyBitsy M4 Express board configuration - -# Copyright (c) 2020 Google LLC. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "adafruit_itsybitsy_m4_express" - depends on BOARD_ADAFRUIT_ITSYBITSY_M4_EXPRESS diff --git a/boards/arm/adafruit_itsybitsy_m4_express/adafruit_itsybitsy_m4_express_defconfig b/boards/arm/adafruit_itsybitsy_m4_express/adafruit_itsybitsy_m4_express_defconfig index 9a06333e1176d..388ec31af5941 100644 --- a/boards/arm/adafruit_itsybitsy_m4_express/adafruit_itsybitsy_m4_express_defconfig +++ b/boards/arm/adafruit_itsybitsy_m4_express/adafruit_itsybitsy_m4_express_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMD51=y -CONFIG_SOC_PART_NUMBER_SAMD51G19A=y -CONFIG_BOARD_ADAFRUIT_ITSYBITSY_M4_EXPRESS=y CONFIG_SOC_ATMEL_SAMD5X_OSCULP32K_AS_MAIN=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y diff --git a/boards/arm/adafruit_trinket_m0/Kconfig.adafruit_trinket_m0 b/boards/arm/adafruit_trinket_m0/Kconfig.adafruit_trinket_m0 new file mode 100644 index 0000000000000..bbe605f4433e1 --- /dev/null +++ b/boards/arm/adafruit_trinket_m0/Kconfig.adafruit_trinket_m0 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ADAFRUIT_TRINKET_M0 + bool + default y + select SOC_SERIES_SAMD21 + select SOC_PART_NUMBER_SAMD21E18A diff --git a/boards/arm/adafruit_trinket_m0/Kconfig.board b/boards/arm/adafruit_trinket_m0/Kconfig.board deleted file mode 100644 index 302a0da3feb5e..0000000000000 --- a/boards/arm/adafruit_trinket_m0/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Adafruit Trinket M0 board configuration - -# Copyright (c) 2018 Google LLC. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ADAFRUIT_TRINKET_M0 - bool "Adafruit Trinket M0" - depends on SOC_PART_NUMBER_SAMD21E18A diff --git a/boards/arm/adafruit_trinket_m0/Kconfig.defconfig b/boards/arm/adafruit_trinket_m0/Kconfig.defconfig deleted file mode 100644 index 31c97cb7dc2fa..0000000000000 --- a/boards/arm/adafruit_trinket_m0/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# Adafruit Trinket M0 board configuration - -# Copyright (c) 2018 Google LLC. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "adafruit_trinket_m0" - depends on BOARD_ADAFRUIT_TRINKET_M0 diff --git a/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0_defconfig b/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0_defconfig index a587f7007fefe..7c17e27c6e1a8 100644 --- a/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0_defconfig +++ b/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMD21=y -CONFIG_SOC_PART_NUMBER_SAMD21E18A=y -CONFIG_BOARD_ADAFRUIT_TRINKET_M0=y CONFIG_SOC_ATMEL_SAMD_OSC8M_AS_MAIN=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/arduino_due/Kconfig.arduino_due b/boards/arm/arduino_due/Kconfig.arduino_due new file mode 100644 index 0000000000000..89eef062e6d4c --- /dev/null +++ b/boards/arm/arduino_due/Kconfig.arduino_due @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARDUINO_DUE + bool + default y + select SOC_SERIES_SAM3X + select SOC_PART_NUMBER_SAM3X8E diff --git a/boards/arm/arduino_due/Kconfig.board b/boards/arm/arduino_due/Kconfig.board deleted file mode 100644 index 8e0a7ae81b047..0000000000000 --- a/boards/arm/arduino_due/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Arduino Due Board configuration - -# Copyright (c) 2017 Justin Watson -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ARDUINO_DUE - bool "Arduino Due Board" - depends on SOC_PART_NUMBER_SAM3X8E diff --git a/boards/arm/arduino_due/Kconfig.defconfig b/boards/arm/arduino_due/Kconfig.defconfig deleted file mode 100644 index 13c6fdf57225e..0000000000000 --- a/boards/arm/arduino_due/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Arduino Due Board configuration - -# Copyright (c) 2017 Justin Watson -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_ARDUINO_DUE - -config BOARD - default "arduino_due" - -endif # BOARD_ARDUINO_DUE diff --git a/boards/arm/arduino_due/arduino_due_defconfig b/boards/arm/arduino_due/arduino_due_defconfig index 32fa49bd002c3..227e4587037a1 100644 --- a/boards/arm/arduino_due/arduino_due_defconfig +++ b/boards/arm/arduino_due/arduino_due_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAM3X=y -CONFIG_SOC_PART_NUMBER_SAM3X8E=y -CONFIG_BOARD_ARDUINO_DUE=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/arduino_mkrzero/Kconfig.arduino_mkrzero b/boards/arm/arduino_mkrzero/Kconfig.arduino_mkrzero new file mode 100644 index 0000000000000..106bebd08a57e --- /dev/null +++ b/boards/arm/arduino_mkrzero/Kconfig.arduino_mkrzero @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARDUINO_MKRZERO + bool + default y + select SOC_SERIES_SAMD21 + select SOC_PART_NUMBER_SAMD21G18A diff --git a/boards/arm/arduino_mkrzero/Kconfig.board b/boards/arm/arduino_mkrzero/Kconfig.board deleted file mode 100644 index aa80faec588f9..0000000000000 --- a/boards/arm/arduino_mkrzero/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Arduino MKR Zero Board configuration - -# Copyright (c) 2022 TOKITA Hiroshi -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ARDUINO_MKRZERO - bool "Arduino MKR Zero" - depends on SOC_PART_NUMBER_SAMD21G18A diff --git a/boards/arm/arduino_mkrzero/Kconfig.defconfig b/boards/arm/arduino_mkrzero/Kconfig.defconfig index 988edd82f1ba4..6d5f9448b9e03 100644 --- a/boards/arm/arduino_mkrzero/Kconfig.defconfig +++ b/boards/arm/arduino_mkrzero/Kconfig.defconfig @@ -3,10 +3,6 @@ # Copyright (c) 2022 TOKITA Hiroshi # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "arduino_mkrzero" - depends on BOARD_ARDUINO_MKRZERO - if DISK_DRIVERS config DISK_DRIVER_SDMMC diff --git a/boards/arm/arduino_mkrzero/arduino_mkrzero_defconfig b/boards/arm/arduino_mkrzero/arduino_mkrzero_defconfig index 2101e5a8332c1..373b5f189c8db 100644 --- a/boards/arm/arduino_mkrzero/arduino_mkrzero_defconfig +++ b/boards/arm/arduino_mkrzero/arduino_mkrzero_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMD21=y -CONFIG_SOC_PART_NUMBER_SAMD21G18A=y -CONFIG_BOARD_ARDUINO_MKRZERO=y CONFIG_SOC_ATMEL_SAMD_XOSC32K=y CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y CONFIG_CONSOLE=y diff --git a/boards/arm/arduino_nano_33_ble/Kconfig.arduino_nano_33_ble b/boards/arm/arduino_nano_33_ble/Kconfig.arduino_nano_33_ble new file mode 100644 index 0000000000000..3f935fc45e3e4 --- /dev/null +++ b/boards/arm/arduino_nano_33_ble/Kconfig.arduino_nano_33_ble @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARDUINO_NANO_33_BLE + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/arduino_nano_33_ble/Kconfig.arduino_nano_33_ble_sense b/boards/arm/arduino_nano_33_ble/Kconfig.arduino_nano_33_ble_sense new file mode 100644 index 0000000000000..176bf5a3eba56 --- /dev/null +++ b/boards/arm/arduino_nano_33_ble/Kconfig.arduino_nano_33_ble_sense @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARDUINO_NANO_33_BLE_SENSE + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/arduino_nano_33_ble/Kconfig.board b/boards/arm/arduino_nano_33_ble/Kconfig.board deleted file mode 100644 index 2492aea4c91ae..0000000000000 --- a/boards/arm/arduino_nano_33_ble/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2020 Jefferson Lee. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ARDUINO_NANO_33_BLE - bool "Arduino Nano 33 BLE board" - depends on SOC_NRF52840_QIAA - -config BOARD_ARDUINO_NANO_33_BLE_SENSE - bool "Arduino Nano 33 BLE Sense board" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/arduino_nano_33_ble/Kconfig.defconfig b/boards/arm/arduino_nano_33_ble/Kconfig.defconfig index 382e71f7e9fee..33ee8e9e6a110 100644 --- a/boards/arm/arduino_nano_33_ble/Kconfig.defconfig +++ b/boards/arm/arduino_nano_33_ble/Kconfig.defconfig @@ -1,16 +1,8 @@ # Copyright (c) 2020 Jefferson Lee. # SPDX-License-Identifier: Apache-2.0 -if BOARD_ARDUINO_NANO_33_BLE || BOARD_ARDUINO_NANO_33_BLE_SENSE - -config BOARD - default "arduino_nano_33_ble" if BOARD_ARDUINO_NANO_33_BLE - default "arduino_nano_33_ble_sense" if BOARD_ARDUINO_NANO_33_BLE_SENSE - config BT_CTLR default BT config REGULATOR default y if SENSOR - -endif # BOARD_ARDUINO_NANO_33_BLE || BOARD_ARDUINO_NANO_33_BLE_SENSE diff --git a/boards/arm/arduino_nano_33_ble/arduino_nano_33_ble_defconfig b/boards/arm/arduino_nano_33_ble/arduino_nano_33_ble_defconfig index 2d91725aaf950..3dcb3a493aba0 100644 --- a/boards/arm/arduino_nano_33_ble/arduino_nano_33_ble_defconfig +++ b/boards/arm/arduino_nano_33_ble/arduino_nano_33_ble_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_ARDUINO_NANO_33_BLE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/arduino_nano_33_ble/arduino_nano_33_ble_sense_defconfig b/boards/arm/arduino_nano_33_ble/arduino_nano_33_ble_sense_defconfig index 8ef8ece861c4a..3dcb3a493aba0 100644 --- a/boards/arm/arduino_nano_33_ble/arduino_nano_33_ble_sense_defconfig +++ b/boards/arm/arduino_nano_33_ble/arduino_nano_33_ble_sense_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_ARDUINO_NANO_33_BLE_SENSE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/arduino_nano_33_iot/Kconfig.arduino_nano_33_iot b/boards/arm/arduino_nano_33_iot/Kconfig.arduino_nano_33_iot new file mode 100644 index 0000000000000..1b6cc1bd9d76d --- /dev/null +++ b/boards/arm/arduino_nano_33_iot/Kconfig.arduino_nano_33_iot @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARDUINO_NANO_33_IOT + bool + default y + select SOC_SERIES_SAMD21 + select SOC_PART_NUMBER_SAMD21G18A diff --git a/boards/arm/arduino_nano_33_iot/Kconfig.board b/boards/arm/arduino_nano_33_iot/Kconfig.board deleted file mode 100644 index 87c65a0f14284..0000000000000 --- a/boards/arm/arduino_nano_33_iot/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Arduino Nano 33 IOT board configuration - -# Copyright (c) 2020 Google LLC. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ARDUINO_NANO_33_IOT - bool "Arduino Nano 33 IOT" - depends on SOC_PART_NUMBER_SAMD21G18A diff --git a/boards/arm/arduino_nano_33_iot/Kconfig.defconfig b/boards/arm/arduino_nano_33_iot/Kconfig.defconfig deleted file mode 100644 index b4fc2bbc21fe1..0000000000000 --- a/boards/arm/arduino_nano_33_iot/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# Arduino Nano 33 IOT board configuration - -# Copyright (c) 2020 Google LLC. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "arduino_nano_33_iot" - depends on BOARD_ARDUINO_NANO_33_IOT diff --git a/boards/arm/arduino_nano_33_iot/arduino_nano_33_iot_defconfig b/boards/arm/arduino_nano_33_iot/arduino_nano_33_iot_defconfig index b649e74183980..61ea7745b773c 100644 --- a/boards/arm/arduino_nano_33_iot/arduino_nano_33_iot_defconfig +++ b/boards/arm/arduino_nano_33_iot/arduino_nano_33_iot_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMD21=y -CONFIG_SOC_PART_NUMBER_SAMD21G18A=y -CONFIG_BOARD_ARDUINO_NANO_33_IOT=y CONFIG_SOC_ATMEL_SAMD_OSC8M_AS_MAIN=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/arduino_nicla_sense_me/Kconfig.arduino_nicla_sense_me b/boards/arm/arduino_nicla_sense_me/Kconfig.arduino_nicla_sense_me new file mode 100644 index 0000000000000..e2190fc2bc51c --- /dev/null +++ b/boards/arm/arduino_nicla_sense_me/Kconfig.arduino_nicla_sense_me @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARDUINO_NICLA_SENSE_ME + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/arduino_nicla_sense_me/Kconfig.board b/boards/arm/arduino_nicla_sense_me/Kconfig.board deleted file mode 100644 index 47e9aabfbb2fe..0000000000000 --- a/boards/arm/arduino_nicla_sense_me/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Arduino Nicla Sense ME board configuration - -# Copyright (c) 2022 Benjamin Björnsson . -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ARDUINO_NICLA_SENSE_ME - bool "Arduino Nicla Sense ME" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/arduino_nicla_sense_me/Kconfig.defconfig b/boards/arm/arduino_nicla_sense_me/Kconfig.defconfig index c0293cec5c9b5..182c51508c1b0 100644 --- a/boards/arm/arduino_nicla_sense_me/Kconfig.defconfig +++ b/boards/arm/arduino_nicla_sense_me/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2022 Benjamin Björnsson . # SPDX-License-Identifier: Apache-2.0 -if BOARD_ARDUINO_NICLA_SENSE_ME - -config BOARD - default "arduino_nicla_sense_me" - config BT_CTLR default BT - -endif # BOARD_ARDUINO_NICLA_SENSE_ME diff --git a/boards/arm/arduino_nicla_sense_me/arduino_nicla_sense_me_defconfig b/boards/arm/arduino_nicla_sense_me/arduino_nicla_sense_me_defconfig index 396d37d36e03a..414a780e2ceb3 100644 --- a/boards/arm/arduino_nicla_sense_me/arduino_nicla_sense_me_defconfig +++ b/boards/arm/arduino_nicla_sense_me/arduino_nicla_sense_me_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_ARDUINO_NICLA_SENSE_ME=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/arduino_zero/Kconfig.arduino_zero b/boards/arm/arduino_zero/Kconfig.arduino_zero new file mode 100644 index 0000000000000..4dabb743fad5b --- /dev/null +++ b/boards/arm/arduino_zero/Kconfig.arduino_zero @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARDUINO_ZERO + bool + default y + select SOC_SERIES_SAMD21 + select SOC_PART_NUMBER_SAMD21G18A diff --git a/boards/arm/arduino_zero/Kconfig.board b/boards/arm/arduino_zero/Kconfig.board deleted file mode 100644 index 646e4020e420e..0000000000000 --- a/boards/arm/arduino_zero/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Arduino Zero Board configuration - -# Copyright (c) 2017 Google LLC. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ARDUINO_ZERO - bool "Arduino Zero" - depends on SOC_PART_NUMBER_SAMD21G18A diff --git a/boards/arm/arduino_zero/Kconfig.defconfig b/boards/arm/arduino_zero/Kconfig.defconfig deleted file mode 100644 index 9cd148585cb26..0000000000000 --- a/boards/arm/arduino_zero/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# Arduino Zero board configuration - -# Copyright (c) 2017 Google LLC. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "arduino_zero" - depends on BOARD_ARDUINO_ZERO diff --git a/boards/arm/arduino_zero/arduino_zero_defconfig b/boards/arm/arduino_zero/arduino_zero_defconfig index 2448a6a65d0cd..6335cc693e675 100644 --- a/boards/arm/arduino_zero/arduino_zero_defconfig +++ b/boards/arm/arduino_zero/arduino_zero_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMD21=y -CONFIG_SOC_PART_NUMBER_SAMD21G18A=y -CONFIG_BOARD_ARDUINO_ZERO=y CONFIG_BUILD_OUTPUT_HEX=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/arty/Kconfig.arty_a7_arm_designstart_m1 b/boards/arm/arty/Kconfig.arty_a7_arm_designstart_m1 new file mode 100644 index 0000000000000..ea2400e21a08e --- /dev/null +++ b/boards/arm/arty/Kconfig.arty_a7_arm_designstart_m1 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARTY_A7_ARM_DESIGNSTART_M1 + bool + default y + select SOC_SERIES_ARM_DESIGNSTART + select SOC_ARM_DESIGNSTART_FPGA_CORTEX_M1 diff --git a/boards/arm/arty/Kconfig.arty_a7_arm_designstart_m3 b/boards/arm/arty/Kconfig.arty_a7_arm_designstart_m3 new file mode 100644 index 0000000000000..5514ca39c0d85 --- /dev/null +++ b/boards/arm/arty/Kconfig.arty_a7_arm_designstart_m3 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARTY_A7_ARM_DESIGNSTART_M3 + bool + default y + select SOC_SERIES_ARM_DESIGNSTART + select SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3 diff --git a/boards/arm/arty/Kconfig.board b/boards/arm/arty/Kconfig.board deleted file mode 100644 index 17a6e65974889..0000000000000 --- a/boards/arm/arty/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# Digilent Arty board configuration - -# Copyright (c) 2020 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ARTY_A7_ARM_DESIGNSTART_M1 - bool "Digilent Arty A7 ARM DesignStart Cortex-M1" - depends on SOC_SERIES_ARM_DESIGNSTART - -config BOARD_ARTY_A7_ARM_DESIGNSTART_M3 - bool "Digilent Arty A7 ARM DesignStart Cortex-M3" - depends on SOC_SERIES_ARM_DESIGNSTART diff --git a/boards/arm/arty/Kconfig.defconfig b/boards/arm/arty/Kconfig.defconfig index d57d29baa23f2..d32a3a5063db9 100644 --- a/boards/arm/arty/Kconfig.defconfig +++ b/boards/arm/arty/Kconfig.defconfig @@ -3,12 +3,6 @@ # Copyright (c) 2020 Henrik Brix Andersen # SPDX-License-Identifier: Apache-2.0 -if BOARD_ARTY_A7_ARM_DESIGNSTART_M1 || BOARD_ARTY_A7_ARM_DESIGNSTART_M3 - -config BOARD - default "arty_a7_arm_designstart_m1" if BOARD_ARTY_A7_ARM_DESIGNSTART_M1 - default "arty_a7_arm_designstart_m3" if BOARD_ARTY_A7_ARM_DESIGNSTART_M3 - config CPU_CORTEX_M_HAS_SYSTICK default y @@ -30,5 +24,3 @@ config SPI_NOR default y if SPI_XLNX_AXI_QUADSPI endif # FLASH - -endif # BOARD_ARTY_A7_ARM_DESIGNSTART_M1 || BOARD_ARTY_A7_ARM_DESIGNSTART_M3 diff --git a/boards/arm/arty/arty_a7_arm_designstart_m1_defconfig b/boards/arm/arty/arty_a7_arm_designstart_m1_defconfig index a3ad6770d45df..ce3f3066fa07e 100644 --- a/boards/arm/arty/arty_a7_arm_designstart_m1_defconfig +++ b/boards/arm/arty/arty_a7_arm_designstart_m1_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_ARM_DESIGNSTART=y -CONFIG_SOC_ARM_DESIGNSTART_FPGA_CORTEX_M1=y -CONFIG_BOARD_ARTY_A7_ARM_DESIGNSTART_M1=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=100000000 CONFIG_SERIAL=y diff --git a/boards/arm/arty/arty_a7_arm_designstart_m3_defconfig b/boards/arm/arty/arty_a7_arm_designstart_m3_defconfig index 3753680a072ea..7952bdf9f20bf 100644 --- a/boards/arm/arty/arty_a7_arm_designstart_m3_defconfig +++ b/boards/arm/arty/arty_a7_arm_designstart_m3_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_ARM_DESIGNSTART=y -CONFIG_SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3=y -CONFIG_BOARD_ARTY_A7_ARM_DESIGNSTART_M3=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=50000000 CONFIG_ARM_MPU=y diff --git a/boards/arm/ast1030_evb/Kconfig.ast1030_evb b/boards/arm/ast1030_evb/Kconfig.ast1030_evb new file mode 100644 index 0000000000000..a3984a7b3349f --- /dev/null +++ b/boards/arm/ast1030_evb/Kconfig.ast1030_evb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_AST1030_EVB + bool + default y + select SOC_SERIES_AST10X0 + select SOC_AST1030 diff --git a/boards/arm/ast1030_evb/Kconfig.board b/boards/arm/ast1030_evb/Kconfig.board deleted file mode 100644 index 464e3f9370511..0000000000000 --- a/boards/arm/ast1030_evb/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Aspeed AST1030 evaluation board configuration -# -# Copyright (c) 2021 Aspeed Technology Inc. - -config BOARD_AST1030_EVB - bool "ASPEED AST1030 Evaluation Board" - depends on SOC_AST1030 diff --git a/boards/arm/ast1030_evb/Kconfig.defconfig b/boards/arm/ast1030_evb/Kconfig.defconfig deleted file mode 100644 index 9402846fdade4..0000000000000 --- a/boards/arm/ast1030_evb/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Aspeed AST1030 evaluation board configuration -# -# Copyright (c) 2021 Aspeed Technology Inc. - -if BOARD_AST1030_EVB -config BOARD - default "ast1030_evb" -endif # BOARD_AST1030_EVB diff --git a/boards/arm/ast1030_evb/ast1030_evb_defconfig b/boards/arm/ast1030_evb/ast1030_evb_defconfig index b5a47d62b6ff7..97b556edcc0e0 100644 --- a/boards/arm/ast1030_evb/ast1030_evb_defconfig +++ b/boards/arm/ast1030_evb/ast1030_evb_defconfig @@ -2,7 +2,6 @@ # # Copyright (c) 2021 Aspeed Technology Inc. # -CONFIG_SOC_SERIES_AST10X0=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=200000000 CONFIG_MAIN_STACK_SIZE=4096 CONFIG_BOOTLOADER_SRAM_SIZE=0 diff --git a/boards/arm/atsamd20_xpro/Kconfig.atsamd20_xpro b/boards/arm/atsamd20_xpro/Kconfig.atsamd20_xpro new file mode 100644 index 0000000000000..e8ff55e27f572 --- /dev/null +++ b/boards/arm/atsamd20_xpro/Kconfig.atsamd20_xpro @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ATSAMD20_XPRO + bool + default y + select SOC_SERIES_SAMD20 + select SOC_PART_NUMBER_SAMD20J18 diff --git a/boards/arm/atsamd20_xpro/Kconfig.board b/boards/arm/atsamd20_xpro/Kconfig.board deleted file mode 100644 index f63891d49ace6..0000000000000 --- a/boards/arm/atsamd20_xpro/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# SAM D20 Xplained Pro Board configuration - -# Copyright (c) 2018 Sean Nyekjaer -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ATSAMD20_XPRO - bool "SAM D20 Xplained Pro" - depends on SOC_PART_NUMBER_SAMD20J18 diff --git a/boards/arm/atsamd20_xpro/Kconfig.defconfig b/boards/arm/atsamd20_xpro/Kconfig.defconfig deleted file mode 100644 index ec29acbf76fb9..0000000000000 --- a/boards/arm/atsamd20_xpro/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# SAM D20 Xplained Pro board configuration - -# Copyright (c) 2018 Sean Nyekjaer -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "atsamd20_xpro" - depends on BOARD_ATSAMD20_XPRO diff --git a/boards/arm/atsamd20_xpro/atsamd20_xpro_defconfig b/boards/arm/atsamd20_xpro/atsamd20_xpro_defconfig index 2b573aae771a2..e127ba2e7ef33 100644 --- a/boards/arm/atsamd20_xpro/atsamd20_xpro_defconfig +++ b/boards/arm/atsamd20_xpro/atsamd20_xpro_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMD20=y -CONFIG_SOC_PART_NUMBER_SAMD20J18=y -CONFIG_BOARD_ATSAMD20_XPRO=y CONFIG_BUILD_OUTPUT_HEX=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/atsamd21_xpro/Kconfig.atsamd21_xpro b/boards/arm/atsamd21_xpro/Kconfig.atsamd21_xpro new file mode 100644 index 0000000000000..2ca5c5985c464 --- /dev/null +++ b/boards/arm/atsamd21_xpro/Kconfig.atsamd21_xpro @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ATSAMD21_XPRO + bool + default y + select SOC_SERIES_SAMD21 + select SOC_PART_NUMBER_SAMD21J18A diff --git a/boards/arm/atsamd21_xpro/Kconfig.board b/boards/arm/atsamd21_xpro/Kconfig.board deleted file mode 100644 index 4070442f3ca97..0000000000000 --- a/boards/arm/atsamd21_xpro/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# SAM D21 Xplained Pro Board configuration - -# Copyright (c) 2018 Bryan O'Donoghue -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ATSAMD21_XPRO - bool "SAM D21 Xplained Pro" - depends on SOC_PART_NUMBER_SAMD21J18A diff --git a/boards/arm/atsamd21_xpro/Kconfig.defconfig b/boards/arm/atsamd21_xpro/Kconfig.defconfig deleted file mode 100644 index 6ebc627dd1b27..0000000000000 --- a/boards/arm/atsamd21_xpro/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# SAM D21 Xplained Pro board configuration - -# Copyright (c) 2018 Bryan O'Donoghue -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "atsamd21_xpro" - depends on BOARD_ATSAMD21_XPRO diff --git a/boards/arm/atsamd21_xpro/atsamd21_xpro_defconfig b/boards/arm/atsamd21_xpro/atsamd21_xpro_defconfig index 42fad1eeae2b3..bb912d749822f 100644 --- a/boards/arm/atsamd21_xpro/atsamd21_xpro_defconfig +++ b/boards/arm/atsamd21_xpro/atsamd21_xpro_defconfig @@ -1,8 +1,5 @@ # Copyright (c) 2018 Bryan O'Donoghue # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMD21=y -CONFIG_SOC_PART_NUMBER_SAMD21J18A=y -CONFIG_BOARD_ATSAMD21_XPRO=y CONFIG_BUILD_OUTPUT_HEX=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/atsame54_xpro/Kconfig.atsame54_xpro b/boards/arm/atsame54_xpro/Kconfig.atsame54_xpro new file mode 100644 index 0000000000000..9758079471b00 --- /dev/null +++ b/boards/arm/atsame54_xpro/Kconfig.atsame54_xpro @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ATSAME54_XPRO + bool + default y + select SOC_SERIES_SAME54 + select SOC_PART_NUMBER_SAME54P20A diff --git a/boards/arm/atsame54_xpro/Kconfig.board b/boards/arm/atsame54_xpro/Kconfig.board deleted file mode 100644 index 2d451f1afefb0..0000000000000 --- a/boards/arm/atsame54_xpro/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# SAM E54 Xplained Pro Board configuration -# -# Copyright (c) 2019 Benjamin Valentin -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ATSAME54_XPRO - bool "SAM E54 Xplained Pro" - depends on SOC_PART_NUMBER_SAME54P20A diff --git a/boards/arm/atsame54_xpro/Kconfig.defconfig b/boards/arm/atsame54_xpro/Kconfig.defconfig index 01f6db952bcb9..7d10a0b183809 100644 --- a/boards/arm/atsame54_xpro/Kconfig.defconfig +++ b/boards/arm/atsame54_xpro/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2019 Benjamin Valentin # SPDX-License-Identifier: Apache-2.0 -if BOARD_ATSAME54_XPRO - -config BOARD - default "atsame54_xpro" - if NETWORKING config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_ATSAME54_XPRO diff --git a/boards/arm/atsame54_xpro/atsame54_xpro_defconfig b/boards/arm/atsame54_xpro/atsame54_xpro_defconfig index fe4ad28fcdd40..347ad415ec25e 100644 --- a/boards/arm/atsame54_xpro/atsame54_xpro_defconfig +++ b/boards/arm/atsame54_xpro/atsame54_xpro_defconfig @@ -1,8 +1,5 @@ # Copyright (c) 2019 Benjamin Valentin # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAME54=y -CONFIG_SOC_PART_NUMBER_SAME54P20A=y -CONFIG_BOARD_ATSAME54_XPRO=y CONFIG_BUILD_OUTPUT_HEX=y CONFIG_ARM_MPU=y CONFIG_SOC_ATMEL_SAMD5X_XOSC32K=y diff --git a/boards/arm/atsaml21_xpro/Kconfig.atsaml21_xpro b/boards/arm/atsaml21_xpro/Kconfig.atsaml21_xpro new file mode 100644 index 0000000000000..fc60d919c2d20 --- /dev/null +++ b/boards/arm/atsaml21_xpro/Kconfig.atsaml21_xpro @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ATSAML21_XPRO + bool + default y + select SOC_SERIES_SAML21 + select SOC_PART_NUMBER_SAML21J18B diff --git a/boards/arm/atsaml21_xpro/Kconfig.board b/boards/arm/atsaml21_xpro/Kconfig.board deleted file mode 100644 index a06c9e3d20a33..0000000000000 --- a/boards/arm/atsaml21_xpro/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# SAM L21 Xplained Pro board configuration - -# Copyright (c) 2021 Argentum Systems Ltd. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ATSAML21_XPRO - bool "SAM L21 Xplained Pro" - depends on SOC_PART_NUMBER_SAML21J18B diff --git a/boards/arm/atsaml21_xpro/Kconfig.defconfig b/boards/arm/atsaml21_xpro/Kconfig.defconfig deleted file mode 100644 index 3c35f327bb20e..0000000000000 --- a/boards/arm/atsaml21_xpro/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# SAM L21 Xplained Pro board configuration - -# Copyright (c) 2021 Argentum Systems Ltd. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "atsaml21_xpro" - depends on BOARD_ATSAML21_XPRO diff --git a/boards/arm/atsaml21_xpro/atsaml21_xpro_defconfig b/boards/arm/atsaml21_xpro/atsaml21_xpro_defconfig index 5446901df1a51..80f09c0acdb41 100644 --- a/boards/arm/atsaml21_xpro/atsaml21_xpro_defconfig +++ b/boards/arm/atsaml21_xpro/atsaml21_xpro_defconfig @@ -1,8 +1,5 @@ # Copyright (c) 2021 Argentum Systems Ltd. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAML21=y -CONFIG_SOC_PART_NUMBER_SAML21J18B=y -CONFIG_BOARD_ATSAML21_XPRO=y CONFIG_BUILD_OUTPUT_HEX=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/atsamr21_xpro/Kconfig.atsamr21_xpro b/boards/arm/atsamr21_xpro/Kconfig.atsamr21_xpro new file mode 100644 index 0000000000000..5d683e2e74e6d --- /dev/null +++ b/boards/arm/atsamr21_xpro/Kconfig.atsamr21_xpro @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ATSAMR21_XPRO + bool + default y + select SOC_SERIES_SAMR21 + select SOC_PART_NUMBER_SAMR21G18A diff --git a/boards/arm/atsamr21_xpro/Kconfig.board b/boards/arm/atsamr21_xpro/Kconfig.board deleted file mode 100644 index 0293b0416f00d..0000000000000 --- a/boards/arm/atsamr21_xpro/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# SAM R21 Xplained Pro Board configuration - -# Copyright (c) 2019 Benjamin Valentin -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ATSAMR21_XPRO - bool "SAM R21 Xplained Pro" - depends on SOC_PART_NUMBER_SAMR21G18A diff --git a/boards/arm/atsamr21_xpro/Kconfig.defconfig b/boards/arm/atsamr21_xpro/Kconfig.defconfig deleted file mode 100644 index 4f0b72b150b18..0000000000000 --- a/boards/arm/atsamr21_xpro/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# SAM R21 Xplained Pro board configuration - -# Copyright (c) 2019 Benjamin Valentin -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_ATSAMR21_XPRO - -config BOARD - default "atsamr21_xpro" - -endif # BOARD_ATSAMR21_XPRO diff --git a/boards/arm/atsamr21_xpro/atsamr21_xpro_defconfig b/boards/arm/atsamr21_xpro/atsamr21_xpro_defconfig index b327352ddce08..f060b5541cf62 100644 --- a/boards/arm/atsamr21_xpro/atsamr21_xpro_defconfig +++ b/boards/arm/atsamr21_xpro/atsamr21_xpro_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2019 Gerson Fernando Budke # Copyright (c) 2019 Benjamin Valentin # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMR21=y -CONFIG_SOC_PART_NUMBER_SAMR21G18A=y -CONFIG_BOARD_ATSAMR21_XPRO=y CONFIG_BUILD_OUTPUT_HEX=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/atsamr34_xpro/Kconfig.atsamr34_xpro b/boards/arm/atsamr34_xpro/Kconfig.atsamr34_xpro new file mode 100644 index 0000000000000..eea353d4b5e00 --- /dev/null +++ b/boards/arm/atsamr34_xpro/Kconfig.atsamr34_xpro @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ATSAMR34_XPRO + bool + default y + select SOC_SERIES_SAMR34 + select SOC_PART_NUMBER_SAMR34J18B diff --git a/boards/arm/atsamr34_xpro/Kconfig.board b/boards/arm/atsamr34_xpro/Kconfig.board deleted file mode 100644 index d586efcbc7e7a..0000000000000 --- a/boards/arm/atsamr34_xpro/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# SAM R34 Xplained Pro board configuration - -# Copyright (c) 2021 Argentum Systems Ltd. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ATSAMR34_XPRO - bool "SAM R34 Xplained Pro" - depends on SOC_PART_NUMBER_SAMR34J18B diff --git a/boards/arm/atsamr34_xpro/Kconfig.defconfig b/boards/arm/atsamr34_xpro/Kconfig.defconfig deleted file mode 100644 index e327820655a02..0000000000000 --- a/boards/arm/atsamr34_xpro/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# SAM R34 Xplained Pro board configuration - -# Copyright (c) 2021 Argentum Systems Ltd. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "atsamr34_xpro" - depends on BOARD_ATSAMR34_XPRO diff --git a/boards/arm/atsamr34_xpro/atsamr34_xpro_defconfig b/boards/arm/atsamr34_xpro/atsamr34_xpro_defconfig index de6e4c339dadd..80f09c0acdb41 100644 --- a/boards/arm/atsamr34_xpro/atsamr34_xpro_defconfig +++ b/boards/arm/atsamr34_xpro/atsamr34_xpro_defconfig @@ -1,8 +1,5 @@ # Copyright (c) 2021 Argentum Systems Ltd. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMR34=y -CONFIG_SOC_PART_NUMBER_SAMR34J18B=y -CONFIG_BOARD_ATSAMR34_XPRO=y CONFIG_BUILD_OUTPUT_HEX=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/b_g474e_dpow1/Kconfig.b_g474e_dpow1 b/boards/arm/b_g474e_dpow1/Kconfig.b_g474e_dpow1 new file mode 100644 index 0000000000000..92bb011b740df --- /dev/null +++ b/boards/arm/b_g474e_dpow1/Kconfig.b_g474e_dpow1 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_B_G474E_DPOW1 + bool + default y + select SOC_SERIES_STM32G4X + select SOC_STM32G474XX diff --git a/boards/arm/b_g474e_dpow1/Kconfig.board b/boards/arm/b_g474e_dpow1/Kconfig.board deleted file mode 100644 index 405ce71cb7bb4..0000000000000 --- a/boards/arm/b_g474e_dpow1/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# B-G474E-DPOW1 Discovery board configuration - -# Copyright 2022 The Chromium OS Authors -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_B_G474E_DPOW1 - bool "B-G474E-DPOW1 Discovery Board" - depends on SOC_STM32G474XX diff --git a/boards/arm/b_g474e_dpow1/Kconfig.defconfig b/boards/arm/b_g474e_dpow1/Kconfig.defconfig deleted file mode 100644 index 88bcf76952804..0000000000000 --- a/boards/arm/b_g474e_dpow1/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# B-G474E-DPOW1 Discovery board configuration - -# Copyright 2022 The Chromium OS Authors -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_B_G474E_DPOW1 - -config BOARD - default "b_g474e_bpow1" - -endif # BOARD_B_G474E_DPOW1 diff --git a/boards/arm/b_g474e_dpow1/b_g474e_dpow1_defconfig b/boards/arm/b_g474e_dpow1/b_g474e_dpow1_defconfig index 6e0659f281d7c..4cd4a0c3e1954 100644 --- a/boards/arm/b_g474e_dpow1/b_g474e_dpow1_defconfig +++ b/boards/arm/b_g474e_dpow1/b_g474e_dpow1_defconfig @@ -2,8 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32G4X=y -CONFIG_SOC_STM32G474XX=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/b_l072z_lrwan1/Kconfig.b_l072z_lrwan1 b/boards/arm/b_l072z_lrwan1/Kconfig.b_l072z_lrwan1 new file mode 100644 index 0000000000000..15f6ebaeb4fe6 --- /dev/null +++ b/boards/arm/b_l072z_lrwan1/Kconfig.b_l072z_lrwan1 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_B_L072Z_LRWAN1 + bool + default y + select SOC_SERIES_STM32L0X + select SOC_STM32L072XX diff --git a/boards/arm/b_l072z_lrwan1/Kconfig.board b/boards/arm/b_l072z_lrwan1/Kconfig.board deleted file mode 100644 index 27f6dfe2bd2ef..0000000000000 --- a/boards/arm/b_l072z_lrwan1/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STMicroelectronics B-L072Z-LRWAN1 Discovery board configuration - -# Copyright (c) 2018 Aleksandr Makarov -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_B_L072Z_LRWAN1 - bool "STMicroelectronics B-L072Z-LRWAN1 Discovery kit" - depends on SOC_STM32L072XX diff --git a/boards/arm/b_l072z_lrwan1/Kconfig.defconfig b/boards/arm/b_l072z_lrwan1/Kconfig.defconfig index 559372d955651..43c3d7083a6b7 100644 --- a/boards/arm/b_l072z_lrwan1/Kconfig.defconfig +++ b/boards/arm/b_l072z_lrwan1/Kconfig.defconfig @@ -3,14 +3,8 @@ # Copyright (c) 2018 Aleksandr Makarov # SPDX-License-Identifier: Apache-2.0 -if BOARD_B_L072Z_LRWAN1 - -config BOARD - default "b_l072z_lrwan1" - choice COUNTER_RTC_STM32_CLOCK_SRC default COUNTER_RTC_STM32_CLOCK_LSE depends on COUNTER -endchoice # COUNTER_RTC_STM32_CLOCK_SRC -endif # BOARD_B_L072Z_LRWAN1 +endchoice # COUNTER_RTC_STM32_CLOCK_SRC diff --git a/boards/arm/b_l072z_lrwan1/b_l072z_lrwan1_defconfig b/boards/arm/b_l072z_lrwan1/b_l072z_lrwan1_defconfig index cd14c09d3a645..8f7e9b0af9a07 100644 --- a/boards/arm/b_l072z_lrwan1/b_l072z_lrwan1_defconfig +++ b/boards/arm/b_l072z_lrwan1/b_l072z_lrwan1_defconfig @@ -1,11 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32L0X=y # Platform Configuration -CONFIG_SOC_STM32L072XX=y -CONFIG_BOARD_B_L072Z_LRWAN1=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/b_l4s5i_iot01a/Kconfig.b_l4s5i_iot01a b/boards/arm/b_l4s5i_iot01a/Kconfig.b_l4s5i_iot01a new file mode 100644 index 0000000000000..719aa1ad6599c --- /dev/null +++ b/boards/arm/b_l4s5i_iot01a/Kconfig.b_l4s5i_iot01a @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_B_L4S5I_IOT01A + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L4S5XX diff --git a/boards/arm/b_l4s5i_iot01a/Kconfig.board b/boards/arm/b_l4s5i_iot01a/Kconfig.board deleted file mode 100644 index 927b683f71e18..0000000000000 --- a/boards/arm/b_l4s5i_iot01a/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# B_L4S5I_IOT01A discovery kit configuration - -# Copyright (c) 2020 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_B_L4S5I_IOT01A - bool "STM32L4S5I IOT Discovery kit" - depends on SOC_STM32L4S5XX diff --git a/boards/arm/b_l4s5i_iot01a/Kconfig.defconfig b/boards/arm/b_l4s5i_iot01a/Kconfig.defconfig index 61d4c1167ad7e..af5b380b04dff 100644 --- a/boards/arm/b_l4s5i_iot01a/Kconfig.defconfig +++ b/boards/arm/b_l4s5i_iot01a/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2020 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 -if BOARD_B_L4S5I_IOT01A - -config BOARD - default "b_l4s5i_iot01a" - config SPI_STM32_INTERRUPT default y depends on SPI @@ -46,5 +41,3 @@ config BT_HCI_VS_EXT default n endif # BT - -endif # BOARD_B_L4S5I_IOT01A diff --git a/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a_defconfig b/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a_defconfig index 981dd5f1670d9..223a6f3def9a7 100644 --- a/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a_defconfig +++ b/boards/arm/b_l4s5i_iot01a/b_l4s5i_iot01a_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L4S5XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/b_u585i_iot02a/Kconfig.b_u585i_iot02a b/boards/arm/b_u585i_iot02a/Kconfig.b_u585i_iot02a new file mode 100644 index 0000000000000..a2cf9adeaafa3 --- /dev/null +++ b/boards/arm/b_u585i_iot02a/Kconfig.b_u585i_iot02a @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_B_U585I_IOT02A + bool + default y + select SOC_SERIES_STM32U5X + select SOC_STM32U585XX diff --git a/boards/arm/b_u585i_iot02a/Kconfig.b_u585i_iot02a_ns b/boards/arm/b_u585i_iot02a/Kconfig.b_u585i_iot02a_ns new file mode 100644 index 0000000000000..a07bced148533 --- /dev/null +++ b/boards/arm/b_u585i_iot02a/Kconfig.b_u585i_iot02a_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_B_U585I_IOT02A_NS + bool + default y + select SOC_SERIES_STM32U5X + select SOC_STM32U585XX diff --git a/boards/arm/b_u585i_iot02a/Kconfig.board b/boards/arm/b_u585i_iot02a/Kconfig.board deleted file mode 100644 index 2ef452a9fa501..0000000000000 --- a/boards/arm/b_u585i_iot02a/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# B_U585I_IOT02A discovery kit configuration - -# Copyright (c) 2021 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_B_U585I_IOT02A - bool "STM32U585I IOT Discovery kit" - depends on SOC_STM32U585XX diff --git a/boards/arm/b_u585i_iot02a/Kconfig.defconfig b/boards/arm/b_u585i_iot02a/Kconfig.defconfig index 93748d0dcf2af..d08dc3c7225ef 100644 --- a/boards/arm/b_u585i_iot02a/Kconfig.defconfig +++ b/boards/arm/b_u585i_iot02a/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2021 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 -if BOARD_B_U585I_IOT02A - -config BOARD - default "b_u585i_iot02a" - config SPI_STM32_INTERRUPT default y depends on SPI @@ -19,5 +14,3 @@ config USE_DT_CODE_PARTITION # LPTIM clocked by LSE, force tick freq to 4096 for tick accuracy config SYS_CLOCK_TICKS_PER_SEC default 4096 if STM32_LPTIM_TIMER - -endif # BOARD_B_U585I_IOT02A diff --git a/boards/arm/b_u585i_iot02a/b_u585i_iot02a_defconfig b/boards/arm/b_u585i_iot02a/b_u585i_iot02a_defconfig index c034f717771cd..223a6f3def9a7 100644 --- a/boards/arm/b_u585i_iot02a/b_u585i_iot02a_defconfig +++ b/boards/arm/b_u585i_iot02a/b_u585i_iot02a_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32U5X=y -CONFIG_SOC_STM32U585XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/b_u585i_iot02a/b_u585i_iot02a_ns_defconfig b/boards/arm/b_u585i_iot02a/b_u585i_iot02a_ns_defconfig index 4b6f6ba7f5c53..d78220abb7271 100644 --- a/boards/arm/b_u585i_iot02a/b_u585i_iot02a_ns_defconfig +++ b/boards/arm/b_u585i_iot02a/b_u585i_iot02a_ns_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32U5X=y -CONFIG_SOC_STM32U585XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/bbc_microbit/Kconfig.bbc_microbit b/boards/arm/bbc_microbit/Kconfig.bbc_microbit new file mode 100644 index 0000000000000..a5819e3fbc55b --- /dev/null +++ b/boards/arm/bbc_microbit/Kconfig.bbc_microbit @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BBC_MICROBIT + bool + default y + select SOC_SERIES_NRF51X + select SOC_NRF51822_QFAA diff --git a/boards/arm/bbc_microbit/Kconfig.board b/boards/arm/bbc_microbit/Kconfig.board deleted file mode 100644 index 758673ff32c3b..0000000000000 --- a/boards/arm/bbc_microbit/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF51 BBC_MICROBIT board configuration - -# Copyright (c) 2016 Nordic Semiconductor ASA. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BBC_MICROBIT - bool "BBC MICRO:BIT" - depends on SOC_NRF51822_QFAA diff --git a/boards/arm/bbc_microbit/Kconfig.defconfig b/boards/arm/bbc_microbit/Kconfig.defconfig index 5bf0c28c9cfd1..d78baf155b906 100644 --- a/boards/arm/bbc_microbit/Kconfig.defconfig +++ b/boards/arm/bbc_microbit/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_BBC_MICROBIT - -config BOARD - default "bbc_microbit" - config BT_CTLR default BT @@ -21,5 +16,3 @@ choice FXOS8700_MODE endchoice endif # FXOS8700 - -endif # BOARD_BBC_MICROBIT diff --git a/boards/arm/bbc_microbit/bbc_microbit_defconfig b/boards/arm/bbc_microbit/bbc_microbit_defconfig index ba34da254e7e4..3986d9b742036 100644 --- a/boards/arm/bbc_microbit/bbc_microbit_defconfig +++ b/boards/arm/bbc_microbit/bbc_microbit_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF51X=y -CONFIG_SOC_NRF51822_QFAA=y -CONFIG_BOARD_BBC_MICROBIT=y # enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/bbc_microbit_v2/Kconfig.bbc_microbit_v2 b/boards/arm/bbc_microbit_v2/Kconfig.bbc_microbit_v2 new file mode 100644 index 0000000000000..e574fb99feedd --- /dev/null +++ b/boards/arm/bbc_microbit_v2/Kconfig.bbc_microbit_v2 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BBC_MICROBIT_V2 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52833_QIAA diff --git a/boards/arm/bbc_microbit_v2/Kconfig.board b/boards/arm/bbc_microbit_v2/Kconfig.board deleted file mode 100644 index 8a4457c0d4538..0000000000000 --- a/boards/arm/bbc_microbit_v2/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52 BBC_MICROBIT_V2 board configuration - -# Copyright (c) 2020 Lingao Meng -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BBC_MICROBIT_V2 - bool "BBC MICRO:BIT_V2" - depends on SOC_NRF52833_QIAA diff --git a/boards/arm/bbc_microbit_v2/Kconfig.defconfig b/boards/arm/bbc_microbit_v2/Kconfig.defconfig index 4e1288c17d1d7..ba1ed029c4643 100644 --- a/boards/arm/bbc_microbit_v2/Kconfig.defconfig +++ b/boards/arm/bbc_microbit_v2/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2020 Lingao Meng # SPDX-License-Identifier: Apache-2.0 -if BOARD_BBC_MICROBIT_V2 - -config BOARD - default "bbc_microbit_v2" - config BT_CTLR default BT - -endif # BOARD_BBC_MICROBIT_V2 diff --git a/boards/arm/bbc_microbit_v2/bbc_microbit_v2_defconfig b/boards/arm/bbc_microbit_v2/bbc_microbit_v2_defconfig index 970aabdd1fb4d..3986d9b742036 100644 --- a/boards/arm/bbc_microbit_v2/bbc_microbit_v2_defconfig +++ b/boards/arm/bbc_microbit_v2/bbc_microbit_v2_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52833_QIAA=y -CONFIG_BOARD_BBC_MICROBIT_V2=y # enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/bcm958401m2/Kconfig.bcm958401m2 b/boards/arm/bcm958401m2/Kconfig.bcm958401m2 new file mode 100644 index 0000000000000..99885c153a594 --- /dev/null +++ b/boards/arm/bcm958401m2/Kconfig.bcm958401m2 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BCM958401M2 + bool + default y + select SOC_SERIES_VALKYRIE + select SOC_BCM58400 diff --git a/boards/arm/bcm958401m2/Kconfig.board b/boards/arm/bcm958401m2/Kconfig.board deleted file mode 100644 index d7545481fc80f..0000000000000 --- a/boards/arm/bcm958401m2/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright 2020 Broadcom. -# - -config BOARD_VALKYRIE_BCM958401M2 - bool "Broadcom Valkyrie BCM958401M2" - depends on SOC_BCM58400 diff --git a/boards/arm/bcm958401m2/Kconfig.defconfig b/boards/arm/bcm958401m2/Kconfig.defconfig deleted file mode 100644 index 87f3c72e589b3..0000000000000 --- a/boards/arm/bcm958401m2/Kconfig.defconfig +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright 2020 Broadcom. - -config BOARD - default "bcm958401m2" - depends on BOARD_VALKYRIE_BCM958401M2 diff --git a/boards/arm/bcm958401m2/bcm958401m2_defconfig b/boards/arm/bcm958401m2/bcm958401m2_defconfig index bba050319cdbf..cc0d8af5baac5 100644 --- a/boards/arm/bcm958401m2/bcm958401m2_defconfig +++ b/boards/arm/bcm958401m2/bcm958401m2_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_VALKYRIE=y -CONFIG_SOC_BCM58400=y -CONFIG_BOARD_VALKYRIE_BCM958401M2=y CONFIG_XIP=n CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/boards/arm/bcm958402m2_m7/Kconfig.bcm958402m2_m7 b/boards/arm/bcm958402m2_m7/Kconfig.bcm958402m2_m7 new file mode 100644 index 0000000000000..2c667d15fe15f --- /dev/null +++ b/boards/arm/bcm958402m2_m7/Kconfig.bcm958402m2_m7 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BCM958402M2_M7 + bool + default y + select SOC_SERIES_VIPER + select SOC_BCM58402_M7 diff --git a/boards/arm/bcm958402m2_m7/Kconfig.board b/boards/arm/bcm958402m2_m7/Kconfig.board deleted file mode 100644 index ad1491abea897..0000000000000 --- a/boards/arm/bcm958402m2_m7/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2020 Broadcom -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BCM958402M2_M7 - bool "Broadcom Viper BCM958402M2_M7" - depends on SOC_BCM58402_M7 diff --git a/boards/arm/bcm958402m2_m7/Kconfig.defconfig b/boards/arm/bcm958402m2_m7/Kconfig.defconfig deleted file mode 100644 index ce3b9eec627bd..0000000000000 --- a/boards/arm/bcm958402m2_m7/Kconfig.defconfig +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2020 Broadcom -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "bcm958402m2_m7" - depends on BOARD_BCM958402M2_M7 diff --git a/boards/arm/bcm958402m2_m7/bcm958402m2_m7_defconfig b/boards/arm/bcm958402m2_m7/bcm958402m2_m7_defconfig index 19d83a9afd6d4..3f1da4910d711 100644 --- a/boards/arm/bcm958402m2_m7/bcm958402m2_m7_defconfig +++ b/boards/arm/bcm958402m2_m7/bcm958402m2_m7_defconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # Platform Configuration -CONFIG_SOC_SERIES_VIPER=y -CONFIG_SOC_BCM58402_M7=y -CONFIG_BOARD_BCM958402M2_M7=y # Zephyr Kernel Configuration CONFIG_XIP=n diff --git a/boards/arm/bl5340_dvk/Kconfig.bl5340_dvk_cpuapp b/boards/arm/bl5340_dvk/Kconfig.bl5340_dvk_cpuapp new file mode 100644 index 0000000000000..41280a58c3e3c --- /dev/null +++ b/boards/arm/bl5340_dvk/Kconfig.bl5340_dvk_cpuapp @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BL5340_DVK_CPUAPP + bool + default y + select SOC_SERIES_NRF53X + select SOC_NRF5340_CPUAPP_QKAA diff --git a/boards/arm/bl5340_dvk/Kconfig.bl5340_dvk_cpuapp_ns b/boards/arm/bl5340_dvk/Kconfig.bl5340_dvk_cpuapp_ns new file mode 100644 index 0000000000000..bf9e5ba655779 --- /dev/null +++ b/boards/arm/bl5340_dvk/Kconfig.bl5340_dvk_cpuapp_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BL5340_DVK_CPUAPP_NS + bool + default y + select SOC_SERIES_NRF53X + select SOC_NRF5340_CPUAPP_QKAA diff --git a/boards/arm/bl5340_dvk/Kconfig.bl5340_dvk_cpunet b/boards/arm/bl5340_dvk/Kconfig.bl5340_dvk_cpunet new file mode 100644 index 0000000000000..b4e5cf3913db8 --- /dev/null +++ b/boards/arm/bl5340_dvk/Kconfig.bl5340_dvk_cpunet @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BL5340_DVK_CPUNET + bool + default y + select SOC_SERIES_NRF53X + select SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/bl5340_dvk/Kconfig.board b/boards/arm/bl5340_dvk/Kconfig.board deleted file mode 100644 index b969ee535fa97..0000000000000 --- a/boards/arm/bl5340_dvk/Kconfig.board +++ /dev/null @@ -1,18 +0,0 @@ -# BL5340-DVK board configuration - -# Copyright (c) 2021 Laird Connectivity -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF5340_CPUAPP_QKAA - -config BOARD_BL5340_DVK_CPUAPP - bool "BL5340-DVK (nRF5340) Application MCU" - -config BOARD_BL5340_DVK_CPUAPP_NS - bool "BL5340-DVK (nRF5340) Application MCU non-secure" - -endif # SOC_NRF5340_CPUAPP_QKAA - -config BOARD_BL5340_DVK_CPUNET - bool "BL5340-DVK (nRF5340) Network MCU" - depends on SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/bl5340_dvk/Kconfig.defconfig b/boards/arm/bl5340_dvk/Kconfig.defconfig index 80a1869f41ce3..ed65d0bb31571 100644 --- a/boards/arm/bl5340_dvk/Kconfig.defconfig +++ b/boards/arm/bl5340_dvk/Kconfig.defconfig @@ -6,10 +6,6 @@ if BOARD_BL5340_DVK_CPUAPP || BOARD_BL5340_DVK_CPUAPP_NS -config BOARD - default "bl5340_dvk_cpuapp" if BOARD_BL5340_DVK_CPUAPP || BOARD_BL5340_DVK_CPUAPP_NS - - config FLASH default y @@ -91,6 +87,3 @@ config I2C default $(dt_compat_on_bus,$(DT_COMPAT_TI_TCA9538),i2c) endif # BOARD_BL5340_DVK_CPUAPP || BOARD_BL5340_DVK_CPUAPP_NS - -config BOARD - default "bl5340_dvk_cpunet" if BOARD_BL5340_DVK_CPUNET diff --git a/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_defconfig b/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_defconfig index 4a616deb776f9..fbd41e3118efd 100644 --- a/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_defconfig +++ b/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_BL5340_DVK_CPUAPP=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_ns_defconfig b/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_ns_defconfig index 5e42dce833a49..ba5f4810ab10d 100644 --- a/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_ns_defconfig +++ b/boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_ns_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_BL5340_DVK_CPUAPP_NS=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/bl5340_dvk/bl5340_dvk_cpunet_defconfig b/boards/arm/bl5340_dvk/bl5340_dvk_cpunet_defconfig index 4f5929b9790f2..0cbf789d17407 100644 --- a/boards/arm/bl5340_dvk/bl5340_dvk_cpunet_defconfig +++ b/boards/arm/bl5340_dvk/bl5340_dvk_cpunet_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUNET_QKAA=y -CONFIG_BOARD_BL5340_DVK_CPUNET=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/bl652_dvk/Kconfig.bl652_dvk b/boards/arm/bl652_dvk/Kconfig.bl652_dvk new file mode 100644 index 0000000000000..2aa825eb848b7 --- /dev/null +++ b/boards/arm/bl652_dvk/Kconfig.bl652_dvk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BL652_DVK + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/bl652_dvk/Kconfig.board b/boards/arm/bl652_dvk/Kconfig.board deleted file mode 100644 index e5c2bf8bd4c09..0000000000000 --- a/boards/arm/bl652_dvk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# BL652 DVK board configuration - -# Copyright (c) 2019 Laird Connectivity -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BL652_DVK - bool "BL652 DVK" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/bl652_dvk/Kconfig.defconfig b/boards/arm/bl652_dvk/Kconfig.defconfig index 56dbfebfca9b8..90d73167bdc14 100644 --- a/boards/arm/bl652_dvk/Kconfig.defconfig +++ b/boards/arm/bl652_dvk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2019 Laird Connectivity # SPDX-License-Identifier: Apache-2.0 -if BOARD_BL652_DVK - -config BOARD - default "bl652_dvk" - config BT_CTLR default BT @@ -17,5 +12,3 @@ config I2C default y endif # DAC - -endif # BOARD_BL652_DVK diff --git a/boards/arm/bl652_dvk/bl652_dvk_defconfig b/boards/arm/bl652_dvk/bl652_dvk_defconfig index 1ca971e25468e..20d5b399654b2 100644 --- a/boards/arm/bl652_dvk/bl652_dvk_defconfig +++ b/boards/arm/bl652_dvk/bl652_dvk_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_BL652_DVK=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/bl653_dvk/Kconfig.bl653_dvk b/boards/arm/bl653_dvk/Kconfig.bl653_dvk new file mode 100644 index 0000000000000..cb74394cd47d2 --- /dev/null +++ b/boards/arm/bl653_dvk/Kconfig.bl653_dvk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BL653_DVK + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52833_QIAA diff --git a/boards/arm/bl653_dvk/Kconfig.board b/boards/arm/bl653_dvk/Kconfig.board deleted file mode 100644 index 4a6ca61c3e6ac..0000000000000 --- a/boards/arm/bl653_dvk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# BL653 DVK board configuration - -# Copyright (c) 2020 Laird Connectivity -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BL653_DVK - bool "BL653 DVK" - depends on SOC_NRF52833_QIAA diff --git a/boards/arm/bl653_dvk/Kconfig.defconfig b/boards/arm/bl653_dvk/Kconfig.defconfig index e4f82f99c33d2..56afc580fee22 100644 --- a/boards/arm/bl653_dvk/Kconfig.defconfig +++ b/boards/arm/bl653_dvk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2020 Laird Connectivity # SPDX-License-Identifier: Apache-2.0 -if BOARD_BL653_DVK - -config BOARD - default "bl653_dvk" - config BT_CTLR default BT @@ -17,5 +12,3 @@ config I2C default y endif # DAC - -endif # BOARD_BL653_DVK diff --git a/boards/arm/bl653_dvk/bl653_dvk_defconfig b/boards/arm/bl653_dvk/bl653_dvk_defconfig index 4933055c93c44..4515c638f6070 100644 --- a/boards/arm/bl653_dvk/bl653_dvk_defconfig +++ b/boards/arm/bl653_dvk/bl653_dvk_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52833_QIAA=y -CONFIG_BOARD_BL653_DVK=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/bl654_dvk/Kconfig.bl654_dvk b/boards/arm/bl654_dvk/Kconfig.bl654_dvk new file mode 100644 index 0000000000000..542f365322645 --- /dev/null +++ b/boards/arm/bl654_dvk/Kconfig.bl654_dvk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BL654_DVK + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/bl654_dvk/Kconfig.board b/boards/arm/bl654_dvk/Kconfig.board deleted file mode 100644 index 4c666d5aabafc..0000000000000 --- a/boards/arm/bl654_dvk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# BL654 DVK board configuration - -# Copyright (c) 2019 Laird Connectivity -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BL654_DVK - bool "BL654 DVK" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/bl654_dvk/Kconfig.defconfig b/boards/arm/bl654_dvk/Kconfig.defconfig index 53bf523868754..54e05983d2070 100644 --- a/boards/arm/bl654_dvk/Kconfig.defconfig +++ b/boards/arm/bl654_dvk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2019 Laird Connectivity # SPDX-License-Identifier: Apache-2.0 -if BOARD_BL654_DVK - -config BOARD - default "bl654_dvk" - config BT_CTLR default BT @@ -17,5 +12,3 @@ config I2C default y endif # DAC - -endif # BOARD_BL654_DVK diff --git a/boards/arm/bl654_dvk/bl654_dvk_defconfig b/boards/arm/bl654_dvk/bl654_dvk_defconfig index aa2238cda87de..20d5b399654b2 100644 --- a/boards/arm/bl654_dvk/bl654_dvk_defconfig +++ b/boards/arm/bl654_dvk/bl654_dvk_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_BL654_DVK=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/bl654_sensor_board/Kconfig.bl654_sensor_board b/boards/arm/bl654_sensor_board/Kconfig.bl654_sensor_board new file mode 100644 index 0000000000000..9d5b3a64f3469 --- /dev/null +++ b/boards/arm/bl654_sensor_board/Kconfig.bl654_sensor_board @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BL654_SENSOR_BOARD + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/bl654_sensor_board/Kconfig.board b/boards/arm/bl654_sensor_board/Kconfig.board deleted file mode 100644 index 6e68f886c436e..0000000000000 --- a/boards/arm/bl654_sensor_board/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# BL654 Sensor Board configuration - -# Copyright (c) 2021 Laird Connectivity -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BL654_SENSOR_BOARD - bool "BL654 Sensor Board" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/bl654_sensor_board/Kconfig.defconfig b/boards/arm/bl654_sensor_board/Kconfig.defconfig index 4ca294e899069..85910de600171 100644 --- a/boards/arm/bl654_sensor_board/Kconfig.defconfig +++ b/boards/arm/bl654_sensor_board/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2021 Laird Connectivity # SPDX-License-Identifier: Apache-2.0 -if BOARD_BL654_SENSOR_BOARD - -config BOARD - default "bl654_sensor_board" - config BT_CTLR default BT - -endif # BOARD_BL654_SENSOR_BOARD diff --git a/boards/arm/bl654_sensor_board/bl654_sensor_board_defconfig b/boards/arm/bl654_sensor_board/bl654_sensor_board_defconfig index 259fac9d3090a..4925a1e5024dc 100644 --- a/boards/arm/bl654_sensor_board/bl654_sensor_board_defconfig +++ b/boards/arm/bl654_sensor_board/bl654_sensor_board_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_BL654_SENSOR_BOARD=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/bl654_usb/Kconfig.bl654_usb b/boards/arm/bl654_usb/Kconfig.bl654_usb new file mode 100644 index 0000000000000..b7d3155453678 --- /dev/null +++ b/boards/arm/bl654_usb/Kconfig.bl654_usb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BL654_USB + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/bl654_usb/Kconfig.board b/boards/arm/bl654_usb/Kconfig.board deleted file mode 100644 index 49f4dc67fad1b..0000000000000 --- a/boards/arm/bl654_usb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# BL654 USB adapter board configuration - -# Copyright (c) 2021 Laird Connectivity -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BL654_USB - bool "BL654 USB" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/bl654_usb/Kconfig.defconfig b/boards/arm/bl654_usb/Kconfig.defconfig index 45dc5022dde30..8cab7aee5f493 100644 --- a/boards/arm/bl654_usb/Kconfig.defconfig +++ b/boards/arm/bl654_usb/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2021-2022 Laird Connectivity # SPDX-License-Identifier: Apache-2.0 -if BOARD_BL654_USB - -config BOARD - default "bl654_usb" - # To let the nRF5 bootloader load an application, the application # must be linked after Nordic MBR, that is factory-programmed on the board. @@ -46,5 +41,3 @@ endif #BL654_USB_SERIAL_BACKEND_CDCACM config BT_CTLR default BT - -endif # BOARD_BL654_USB diff --git a/boards/arm/bl654_usb/bl654_usb_defconfig b/boards/arm/bl654_usb/bl654_usb_defconfig index 59c26ddb4d7f0..6d92f7c3d5663 100644 --- a/boards/arm/bl654_usb/bl654_usb_defconfig +++ b/boards/arm/bl654_usb/bl654_usb_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_BL654_USB=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/black_f407ve/Kconfig.black_f407ve b/boards/arm/black_f407ve/Kconfig.black_f407ve new file mode 100644 index 0000000000000..bdd4868e68816 --- /dev/null +++ b/boards/arm/black_f407ve/Kconfig.black_f407ve @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BLACK_F407VE + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F407XE diff --git a/boards/arm/black_f407ve/Kconfig.board b/boards/arm/black_f407ve/Kconfig.board deleted file mode 100644 index c4711fb2c49c6..0000000000000 --- a/boards/arm/black_f407ve/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# black_f407ve board configuration - -# Copyright (c) 2020 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BLACK_F407VE - bool "Black F407VE Development Board" - depends on SOC_STM32F407XE diff --git a/boards/arm/black_f407ve/Kconfig.defconfig b/boards/arm/black_f407ve/Kconfig.defconfig index ebc572bea3992..8f70025f4c605 100644 --- a/boards/arm/black_f407ve/Kconfig.defconfig +++ b/boards/arm/black_f407ve/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2020 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -if BOARD_BLACK_F407VE - -config BOARD - default "black_f407ve" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_BLACK_F407VE diff --git a/boards/arm/black_f407ve/black_f407ve_defconfig b/boards/arm/black_f407ve/black_f407ve_defconfig index 03fd48b107248..b07f9176b31a6 100644 --- a/boards/arm/black_f407ve/black_f407ve_defconfig +++ b/boards/arm/black_f407ve/black_f407ve_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F407XE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/black_f407zg_pro/Kconfig.black_f407zg_pro b/boards/arm/black_f407zg_pro/Kconfig.black_f407zg_pro new file mode 100644 index 0000000000000..7db8773eb3024 --- /dev/null +++ b/boards/arm/black_f407zg_pro/Kconfig.black_f407zg_pro @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BLACK_F407ZG_PRO + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F407XG diff --git a/boards/arm/black_f407zg_pro/Kconfig.board b/boards/arm/black_f407zg_pro/Kconfig.board deleted file mode 100644 index 8322175e4ba63..0000000000000 --- a/boards/arm/black_f407zg_pro/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# black_f407zg board configuration - -# Copyright (c) 2020 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BLACK_F407ZG_PRO - bool "Black F407ZG Pro Development Board" - depends on SOC_STM32F407XG diff --git a/boards/arm/black_f407zg_pro/Kconfig.defconfig b/boards/arm/black_f407zg_pro/Kconfig.defconfig index bdfcf3314431f..6e8ac9001b220 100644 --- a/boards/arm/black_f407zg_pro/Kconfig.defconfig +++ b/boards/arm/black_f407zg_pro/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2020 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -if BOARD_BLACK_F407ZG_PRO - -config BOARD - default "black_f407zg_pro" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_BLACK_F407ZG_PRO diff --git a/boards/arm/black_f407zg_pro/black_f407zg_pro_defconfig b/boards/arm/black_f407zg_pro/black_f407zg_pro_defconfig index 3e74a5e5885fa..b07f9176b31a6 100644 --- a/boards/arm/black_f407zg_pro/black_f407zg_pro_defconfig +++ b/boards/arm/black_f407zg_pro/black_f407zg_pro_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F407XG=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/blackpill_f401cc/Kconfig.blackpill_f401cc b/boards/arm/blackpill_f401cc/Kconfig.blackpill_f401cc new file mode 100644 index 0000000000000..d6a5db0d08a7f --- /dev/null +++ b/boards/arm/blackpill_f401cc/Kconfig.blackpill_f401cc @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BLACKPILL_F401CC + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F401XC diff --git a/boards/arm/blackpill_f401cc/Kconfig.board b/boards/arm/blackpill_f401cc/Kconfig.board deleted file mode 100644 index cb4004e248a8e..0000000000000 --- a/boards/arm/blackpill_f401cc/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2022 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -# STM32F401CC based Black Pill V3.0+ board configuration - -config BOARD_BLACKPILL_F401CC - bool "WeAct Studio Black Pill V3.0+ Board" - depends on SOC_STM32F401XC diff --git a/boards/arm/blackpill_f401cc/Kconfig.defconfig b/boards/arm/blackpill_f401cc/Kconfig.defconfig index fb31f4eff61eb..e7423e8c6abc2 100644 --- a/boards/arm/blackpill_f401cc/Kconfig.defconfig +++ b/boards/arm/blackpill_f401cc/Kconfig.defconfig @@ -3,13 +3,6 @@ # F401CE based Black Pill V3.0+ board board configuration -if BOARD_BLACKPILL_F401CC - -config BOARD - default "blackpill_f401cc" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_BLACKPILL_F401CC diff --git a/boards/arm/blackpill_f401cc/blackpill_f401cc_defconfig b/boards/arm/blackpill_f401cc/blackpill_f401cc_defconfig index 416cdff51e6ff..9df1de4c3b1a6 100644 --- a/boards/arm/blackpill_f401cc/blackpill_f401cc_defconfig +++ b/boards/arm/blackpill_f401cc/blackpill_f401cc_defconfig @@ -1,8 +1,6 @@ # Copyright (c) 2022 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F401XC=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/blackpill_f401ce/Kconfig.blackpill_f401ce b/boards/arm/blackpill_f401ce/Kconfig.blackpill_f401ce new file mode 100644 index 0000000000000..b5c518d86efde --- /dev/null +++ b/boards/arm/blackpill_f401ce/Kconfig.blackpill_f401ce @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BLACKPILL_F401CE + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F401XE diff --git a/boards/arm/blackpill_f401ce/Kconfig.board b/boards/arm/blackpill_f401ce/Kconfig.board deleted file mode 100644 index 666a12a157d60..0000000000000 --- a/boards/arm/blackpill_f401ce/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2020 Kalyan Sriram -# SPDX-License-Identifier: Apache-2.0 - -# STM32F401CE based Black Pill V3.0+ board configuration - -config BOARD_BLACKPILL_F401CE - bool "WeAct Studio Black Pill V3.0+ Board" - depends on SOC_STM32F401XE diff --git a/boards/arm/blackpill_f401ce/Kconfig.defconfig b/boards/arm/blackpill_f401ce/Kconfig.defconfig index 739c5512170ed..aa5c272ce263f 100644 --- a/boards/arm/blackpill_f401ce/Kconfig.defconfig +++ b/boards/arm/blackpill_f401ce/Kconfig.defconfig @@ -3,13 +3,6 @@ # F401CE based Black Pill V3.0+ board board configuration -if BOARD_BLACKPILL_F401CE - -config BOARD - default "blackpill_f401ce" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_BLACKPILL_F401CE diff --git a/boards/arm/blackpill_f401ce/blackpill_f401ce_defconfig b/boards/arm/blackpill_f401ce/blackpill_f401ce_defconfig index e2fdc023a5ba7..a6ae5e04b4313 100644 --- a/boards/arm/blackpill_f401ce/blackpill_f401ce_defconfig +++ b/boards/arm/blackpill_f401ce/blackpill_f401ce_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F401XE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/blackpill_f411ce/Kconfig.blackpill_f411ce b/boards/arm/blackpill_f411ce/Kconfig.blackpill_f411ce new file mode 100644 index 0000000000000..4d8eaa46d6a74 --- /dev/null +++ b/boards/arm/blackpill_f411ce/Kconfig.blackpill_f411ce @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BLACKPILL_F411CE + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F411XE diff --git a/boards/arm/blackpill_f411ce/Kconfig.board b/boards/arm/blackpill_f411ce/Kconfig.board deleted file mode 100644 index c636f2af74a0e..0000000000000 --- a/boards/arm/blackpill_f411ce/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2020 Brian Bradley -# SPDX-License-Identifier: Apache-2.0 - -# STM32F411CE based Black Pill V2.0+ board configuration - -config BOARD_BLACKPILL_F411CE - bool "WeAct Studio Black Pill V2.0+ Board" - depends on SOC_STM32F411XE diff --git a/boards/arm/blackpill_f411ce/Kconfig.defconfig b/boards/arm/blackpill_f411ce/Kconfig.defconfig index e54fc87004e64..00473e03a1bc5 100644 --- a/boards/arm/blackpill_f411ce/Kconfig.defconfig +++ b/boards/arm/blackpill_f411ce/Kconfig.defconfig @@ -3,13 +3,6 @@ # F411CE based Black Pill V2.0+ board board configuration -if BOARD_BLACKPILL_F411CE - -config BOARD - default "blackpill_f411ce" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_BLACKPILL_F411CE diff --git a/boards/arm/blackpill_f411ce/blackpill_f411ce_defconfig b/boards/arm/blackpill_f411ce/blackpill_f411ce_defconfig index 1c1d2d9692591..a6ae5e04b4313 100644 --- a/boards/arm/blackpill_f411ce/blackpill_f411ce_defconfig +++ b/boards/arm/blackpill_f411ce/blackpill_f411ce_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F411XE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/blueclover_plt_demo_v2_nrf52832/Kconfig.blueclover_plt_demo_v2_nrf52832 b/boards/arm/blueclover_plt_demo_v2_nrf52832/Kconfig.blueclover_plt_demo_v2_nrf52832 new file mode 100644 index 0000000000000..1303230682b8a --- /dev/null +++ b/boards/arm/blueclover_plt_demo_v2_nrf52832/Kconfig.blueclover_plt_demo_v2_nrf52832 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BLUECLOVER_PLT_DEMO_V2_NRF52832 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/blueclover_plt_demo_v2_nrf52832/Kconfig.board b/boards/arm/blueclover_plt_demo_v2_nrf52832/Kconfig.board deleted file mode 100644 index a4a2f1fab18da..0000000000000 --- a/boards/arm/blueclover_plt_demo_v2_nrf52832/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Blue Clover PLT Demo V2 Configuration - -# Copyright (c) 2021 Blue Clover -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BLUECLOVER_PLT_DEMO_V2_NRF52832 - bool "Blue Clover PLT Demo Board V2" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/blueclover_plt_demo_v2_nrf52832/Kconfig.defconfig b/boards/arm/blueclover_plt_demo_v2_nrf52832/Kconfig.defconfig index d1d96ca9fb039..387cb49f8888c 100644 --- a/boards/arm/blueclover_plt_demo_v2_nrf52832/Kconfig.defconfig +++ b/boards/arm/blueclover_plt_demo_v2_nrf52832/Kconfig.defconfig @@ -3,15 +3,8 @@ # Copyright (c) 2021 Blue Clover # SPDX-License-Identifier: Apache-2.0 -if BOARD_BLUECLOVER_PLT_DEMO_V2_NRF52832 - -config BOARD - default "blueclover_plt_demo_v2_nrf52832" - config BT_CTLR default BT config I2C default SENSOR - -endif # BOARD_BLUECLOVER_PLT_DEMO_V2_NRF52832 diff --git a/boards/arm/blueclover_plt_demo_v2_nrf52832/blueclover_plt_demo_v2_nrf52832_defconfig b/boards/arm/blueclover_plt_demo_v2_nrf52832/blueclover_plt_demo_v2_nrf52832_defconfig index 52f089ba0d683..8e06c3a410cd3 100644 --- a/boards/arm/blueclover_plt_demo_v2_nrf52832/blueclover_plt_demo_v2_nrf52832_defconfig +++ b/boards/arm/blueclover_plt_demo_v2_nrf52832/blueclover_plt_demo_v2_nrf52832_defconfig @@ -4,9 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_BLUECLOVER_PLT_DEMO_V2_NRF52832=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/bt510/Kconfig.board b/boards/arm/bt510/Kconfig.board deleted file mode 100644 index e1654936f5fab..0000000000000 --- a/boards/arm/bt510/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# BT510 DVK board configuration - -# Copyright (c) 2020 Laird Connectivity -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BT510 - bool "BT510" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/bt510/Kconfig.bt510 b/boards/arm/bt510/Kconfig.bt510 new file mode 100644 index 0000000000000..16c34eb7bb459 --- /dev/null +++ b/boards/arm/bt510/Kconfig.bt510 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BT510 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/bt510/Kconfig.defconfig b/boards/arm/bt510/Kconfig.defconfig index dc622170dd1be..f60e0b4739d8a 100644 --- a/boards/arm/bt510/Kconfig.defconfig +++ b/boards/arm/bt510/Kconfig.defconfig @@ -3,15 +3,8 @@ # Copyright (c) 2020 Laird Connectivity # SPDX-License-Identifier: Apache-2.0 -if BOARD_BT510 - -config BOARD - default "bt510" - config BT_CTLR default BT config I2C default SENSOR - -endif # BOARD_BT510 diff --git a/boards/arm/bt510/bt510_defconfig b/boards/arm/bt510/bt510_defconfig index fd86ea3f0f2b6..da1f8d9b0d4df 100644 --- a/boards/arm/bt510/bt510_defconfig +++ b/boards/arm/bt510/bt510_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_BT510=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/bt610/Kconfig.board b/boards/arm/bt610/Kconfig.board deleted file mode 100644 index cee1953cf3162..0000000000000 --- a/boards/arm/bt610/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# BT610 board configuration - -# Copyright (c) 2021 Laird Connectivity -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BT610 - bool "BT610" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/bt610/Kconfig.bt610 b/boards/arm/bt610/Kconfig.bt610 new file mode 100644 index 0000000000000..40c2341d26f08 --- /dev/null +++ b/boards/arm/bt610/Kconfig.bt610 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BT610 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/bt610/Kconfig.defconfig b/boards/arm/bt610/Kconfig.defconfig index 34620afc27f6f..80e6673a26bce 100644 --- a/boards/arm/bt610/Kconfig.defconfig +++ b/boards/arm/bt610/Kconfig.defconfig @@ -3,15 +3,8 @@ # Copyright (c) 2021 Laird Connectivity # SPDX-License-Identifier: Apache-2.0 -if BOARD_BT610 - -config BOARD - default "bt610" - config BT_CTLR default BT config I2C default $(dt_compat_on_bus,$(DT_COMPAT_TI_TCA9538),i2c) - -endif # BOARD_BT610 diff --git a/boards/arm/bt610/bt610_defconfig b/boards/arm/bt610/bt610_defconfig index 64f0fcb85edd9..de4dc97a686fc 100644 --- a/boards/arm/bt610/bt610_defconfig +++ b/boards/arm/bt610/bt610_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_BT610=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/cc1352r1_launchxl/Kconfig.board b/boards/arm/cc1352r1_launchxl/Kconfig.board deleted file mode 100644 index 3c874a1396284..0000000000000 --- a/boards/arm/cc1352r1_launchxl/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# TI CC1352R LaunchXL board - -# Copyright (c) 2019 Brett Witherspoon -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_CC1352R1_LAUNCHXL - bool "TI CC1352R1 LaunchXL" - depends on SOC_CC1352R diff --git a/boards/arm/cc1352r1_launchxl/Kconfig.cc1352r1_launchxl b/boards/arm/cc1352r1_launchxl/Kconfig.cc1352r1_launchxl new file mode 100644 index 0000000000000..aa592a73ec70e --- /dev/null +++ b/boards/arm/cc1352r1_launchxl/Kconfig.cc1352r1_launchxl @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CC1352R1_LAUNCHXL + bool + default y + select SOC_SERIES_CC13X2_CC26X2 + select SOC_CC1352R diff --git a/boards/arm/cc1352r1_launchxl/Kconfig.defconfig b/boards/arm/cc1352r1_launchxl/Kconfig.defconfig deleted file mode 100644 index 8bee2c9aed2e5..0000000000000 --- a/boards/arm/cc1352r1_launchxl/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# TI CC1352R LaunchXL board - -# Copyright (c) 2019 Brett Witherspoon -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_CC1352R1_LAUNCHXL - -config BOARD - default "cc1352r1_launchxl" - -endif # BOARD_CC1352R1_LAUNCHXL diff --git a/boards/arm/cc1352r1_launchxl/cc1352r1_launchxl_defconfig b/boards/arm/cc1352r1_launchxl/cc1352r1_launchxl_defconfig index 30e755d99f114..872843de16d29 100644 --- a/boards/arm/cc1352r1_launchxl/cc1352r1_launchxl_defconfig +++ b/boards/arm/cc1352r1_launchxl/cc1352r1_launchxl_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_CC13X2_CC26X2=y -CONFIG_SOC_CC1352R=y -CONFIG_BOARD_CC1352R1_LAUNCHXL=y CONFIG_BUILD_OUTPUT_HEX=y CONFIG_CC13X2_CC26X2_BOOTLOADER_ENABLE=y diff --git a/boards/arm/cc1352r_sensortag/Kconfig.board b/boards/arm/cc1352r_sensortag/Kconfig.board deleted file mode 100644 index 6364142ac0b99..0000000000000 --- a/boards/arm/cc1352r_sensortag/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# TI CC1352R SensorTag board - -# Copyright (c) 2019 Brett Witherspoon -# Copyright (c) 2020 Friedt Professional Engineering Services, Inc -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_CC1352R_SENSORTAG - bool "TI CC1352R SensorTag" - depends on SOC_CC1352R diff --git a/boards/arm/cc1352r_sensortag/Kconfig.cc1352r_sensortag b/boards/arm/cc1352r_sensortag/Kconfig.cc1352r_sensortag new file mode 100644 index 0000000000000..045cf9e5cf632 --- /dev/null +++ b/boards/arm/cc1352r_sensortag/Kconfig.cc1352r_sensortag @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CC1352R_SENSORTAG + bool + default y + select SOC_SERIES_CC13X2_CC26X2 + select SOC_CC1352R diff --git a/boards/arm/cc1352r_sensortag/Kconfig.defconfig b/boards/arm/cc1352r_sensortag/Kconfig.defconfig index 41bf913bb990e..8c7ca4784fd04 100644 --- a/boards/arm/cc1352r_sensortag/Kconfig.defconfig +++ b/boards/arm/cc1352r_sensortag/Kconfig.defconfig @@ -4,12 +4,5 @@ # Copyright (c) 2020 Friedt Professional Engineering Services, Inc # SPDX-License-Identifier: Apache-2.0 -if BOARD_CC1352R_SENSORTAG - -config BOARD - default "cc1352r_sensortag" - config SPI default SENSOR - -endif # BOARD_CC1352R_SENSORTAG diff --git a/boards/arm/cc1352r_sensortag/cc1352r_sensortag_defconfig b/boards/arm/cc1352r_sensortag/cc1352r_sensortag_defconfig index 6345d1584962d..d7e8510b8b896 100644 --- a/boards/arm/cc1352r_sensortag/cc1352r_sensortag_defconfig +++ b/boards/arm/cc1352r_sensortag/cc1352r_sensortag_defconfig @@ -5,9 +5,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_CC13X2_CC26X2=y -CONFIG_SOC_CC1352R=y -CONFIG_BOARD_CC1352R_SENSORTAG=y CONFIG_CC13X2_CC26X2_BOOTLOADER_ENABLE=y CONFIG_CC13X2_CC26X2_BOOTLOADER_BACKDOOR_ENABLE=y diff --git a/boards/arm/cc26x2r1_launchxl/Kconfig.board b/boards/arm/cc26x2r1_launchxl/Kconfig.board deleted file mode 100644 index cfc9da276fb2c..0000000000000 --- a/boards/arm/cc26x2r1_launchxl/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# TI CC26x2R1 LaunchXL board - -# Copyright (c) 2019 Brett Witherspoon -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_CC26X2R1_LAUNCHXL - bool "TI CC26x2R1 LaunchXL" - depends on SOC_CC2652R diff --git a/boards/arm/cc26x2r1_launchxl/Kconfig.cc26x2r1_launchxl b/boards/arm/cc26x2r1_launchxl/Kconfig.cc26x2r1_launchxl new file mode 100644 index 0000000000000..c3bf825fb0d17 --- /dev/null +++ b/boards/arm/cc26x2r1_launchxl/Kconfig.cc26x2r1_launchxl @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CC26X2R1_LAUNCHXL + bool + default y + select SOC_SERIES_CC13X2_CC26X2 + select SOC_CC2652R diff --git a/boards/arm/cc26x2r1_launchxl/Kconfig.defconfig b/boards/arm/cc26x2r1_launchxl/Kconfig.defconfig deleted file mode 100644 index 33d6541f47dd7..0000000000000 --- a/boards/arm/cc26x2r1_launchxl/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# TI CC26x2R1 LaunchXL board - -# Copyright (c) 2019 Brett Witherspoon -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_CC26X2R1_LAUNCHXL - -config BOARD - default "cc26x2r1_launchxl" - -endif # BOARD_CC26X2R1_LAUNCHXL diff --git a/boards/arm/cc26x2r1_launchxl/cc26x2r1_launchxl_defconfig b/boards/arm/cc26x2r1_launchxl/cc26x2r1_launchxl_defconfig index 0906e953e163a..d10e7a152e52d 100644 --- a/boards/arm/cc26x2r1_launchxl/cc26x2r1_launchxl_defconfig +++ b/boards/arm/cc26x2r1_launchxl/cc26x2r1_launchxl_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_CC13X2_CC26X2=y -CONFIG_SOC_CC2652R=y -CONFIG_BOARD_CC26X2R1_LAUNCHXL=y CONFIG_BUILD_OUTPUT_HEX=y CONFIG_CC13X2_CC26X2_BOOTLOADER_ENABLE=y diff --git a/boards/arm/cc3220sf_launchxl/Kconfig.board b/boards/arm/cc3220sf_launchxl/Kconfig.board deleted file mode 100644 index c03cae76d6800..0000000000000 --- a/boards/arm/cc3220sf_launchxl/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# TI SimpleLink CC3220SF LaunchXL Board - -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_CC3220SF_LAUNCHXL - bool "TI CC3220SF LAUNCHXL" - depends on SOC_CC3220SF diff --git a/boards/arm/cc3220sf_launchxl/Kconfig.cc3220sf_launchxl b/boards/arm/cc3220sf_launchxl/Kconfig.cc3220sf_launchxl new file mode 100644 index 0000000000000..83f070ae6acf0 --- /dev/null +++ b/boards/arm/cc3220sf_launchxl/Kconfig.cc3220sf_launchxl @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CC3220SF_LAUNCHXL + bool + default y + select SOC_SERIES_CC32XX + select SOC_CC3220SF diff --git a/boards/arm/cc3220sf_launchxl/Kconfig.defconfig b/boards/arm/cc3220sf_launchxl/Kconfig.defconfig deleted file mode 100644 index 2b2f801ed6878..0000000000000 --- a/boards/arm/cc3220sf_launchxl/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# TI CC3220SF LaunchXL board configuration - -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_CC3220SF_LAUNCHXL - -config BOARD - default "cc3220sf_launchxl" - -endif # BOARD_CC3220SF_LAUNCHXL diff --git a/boards/arm/cc3220sf_launchxl/cc3220sf_launchxl_defconfig b/boards/arm/cc3220sf_launchxl/cc3220sf_launchxl_defconfig index ac49971fa1457..b7f0c47ce1b8d 100644 --- a/boards/arm/cc3220sf_launchxl/cc3220sf_launchxl_defconfig +++ b/boards/arm/cc3220sf_launchxl/cc3220sf_launchxl_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_CC3220SF_LAUNCHXL=y -CONFIG_SOC_SERIES_CC32XX=y -CONFIG_SOC_CC3220SF=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/arm/cc3235sf_launchxl/Kconfig.board b/boards/arm/cc3235sf_launchxl/Kconfig.board deleted file mode 100644 index b119bc1745645..0000000000000 --- a/boards/arm/cc3235sf_launchxl/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# TI SimpleLink CC3235SF LaunchXL Board - -# Copyright (c) 2019, Texas Instruments Incorporated -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_CC3235SF_LAUNCHXL - bool "TI CC3235SF LAUNCHXL" - depends on SOC_CC3235SF diff --git a/boards/arm/cc3235sf_launchxl/Kconfig.cc3235sf_launchxl b/boards/arm/cc3235sf_launchxl/Kconfig.cc3235sf_launchxl new file mode 100644 index 0000000000000..dc21133208ff5 --- /dev/null +++ b/boards/arm/cc3235sf_launchxl/Kconfig.cc3235sf_launchxl @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CC3235SF_LAUNCHXL + bool + default y + select SOC_SERIES_CC32XX + select SOC_CC3235SF diff --git a/boards/arm/cc3235sf_launchxl/Kconfig.defconfig b/boards/arm/cc3235sf_launchxl/Kconfig.defconfig deleted file mode 100644 index 3653791886537..0000000000000 --- a/boards/arm/cc3235sf_launchxl/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# TI CC3235SF LaunchXL board configuration - -# Copyright (c) 2019, Texas Instruments Incorporated -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_CC3235SF_LAUNCHXL - -config BOARD - default "cc3235sf_launchxl" - -endif # BOARD_CC3235SF_LAUNCHXL diff --git a/boards/arm/cc3235sf_launchxl/cc3235sf_launchxl_defconfig b/boards/arm/cc3235sf_launchxl/cc3235sf_launchxl_defconfig index a233de474a73e..b7f0c47ce1b8d 100644 --- a/boards/arm/cc3235sf_launchxl/cc3235sf_launchxl_defconfig +++ b/boards/arm/cc3235sf_launchxl/cc3235sf_launchxl_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_CC3235SF_LAUNCHXL=y -CONFIG_SOC_SERIES_CC32XX=y -CONFIG_SOC_CC3235SF=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/arm/circuitdojo_feather_nrf9160/Kconfig.board b/boards/arm/circuitdojo_feather_nrf9160/Kconfig.board deleted file mode 100644 index d69bc53f55784..0000000000000 --- a/boards/arm/circuitdojo_feather_nrf9160/Kconfig.board +++ /dev/null @@ -1,15 +0,0 @@ -# Circuit Dojo nRF9160 Feather configuration - -# Copyright (c) 2018-2020 Nordic Semiconductor ASA -# Copyright (c) 2020 Circuit Dojo LLC -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_CIRCUITDOJO_FEATHER_NRF9160 - bool "Circuit Dojo nRF9160 Feather" - -config BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS - bool "Circuit Dojo nRF9160 Feather non-secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/arm/circuitdojo_feather_nrf9160/Kconfig.circuitdojo_feather_nrf9160 b/boards/arm/circuitdojo_feather_nrf9160/Kconfig.circuitdojo_feather_nrf9160 new file mode 100644 index 0000000000000..5432c458d11b5 --- /dev/null +++ b/boards/arm/circuitdojo_feather_nrf9160/Kconfig.circuitdojo_feather_nrf9160 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CIRCUITDOJO_FEATHER_NRF9160 + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/circuitdojo_feather_nrf9160/Kconfig.circuitdojo_feather_nrf9160_ns b/boards/arm/circuitdojo_feather_nrf9160/Kconfig.circuitdojo_feather_nrf9160_ns new file mode 100644 index 0000000000000..972552d23f544 --- /dev/null +++ b/boards/arm/circuitdojo_feather_nrf9160/Kconfig.circuitdojo_feather_nrf9160_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/circuitdojo_feather_nrf9160/Kconfig.defconfig b/boards/arm/circuitdojo_feather_nrf9160/Kconfig.defconfig index 73648be3ef173..3e829dbfeeb02 100644 --- a/boards/arm/circuitdojo_feather_nrf9160/Kconfig.defconfig +++ b/boards/arm/circuitdojo_feather_nrf9160/Kconfig.defconfig @@ -4,11 +4,6 @@ # Copyright (c) 2020 Circuit Dojo LLC # SPDX-License-Identifier: Apache-2.0 -if BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS - -config BOARD - default "circuitdojo_feather_nrf9160" - # For the secure version of the board the firmware is linked at the beginning # of the flash, or into the code-partition defined in DT if it is intended to # be loaded by MCUboot. If the secure firmware is to be combined with a non- @@ -35,5 +30,3 @@ config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS - -endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS diff --git a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_defconfig b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_defconfig index 8d077a6c0ffec..d416f9bbf2c9c 100644 --- a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_defconfig +++ b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_CIRCUITDOJO_FEATHER_NRF9160=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns_defconfig b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns_defconfig index d38a8dc66ad17..48d61ad0203d6 100644 --- a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns_defconfig +++ b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/colibri_imx7d_m4/Kconfig.board b/boards/arm/colibri_imx7d_m4/Kconfig.board deleted file mode 100644 index 016ebca5eff6e..0000000000000 --- a/boards/arm/colibri_imx7d_m4/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Colibri iMX7D M4 board - -# Copyright (c) 2017, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_COLIBRI_IMX7D_M4 - bool "Toradex Colibri iMX7 Dual" - depends on SOC_SERIES_IMX7_M4 - select SOC_PART_NUMBER_MCIMX7D5EVM10SC diff --git a/boards/arm/colibri_imx7d_m4/Kconfig.colibri_imx7d_m4 b/boards/arm/colibri_imx7d_m4/Kconfig.colibri_imx7d_m4 new file mode 100644 index 0000000000000..423f4738eb225 --- /dev/null +++ b/boards/arm/colibri_imx7d_m4/Kconfig.colibri_imx7d_m4 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_COLIBRI_IMX7D_M4 + bool + default y + select SOC_SERIES_IMX7_M4 + select SOC_MCIMX7_M4 + select SOC_PART_NUMBER_MCIMX7D5EVM10SC diff --git a/boards/arm/colibri_imx7d_m4/Kconfig.defconfig b/boards/arm/colibri_imx7d_m4/Kconfig.defconfig index 59253032e0a66..b3067da528ae5 100644 --- a/boards/arm/colibri_imx7d_m4/Kconfig.defconfig +++ b/boards/arm/colibri_imx7d_m4/Kconfig.defconfig @@ -3,17 +3,9 @@ # Copyright (c) 2017, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_COLIBRI_IMX7D_M4 - -config BOARD - default "colibri_imx7d_m4" - if !XIP config FLASH_SIZE default 0 config FLASH_BASE_ADDRESS default 0 endif - - -endif # BOARD_COLIBRI_IMX7D_M4 diff --git a/boards/arm/colibri_imx7d_m4/colibri_imx7d_m4_defconfig b/boards/arm/colibri_imx7d_m4/colibri_imx7d_m4_defconfig index 7ffa389988089..a55e01a9fa748 100644 --- a/boards/arm/colibri_imx7d_m4/colibri_imx7d_m4_defconfig +++ b/boards/arm/colibri_imx7d_m4/colibri_imx7d_m4_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_IMX7_M4=y -CONFIG_SOC_MCIMX7_M4=y -CONFIG_BOARD_COLIBRI_IMX7D_M4=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/boards/arm/contextualelectronics_abc/Kconfig b/boards/arm/contextualelectronics_abc/Kconfig index 26558cc557c68..b6a9479723e7d 100644 --- a/boards/arm/contextualelectronics_abc/Kconfig +++ b/boards/arm/contextualelectronics_abc/Kconfig @@ -7,4 +7,4 @@ config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X default y - depends on BOARD_CONTEXTELEC_ABC + depends on BOARD_CONTEXTUALELECTRONICS_ABC diff --git a/boards/arm/contextualelectronics_abc/Kconfig.board b/boards/arm/contextualelectronics_abc/Kconfig.board deleted file mode 100644 index f1dc7ce2fec7b..0000000000000 --- a/boards/arm/contextualelectronics_abc/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# ABC board configuration - -# Copyright (c) 2020 Analog Life LLC -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_CONTEXTELEC_ABC - bool "nRF52840 based Advanced BLE Cell" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/contextualelectronics_abc/Kconfig.contextualelectronics_abc b/boards/arm/contextualelectronics_abc/Kconfig.contextualelectronics_abc new file mode 100644 index 0000000000000..f15202319936d --- /dev/null +++ b/boards/arm/contextualelectronics_abc/Kconfig.contextualelectronics_abc @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CONTEXTUALELECTRONICS_ABC + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/contextualelectronics_abc/Kconfig.defconfig b/boards/arm/contextualelectronics_abc/Kconfig.defconfig index da35c9e482abc..82ae8c69c3c69 100644 --- a/boards/arm/contextualelectronics_abc/Kconfig.defconfig +++ b/boards/arm/contextualelectronics_abc/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2020 Bilal Wasim # SPDX-License-Identifier: Apache-2.0 -if BOARD_CONTEXTELEC_ABC - -config BOARD - default "nrf52840_ble_cell" - config BT_CTLR default BT - -endif # BOARD_CONTEXTELEC_ABC diff --git a/boards/arm/contextualelectronics_abc/contextualelectronics_abc_defconfig b/boards/arm/contextualelectronics_abc/contextualelectronics_abc_defconfig index bb84146933994..b364be0fc5dc1 100644 --- a/boards/arm/contextualelectronics_abc/contextualelectronics_abc_defconfig +++ b/boards/arm/contextualelectronics_abc/contextualelectronics_abc_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_CONTEXTELEC_ABC=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/cy8ckit_062_ble/Kconfig.board b/boards/arm/cy8ckit_062_ble/Kconfig.board deleted file mode 100644 index 6b7dd89566f6e..0000000000000 --- a/boards/arm/cy8ckit_062_ble/Kconfig.board +++ /dev/null @@ -1,13 +0,0 @@ -# PSoC6 BLE Pioneer Kit configuration - -# Copyright (c) 2018 Cypress -# Copyright (c) 2020 ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_CY8CKIT_062_BLE_M0 - bool "PSoC6 BLE Pioneer Kit [M0 CPU0]" - depends on SOC_PART_NUMBER_CY8C6347BZI_BLD53 - -config BOARD_CY8CKIT_062_BLE_M4 - bool "PSoC6 BLE Pioneer Kit [M4 CPU1]" - depends on SOC_PART_NUMBER_CY8C6347BZI_BLD53 diff --git a/boards/arm/cy8ckit_062_ble/Kconfig.cy8ckit_062_ble_m0 b/boards/arm/cy8ckit_062_ble/Kconfig.cy8ckit_062_ble_m0 new file mode 100644 index 0000000000000..75bbfb5b1ef6a --- /dev/null +++ b/boards/arm/cy8ckit_062_ble/Kconfig.cy8ckit_062_ble_m0 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CY8CKIT_062_BLE_M0 + bool + default y + select SOC_SERIES_PSOC63 + select SOC_PSOC6_M0 + select SOC_PART_NUMBER_CY8C6347BZI_BLD53 diff --git a/boards/arm/cy8ckit_062_ble/Kconfig.cy8ckit_062_ble_m4 b/boards/arm/cy8ckit_062_ble/Kconfig.cy8ckit_062_ble_m4 new file mode 100644 index 0000000000000..0d6fc3b21949d --- /dev/null +++ b/boards/arm/cy8ckit_062_ble/Kconfig.cy8ckit_062_ble_m4 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CY8CKIT_062_BLE_M4 + bool + default y + select SOC_SERIES_PSOC63 + select SOC_PSOC6_M4 + select SOC_PART_NUMBER_CY8C6347BZI_BLD53 diff --git a/boards/arm/cy8ckit_062_ble/Kconfig.defconfig b/boards/arm/cy8ckit_062_ble/Kconfig.defconfig deleted file mode 100644 index 52da0daab3b53..0000000000000 --- a/boards/arm/cy8ckit_062_ble/Kconfig.defconfig +++ /dev/null @@ -1,15 +0,0 @@ -# PSoC6 BLE Pioneer Kit configuration - -# Copyright (c) 2018 Cypress -# Copyright (c) 2020 ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_CY8CKIT_062_BLE_M0 || \ - BOARD_CY8CKIT_062_BLE_M4 - -config BOARD - default "cy8ckit_062_ble_m0" if BOARD_CY8CKIT_062_BLE_M0 - default "cy8ckit_062_ble_m4" if BOARD_CY8CKIT_062_BLE_M4 - -endif # BOARD_CY8CKIT_062_BLE_M0 || \ - # BOARD_CY8CKIT_062_BLE_M4 diff --git a/boards/arm/cy8ckit_062_ble/cy8ckit_062_ble_m0_defconfig b/boards/arm/cy8ckit_062_ble/cy8ckit_062_ble_m0_defconfig index c01d1a64400ec..fefeed4980f7a 100644 --- a/boards/arm/cy8ckit_062_ble/cy8ckit_062_ble_m0_defconfig +++ b/boards/arm/cy8ckit_062_ble/cy8ckit_062_ble_m0_defconfig @@ -5,10 +5,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_PSOC63=y -CONFIG_SOC_PSOC6_M0=y -CONFIG_SOC_PART_NUMBER_CY8C6347BZI_BLD53=y -CONFIG_BOARD_CY8CKIT_062_BLE_M0=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/arm/cy8ckit_062_ble/cy8ckit_062_ble_m4_defconfig b/boards/arm/cy8ckit_062_ble/cy8ckit_062_ble_m4_defconfig index 34478a7c55359..fefeed4980f7a 100644 --- a/boards/arm/cy8ckit_062_ble/cy8ckit_062_ble_m4_defconfig +++ b/boards/arm/cy8ckit_062_ble/cy8ckit_062_ble_m4_defconfig @@ -5,10 +5,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_PSOC63=y -CONFIG_SOC_PSOC6_M4=y -CONFIG_SOC_PART_NUMBER_CY8C6347BZI_BLD53=y -CONFIG_BOARD_CY8CKIT_062_BLE_M4=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/arm/cy8ckit_062_wifi_bt/Kconfig.board b/boards/arm/cy8ckit_062_wifi_bt/Kconfig.board deleted file mode 100644 index 62f30b443d217..0000000000000 --- a/boards/arm/cy8ckit_062_wifi_bt/Kconfig.board +++ /dev/null @@ -1,13 +0,0 @@ -# PSoC6 WiFi-BT Pioneer Kit configuration - -# Copyright (c) 2018 Cypress -# Copyright (c) 2020 ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_CY8CKIT_062_WIFI_BT_M0 - bool "PSoC6 WiFi-BT Pioneer Kit M0" - depends on SOC_PART_NUMBER_CY8C6247BZI_D54 - -config BOARD_CY8CKIT_062_WIFI_BT_M4 - bool "PSoC6 WiFi-BT Pioneer Kit M4" - depends on SOC_PART_NUMBER_CY8C6247BZI_D54 diff --git a/boards/arm/cy8ckit_062_wifi_bt/Kconfig.cy8ckit_062_wifi_bt_m0 b/boards/arm/cy8ckit_062_wifi_bt/Kconfig.cy8ckit_062_wifi_bt_m0 new file mode 100644 index 0000000000000..e2b9f021e34e4 --- /dev/null +++ b/boards/arm/cy8ckit_062_wifi_bt/Kconfig.cy8ckit_062_wifi_bt_m0 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CY8CKIT_062_WIFI_BT_M0 + bool + default y + select SOC_SERIES_PSOC62 + select SOC_PSOC6_M0 + select SOC_PART_NUMBER_CY8C6247BZI_D54 diff --git a/boards/arm/cy8ckit_062_wifi_bt/Kconfig.cy8ckit_062_wifi_bt_m4 b/boards/arm/cy8ckit_062_wifi_bt/Kconfig.cy8ckit_062_wifi_bt_m4 new file mode 100644 index 0000000000000..0ef2345b3a382 --- /dev/null +++ b/boards/arm/cy8ckit_062_wifi_bt/Kconfig.cy8ckit_062_wifi_bt_m4 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CY8CKIT_062_WIFI_BT_M4 + bool + default y + select SOC_SERIES_PSOC62 + select SOC_PSOC6_M4 + select SOC_PART_NUMBER_CY8C6247BZI_D54 diff --git a/boards/arm/cy8ckit_062_wifi_bt/Kconfig.defconfig b/boards/arm/cy8ckit_062_wifi_bt/Kconfig.defconfig deleted file mode 100644 index d30250160d655..0000000000000 --- a/boards/arm/cy8ckit_062_wifi_bt/Kconfig.defconfig +++ /dev/null @@ -1,14 +0,0 @@ -# PSoC6 WiFi-BT Pioneer Kit configuration - -# Copyright (c) 2020 ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_CY8CKIT_062_WIFI_BT_M0 || \ - BOARD_CY8CKIT_062_WIFI_BT_M4 - -config BOARD - default "cy8ckit_062_wifi_bt_m0" if BOARD_CY8CKIT_062_WIFI_BT_M0 - default "cy8ckit_062_wifi_bt_m4" if BOARD_CY8CKIT_062_WIFI_BT_M4 - -endif # BOARD_CY8CKIT_062_WIFI_BT_M0 || \ - # BOARD_CY8CKIT_062_WIFI_BT_M4 diff --git a/boards/arm/cy8ckit_062_wifi_bt/cy8ckit_062_wifi_bt_m0_defconfig b/boards/arm/cy8ckit_062_wifi_bt/cy8ckit_062_wifi_bt_m0_defconfig index 0518f65026b64..fd9d1d319abcf 100644 --- a/boards/arm/cy8ckit_062_wifi_bt/cy8ckit_062_wifi_bt_m0_defconfig +++ b/boards/arm/cy8ckit_062_wifi_bt/cy8ckit_062_wifi_bt_m0_defconfig @@ -4,10 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_PSOC62=y -CONFIG_SOC_PSOC6_M0=y -CONFIG_SOC_PART_NUMBER_CY8C6247BZI_D54=y -CONFIG_BOARD_CY8CKIT_062_WIFI_BT_M0=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/arm/cy8ckit_062_wifi_bt/cy8ckit_062_wifi_bt_m4_defconfig b/boards/arm/cy8ckit_062_wifi_bt/cy8ckit_062_wifi_bt_m4_defconfig index 37cf0025685f1..fd9d1d319abcf 100644 --- a/boards/arm/cy8ckit_062_wifi_bt/cy8ckit_062_wifi_bt_m4_defconfig +++ b/boards/arm/cy8ckit_062_wifi_bt/cy8ckit_062_wifi_bt_m4_defconfig @@ -4,10 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_PSOC62=y -CONFIG_SOC_PSOC6_M4=y -CONFIG_SOC_PART_NUMBER_CY8C6247BZI_D54=y -CONFIG_BOARD_CY8CKIT_062_WIFI_BT_M4=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/arm/cyclonev_socdk/Kconfig.board b/boards/arm/cyclonev_socdk/Kconfig.board deleted file mode 100644 index 9743baf1cc594..0000000000000 --- a/boards/arm/cyclonev_socdk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 -# Description: -# Cyclone V SoC development kit configuration option - -config BOARD_CVSXDEVKIT - bool "Intel Cyclone V Development Kit" - depends on SOC_CYCLONE5 diff --git a/boards/arm/cyclonev_socdk/Kconfig.cyclonev_socdk b/boards/arm/cyclonev_socdk/Kconfig.cyclonev_socdk new file mode 100644 index 0000000000000..8003f5141dfef --- /dev/null +++ b/boards/arm/cyclonev_socdk/Kconfig.cyclonev_socdk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CYCLONEV_SOCDK + bool + default y + select SOC_SERIES_CYCLONE5 + select SOC_CYCLONE5 diff --git a/boards/arm/cyclonev_socdk/Kconfig.defconfig b/boards/arm/cyclonev_socdk/Kconfig.defconfig index ecbf6e512986e..c97ef9c2f95fb 100644 --- a/boards/arm/cyclonev_socdk/Kconfig.defconfig +++ b/boards/arm/cyclonev_socdk/Kconfig.defconfig @@ -3,27 +3,26 @@ # Description: # Adding support for Cyclone V SoC DevKit -if BOARD_CVSXDEVKIT - -config BOARD - default "cyclonev_socdk" -depends on BOARD_CVSXDEVKIT - if I2C_DW + config I2C_DW_CLOCK_SPEED default 200 + endif # I2C_DW if USB_DEVICE_STACK + config USB_DW_USB_2_0 default y + config USB_DEVICE_DRIVER default y + endif # USB_DEVICE_STACK if SPI_DW + config SPI_DW_FIFO_DEPTH default 256 -endif # SPI_DW -endif # BOARD_CVSXDEVKIT +endif # SPI_DW diff --git a/boards/arm/cyclonev_socdk/cyclonev_socdk_defconfig b/boards/arm/cyclonev_socdk/cyclonev_socdk_defconfig index 110a703d4a196..df8f721f7620e 100644 --- a/boards/arm/cyclonev_socdk/cyclonev_socdk_defconfig +++ b/boards/arm/cyclonev_socdk/cyclonev_socdk_defconfig @@ -3,9 +3,6 @@ # Description: # Cyclone V SoC Development Kit Board configuration file -CONFIG_SOC_SERIES_CYCLONE5=y -CONFIG_SOC_CYCLONE5=y -CONFIG_BOARD_CVSXDEVKIT=y CONFIG_ARM_ARCH_TIMER=y CONFIG_SYSCON=y diff --git a/boards/arm/da1469x_dk_pro/Kconfig.board b/boards/arm/da1469x_dk_pro/Kconfig.board deleted file mode 100644 index 0c7f9e23b2fb2..0000000000000 --- a/boards/arm/da1469x_dk_pro/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# DA1469x series Development Kit Pro board configuration - -# Copyright (c) 2022 Renesas Electronics Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_DA1469X_DK_PRO - bool "DA1469x series Development Kit Pro board" - depends on SOC_SERIES_DA1469X diff --git a/boards/arm/da1469x_dk_pro/Kconfig.da1469x_dk_pro b/boards/arm/da1469x_dk_pro/Kconfig.da1469x_dk_pro new file mode 100644 index 0000000000000..40a175ec60ae1 --- /dev/null +++ b/boards/arm/da1469x_dk_pro/Kconfig.da1469x_dk_pro @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_DA1469X_DK_PRO + bool + default y + select SOC_SERIES_DA1469X + select SOC_DA14699 diff --git a/boards/arm/da1469x_dk_pro/Kconfig.defconfig b/boards/arm/da1469x_dk_pro/Kconfig.defconfig deleted file mode 100644 index b0a50f80d5489..0000000000000 --- a/boards/arm/da1469x_dk_pro/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# DA1469x series Development Kit Pro board configuration - -# Copyright (c) 2022 Renesas Electronics Corporation -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_DA1469X_DK_PRO - -config BOARD - default "da1469x_dk_pro" - -endif # BOARD_DA1469X_DK_PRO diff --git a/boards/arm/da1469x_dk_pro/da1469x_dk_pro_defconfig b/boards/arm/da1469x_dk_pro/da1469x_dk_pro_defconfig index 4ed2327436356..2e6a4952b78bb 100644 --- a/boards/arm/da1469x_dk_pro/da1469x_dk_pro_defconfig +++ b/boards/arm/da1469x_dk_pro/da1469x_dk_pro_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_DA1469X=y -CONFIG_SOC_DA14699=y -CONFIG_BOARD_DA1469X_DK_PRO=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/decawave_dwm1001_dev/Kconfig.board b/boards/arm/decawave_dwm1001_dev/Kconfig.board deleted file mode 100644 index ebfd2c581bcb1..0000000000000 --- a/boards/arm/decawave_dwm1001_dev/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# DecaWave DWM1001 board configuration - -# Copyright (c) 2019 Stéphane D'Alu -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_DECAWAVE_DWM1001_DEV - bool "Decawave DWM1001-DEV" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/decawave_dwm1001_dev/Kconfig.decawave_dwm1001_dev b/boards/arm/decawave_dwm1001_dev/Kconfig.decawave_dwm1001_dev new file mode 100644 index 0000000000000..cacdc14e57be4 --- /dev/null +++ b/boards/arm/decawave_dwm1001_dev/Kconfig.decawave_dwm1001_dev @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_DECAWAVE_DWM1001_DEV + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig b/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig index c64fe40b645fb..24434e84d5585 100644 --- a/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig +++ b/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2019 Stéphane D'Alu # SPDX-License-Identifier: Apache-2.0 -if BOARD_DECAWAVE_DWM1001_DEV - -config BOARD - default "decawave_dwm1001_dev" - config BT_CTLR default BT @@ -17,5 +12,3 @@ config I2C config SPI default y depends on IEEE802154 - -endif # BOARD_DECAWAVE_DWM1001_DEV diff --git a/boards/arm/decawave_dwm1001_dev/decawave_dwm1001_dev_defconfig b/boards/arm/decawave_dwm1001_dev/decawave_dwm1001_dev_defconfig index 89d31bfd45bd4..92673266a926e 100644 --- a/boards/arm/decawave_dwm1001_dev/decawave_dwm1001_dev_defconfig +++ b/boards/arm/decawave_dwm1001_dev/decawave_dwm1001_dev_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_DECAWAVE_DWM1001_DEV=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/degu_evk/Kconfig.board b/boards/arm/degu_evk/Kconfig.board deleted file mode 100644 index 99c579690e162..0000000000000 --- a/boards/arm/degu_evk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Degu Evaluation Kit configuration - -# Copyright (c) 2019 Atmark Techno, Inc. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_DEGU_EVK - bool "DEGU_EVK" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/degu_evk/Kconfig.defconfig b/boards/arm/degu_evk/Kconfig.defconfig index ebd494384d9f7..07d8cb0a022ca 100644 --- a/boards/arm/degu_evk/Kconfig.defconfig +++ b/boards/arm/degu_evk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2019 Atmark Techno, Inc. # SPDX-License-Identifier: Apache-2.0 -if BOARD_DEGU_EVK - -config BOARD - default "degu_evk" - if USB_DEVICE_STACK config USB_DEVICE_PRODUCT @@ -42,5 +37,3 @@ config DISK_VOLUME_SIZE default 0x8000 endif # DISK_DRIVER_FLASH - -endif # BOARD_DEGU_EVK diff --git a/boards/arm/degu_evk/Kconfig.degu_evk b/boards/arm/degu_evk/Kconfig.degu_evk new file mode 100644 index 0000000000000..ef36e1b3add08 --- /dev/null +++ b/boards/arm/degu_evk/Kconfig.degu_evk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_DEGU_EVK + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/degu_evk/degu_evk_defconfig b/boards/arm/degu_evk/degu_evk_defconfig index 7b9d7737481fe..b17a1d6c67826 100644 --- a/boards/arm/degu_evk/degu_evk_defconfig +++ b/boards/arm/degu_evk/degu_evk_defconfig @@ -1,7 +1,3 @@ -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_DEGU_EVK=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/disco_l475_iot1/Kconfig.board b/boards/arm/disco_l475_iot1/Kconfig.board deleted file mode 100644 index 98e8d2917827d..0000000000000 --- a/boards/arm/disco_l475_iot1/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Discovery IoT L475 board configuration - -# Copyright (c) 2017 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_DISCO_L475_IOT1 - bool "Discovery IoT L475 Development Board" - depends on SOC_STM32L475XX diff --git a/boards/arm/disco_l475_iot1/Kconfig.defconfig b/boards/arm/disco_l475_iot1/Kconfig.defconfig index 8bf75fa6f7c2e..32999c89d4b05 100644 --- a/boards/arm/disco_l475_iot1/Kconfig.defconfig +++ b/boards/arm/disco_l475_iot1/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2017 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_DISCO_L475_IOT1 - -config BOARD - default "disco_l475_iot1" - # LPTIM clocked by LSE, force tick freq to 4096 for tick accuracy config SYS_CLOCK_TICKS_PER_SEC default 4096 if STM32_LPTIM_TIMER @@ -50,5 +45,3 @@ config BT_HCI_VS_EXT default n endif # BT - -endif # BOARD_DISCO_L475_IOT1 diff --git a/boards/arm/disco_l475_iot1/Kconfig.disco_l475_iot1 b/boards/arm/disco_l475_iot1/Kconfig.disco_l475_iot1 new file mode 100644 index 0000000000000..91c807f0d6367 --- /dev/null +++ b/boards/arm/disco_l475_iot1/Kconfig.disco_l475_iot1 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_DISCO_L475_IOT1 + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L475XX diff --git a/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig b/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig index a25b1eff6458e..5248c5285d01c 100644 --- a/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig +++ b/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_DISCO_L475_IOT1=y -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L475XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/dragino_lsn50/Kconfig.board b/boards/arm/dragino_lsn50/Kconfig.board deleted file mode 100644 index ba1b1277140c4..0000000000000 --- a/boards/arm/dragino_lsn50/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Dragino LSN50 LoRA Sensor Node board configuration - -# Copyright (c) 2018 Endre Karlson -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_DRAGINO_LSN50 - bool "Dragino LSN50 Sensor Node" - depends on SOC_STM32L072XX diff --git a/boards/arm/dragino_lsn50/Kconfig.defconfig b/boards/arm/dragino_lsn50/Kconfig.defconfig deleted file mode 100644 index 05f7b5fd5492f..0000000000000 --- a/boards/arm/dragino_lsn50/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Dragino LSN50 LoRA Sensor Node board configuration - -# Copyright (c) 2018 Endre Karlson -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_DRAGINO_LSN50 - -config BOARD - default "dragino_lsn50" - -endif # BOARD_DRAGINO_LSN50 diff --git a/boards/arm/dragino_lsn50/Kconfig.dragino_lsn50 b/boards/arm/dragino_lsn50/Kconfig.dragino_lsn50 new file mode 100644 index 0000000000000..4fdf08aba02b6 --- /dev/null +++ b/boards/arm/dragino_lsn50/Kconfig.dragino_lsn50 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_DRAGINO_LSN50 + bool + default y + select SOC_SERIES_STM32L0X + select SOC_STM32L072XX diff --git a/boards/arm/dragino_lsn50/dragino_lsn50_defconfig b/boards/arm/dragino_lsn50/dragino_lsn50_defconfig index 7b6c7e6409d15..4a8ad49c50812 100644 --- a/boards/arm/dragino_lsn50/dragino_lsn50_defconfig +++ b/boards/arm/dragino_lsn50/dragino_lsn50_defconfig @@ -1,11 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32L0X=y # Platform Configuration -CONFIG_SOC_STM32L072XX=y -CONFIG_BOARD_DRAGINO_LSN50=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/dragino_nbsn95/Kconfig.board b/boards/arm/dragino_nbsn95/Kconfig.board deleted file mode 100644 index e308ae6528754..0000000000000 --- a/boards/arm/dragino_nbsn95/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Dragino NBSN95 NB-IoT Sensor Node board configuration - -# Copyright (c) 2021 Next Big Thing AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_DRAGINO_NBSN95 - bool "Dragino NBSN95 Sensor Node" - depends on SOC_STM32L072XX diff --git a/boards/arm/dragino_nbsn95/Kconfig.defconfig b/boards/arm/dragino_nbsn95/Kconfig.defconfig deleted file mode 100644 index 0dbadb732d0e4..0000000000000 --- a/boards/arm/dragino_nbsn95/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Dragino NBSN95 NB-IoT Sensor Node board configuration - -# Copyright (c) 2021 Next Big Thing AG -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_DRAGINO_NBSN95 - -config BOARD - default "dragino_nbsn95" - -endif # BOARD_DRAGINO_NBSN95 diff --git a/boards/arm/dragino_nbsn95/Kconfig.dragino_nbsn95 b/boards/arm/dragino_nbsn95/Kconfig.dragino_nbsn95 new file mode 100644 index 0000000000000..c98952bcdcc3d --- /dev/null +++ b/boards/arm/dragino_nbsn95/Kconfig.dragino_nbsn95 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_DRAGINO_NBSN95 + bool + default y + select SOC_SERIES_STM32L0X + select SOC_STM32L072XX diff --git a/boards/arm/dragino_nbsn95/dragino_nbsn95_defconfig b/boards/arm/dragino_nbsn95/dragino_nbsn95_defconfig index 20b5025cc578d..cf533cdd4f9c7 100644 --- a/boards/arm/dragino_nbsn95/dragino_nbsn95_defconfig +++ b/boards/arm/dragino_nbsn95/dragino_nbsn95_defconfig @@ -1,11 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32L0X=y # Platform Configuration -CONFIG_SOC_STM32L072XX=y -CONFIG_BOARD_DRAGINO_NBSN95=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/ebyte_e73_tbb_nrf52832/Kconfig.board b/boards/arm/ebyte_e73_tbb_nrf52832/Kconfig.board deleted file mode 100644 index 5c69a63bb0925..0000000000000 --- a/boards/arm/ebyte_e73_tbb_nrf52832/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# EBYTE-TBB board configuration - -# Copyright (c) 2021 Michal Morsisko -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_EBYTE_E73_TBB_NRF52832 - bool "EBYTE E73-TBB NRF52832" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/ebyte_e73_tbb_nrf52832/Kconfig.defconfig b/boards/arm/ebyte_e73_tbb_nrf52832/Kconfig.defconfig index 3638e0b0b4b48..8ee24e521e515 100644 --- a/boards/arm/ebyte_e73_tbb_nrf52832/Kconfig.defconfig +++ b/boards/arm/ebyte_e73_tbb_nrf52832/Kconfig.defconfig @@ -4,12 +4,5 @@ # Copyright (c) 2021 Michal Morsisko # SPDX-License-Identifier: Apache-2.0 -if BOARD_EBYTE_E73_TBB_NRF52832 - -config BOARD - default "ebyte_e73_tbb_nrf52832" - config BT_CTLR default BT - -endif # BOARD_EBYTE_E73_TBB_NRF52832 diff --git a/boards/arm/ebyte_e73_tbb_nrf52832/Kconfig.ebyte_e73_tbb_nrf52832 b/boards/arm/ebyte_e73_tbb_nrf52832/Kconfig.ebyte_e73_tbb_nrf52832 new file mode 100644 index 0000000000000..0c6248d0c57a0 --- /dev/null +++ b/boards/arm/ebyte_e73_tbb_nrf52832/Kconfig.ebyte_e73_tbb_nrf52832 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EBYTE_E73_TBB_NRF52832 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832_defconfig b/boards/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832_defconfig index 3e1778de525d6..e58704b00ef95 100644 --- a/boards/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832_defconfig +++ b/boards/arm/ebyte_e73_tbb_nrf52832/ebyte_e73_tbb_nrf52832_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_EBYTE_E73_TBB_NRF52832=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/efm32gg_slwstk6121a/Kconfig.board b/boards/arm/efm32gg_slwstk6121a/Kconfig.board deleted file mode 100644 index e15929d5a0a80..0000000000000 --- a/boards/arm/efm32gg_slwstk6121a/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# EFM32GG SLWSTK6121A board configuration -# Copyright (c) 2019 Interay Solutions B.V. -# Copyright (c) 2019 Oane Kingma -# Copyright (c) 2020 Thorvald Natvig -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_EFM32GG_SLWSTK6121A - bool "SiLabs EFM32GG-SLWSTK6121A (WGM160P)" - depends on SOC_SERIES_EFM32GG11B - select SOC_PART_NUMBER_EFM32GG11B820F2048GM64 diff --git a/boards/arm/efm32gg_slwstk6121a/Kconfig.defconfig b/boards/arm/efm32gg_slwstk6121a/Kconfig.defconfig index 28139ff4b1ac9..82a5c730a0049 100644 --- a/boards/arm/efm32gg_slwstk6121a/Kconfig.defconfig +++ b/boards/arm/efm32gg_slwstk6121a/Kconfig.defconfig @@ -4,12 +4,6 @@ # Copyright (c) 2020 Thorvald Natvig # SPDX-License-Identifier: Apache-2.0 -if BOARD_EFM32GG_SLWSTK6121A - -config BOARD - string - default "efm32gg_slwstk6121a" - config CMU_HFXO_FREQ default 50000000 @@ -29,5 +23,3 @@ config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_EFM32GG_SLWSTK6121A diff --git a/boards/arm/efm32gg_slwstk6121a/Kconfig.efm32gg_slwstk6121a b/boards/arm/efm32gg_slwstk6121a/Kconfig.efm32gg_slwstk6121a new file mode 100644 index 0000000000000..cfa1e8bf099fe --- /dev/null +++ b/boards/arm/efm32gg_slwstk6121a/Kconfig.efm32gg_slwstk6121a @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFM32GG_SLWSTK6121A + bool + default y + select SOC_SERIES_EFM32GG11B + select SOC_PART_NUMBER_EFM32GG11B820F2048GM64 diff --git a/boards/arm/efm32gg_slwstk6121a/efm32gg_slwstk6121a_defconfig b/boards/arm/efm32gg_slwstk6121a/efm32gg_slwstk6121a_defconfig index 4eadfce741a39..f7dfcb09cba84 100644 --- a/boards/arm/efm32gg_slwstk6121a/efm32gg_slwstk6121a_defconfig +++ b/boards/arm/efm32gg_slwstk6121a/efm32gg_slwstk6121a_defconfig @@ -3,8 +3,6 @@ # Copyright (c) 2020 Thorvald Natvig # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_EFM32GG11B=y -CONFIG_BOARD_EFM32GG_SLWSTK6121A=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/efm32gg_stk3701a/Kconfig.board b/boards/arm/efm32gg_stk3701a/Kconfig.board deleted file mode 100644 index cbab0c8d3ff87..0000000000000 --- a/boards/arm/efm32gg_stk3701a/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# EFM32GG STK3701A board configuration -# Copyright (c) 2019 Interay Solutions B.V. -# Copyright (c) 2019 Oane Kingma -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_EFM32GG_STK3701A - bool "SiLabs EFM32GG-STK3701A (Giant Gecko 11)" - depends on SOC_SERIES_EFM32GG11B - select SOC_PART_NUMBER_EFM32GG11B820F2048GL192 diff --git a/boards/arm/efm32gg_stk3701a/Kconfig.defconfig b/boards/arm/efm32gg_stk3701a/Kconfig.defconfig index 620efea317a0e..98dbac06d5ad9 100644 --- a/boards/arm/efm32gg_stk3701a/Kconfig.defconfig +++ b/boards/arm/efm32gg_stk3701a/Kconfig.defconfig @@ -3,12 +3,6 @@ # Copyright (c) 2019 Oane Kingma # SPDX-License-Identifier: Apache-2.0 -if BOARD_EFM32GG_STK3701A - -config BOARD - string - default "efm32gg_stk3701a" - config CMU_HFXO_FREQ default 50000000 @@ -28,5 +22,3 @@ config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_EFM32GG_STK3701A diff --git a/boards/arm/efm32gg_stk3701a/Kconfig.efm32gg_stk3701a b/boards/arm/efm32gg_stk3701a/Kconfig.efm32gg_stk3701a new file mode 100644 index 0000000000000..5f1a29d51bd63 --- /dev/null +++ b/boards/arm/efm32gg_stk3701a/Kconfig.efm32gg_stk3701a @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFM32GG_STK3701A + bool + default y + select SOC_SERIES_EFM32GG11B + select SOC_PART_NUMBER_EFM32GG11B820F2048GL192 diff --git a/boards/arm/efm32gg_stk3701a/efm32gg_stk3701a_defconfig b/boards/arm/efm32gg_stk3701a/efm32gg_stk3701a_defconfig index 61c099b57261e..76b773c1f7c16 100644 --- a/boards/arm/efm32gg_stk3701a/efm32gg_stk3701a_defconfig +++ b/boards/arm/efm32gg_stk3701a/efm32gg_stk3701a_defconfig @@ -2,8 +2,6 @@ # Copyright (c) 2019 Oane Kingma # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_EFM32GG11B=y -CONFIG_BOARD_EFM32GG_STK3701A=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/efm32hg_slstk3400a/Kconfig.board b/boards/arm/efm32hg_slstk3400a/Kconfig.board deleted file mode 100644 index eb3ca8af2cc59..0000000000000 --- a/boards/arm/efm32hg_slstk3400a/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# EFM32HG SLSTK3400A board - -# Copyright (c) 2018, Marcio Montenegro -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_EFM32HG_SLSTK3400A - bool "SiLabs EFM32HG-SLSTK3400A (Happy Gecko)" - depends on SOC_SERIES_EFM32HG - select SOC_PART_NUMBER_EFM32HG322F64 diff --git a/boards/arm/efm32hg_slstk3400a/Kconfig.defconfig b/boards/arm/efm32hg_slstk3400a/Kconfig.defconfig index 08b75e0857ffc..c5a6909036ea4 100644 --- a/boards/arm/efm32hg_slstk3400a/Kconfig.defconfig +++ b/boards/arm/efm32hg_slstk3400a/Kconfig.defconfig @@ -3,15 +3,8 @@ # Copyright (c) 2018, Marcio Montenegro # SPDX-License-Identifier: Apache-2.0 -if BOARD_EFM32HG_SLSTK3400A - -config BOARD - default "efm32hg_slstk3400a" - config CMU_HFXO_FREQ default 24000000 config CMU_LFXO_FREQ default 32768 - -endif # BOARD_EFM32HG_SLSTK3400A diff --git a/boards/arm/efm32hg_slstk3400a/Kconfig.efm32hg_slstk3400a b/boards/arm/efm32hg_slstk3400a/Kconfig.efm32hg_slstk3400a new file mode 100644 index 0000000000000..67379e4cb95f3 --- /dev/null +++ b/boards/arm/efm32hg_slstk3400a/Kconfig.efm32hg_slstk3400a @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFM32HG_SLSTK3400A + bool + default y + select SOC_SERIES_EFM32HG + select SOC_PART_NUMBER_EFM32HG322F64 diff --git a/boards/arm/efm32hg_slstk3400a/efm32hg_slstk3400a_defconfig b/boards/arm/efm32hg_slstk3400a/efm32hg_slstk3400a_defconfig index 834cb328d0cb3..957fedcc584da 100644 --- a/boards/arm/efm32hg_slstk3400a/efm32hg_slstk3400a_defconfig +++ b/boards/arm/efm32hg_slstk3400a/efm32hg_slstk3400a_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_EFM32HG=y -CONFIG_BOARD_EFM32HG_SLSTK3400A=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/efm32pg_stk3401a/Kconfig.board b/boards/arm/efm32pg_stk3401a/Kconfig.board deleted file mode 100644 index 8c2222a987162..0000000000000 --- a/boards/arm/efm32pg_stk3401a/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# EFM32PG STK3401A board - -# Copyright (c) 2020, Rafael Dias Menezes -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_EFM32PG_STK3401A - bool "SiLabs EFM32PG-STK3401A (Pearl Gecko)" - depends on SOC_SERIES_EFM32PG1B - select SOC_PART_NUMBER_EFM32PG1B200F256GM48 diff --git a/boards/arm/efm32pg_stk3401a/Kconfig.defconfig b/boards/arm/efm32pg_stk3401a/Kconfig.defconfig index 33fe600d96f0a..35d53e632b818 100644 --- a/boards/arm/efm32pg_stk3401a/Kconfig.defconfig +++ b/boards/arm/efm32pg_stk3401a/Kconfig.defconfig @@ -3,15 +3,8 @@ # Copyright (c) 2020, Rafael Dias Menezes # SPDX-License-Identifier: Apache-2.0 -if BOARD_EFM32PG_STK3401A - -config BOARD - default "efm32pg_stk3401a" if BOARD_EFM32PG_STK3401A - config CMU_HFXO_FREQ default 40000000 config CMU_LFXO_FREQ default 32768 - -endif # BOARD_EFM32PG_STK3401A diff --git a/boards/arm/efm32pg_stk3401a/Kconfig.efm32pg_stk3401a b/boards/arm/efm32pg_stk3401a/Kconfig.efm32pg_stk3401a new file mode 100644 index 0000000000000..b1ecb0556d1d0 --- /dev/null +++ b/boards/arm/efm32pg_stk3401a/Kconfig.efm32pg_stk3401a @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFM32PG_STK3401A + bool + default y + select SOC_SERIES_EFM32PG1B + select SOC_PART_NUMBER_EFM32PG1B200F256GM48 diff --git a/boards/arm/efm32pg_stk3401a/efm32pg_stk3401a_defconfig b/boards/arm/efm32pg_stk3401a/efm32pg_stk3401a_defconfig index 541e45f901f33..f220c60c9a879 100644 --- a/boards/arm/efm32pg_stk3401a/efm32pg_stk3401a_defconfig +++ b/boards/arm/efm32pg_stk3401a/efm32pg_stk3401a_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_EFM32PG1B=y -CONFIG_BOARD_EFM32PG_STK3401A=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/efm32pg_stk3402a/Kconfig.board b/boards/arm/efm32pg_stk3402a/Kconfig.board deleted file mode 100644 index dfb65d480862e..0000000000000 --- a/boards/arm/efm32pg_stk3402a/Kconfig.board +++ /dev/null @@ -1,15 +0,0 @@ -# EFM32PG STK3402A board - -# Copyright (c) 2018, Christian Taedcke -# Copyright (c) 2019 Lemonbeat GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_EFM32PG_STK3402A - bool "SiLabs EFM32PG-STK3402A (Pearl Gecko)" - depends on SOC_SERIES_EFM32PG12B - select SOC_PART_NUMBER_EFM32PG12B500F1024GL125 - -config BOARD_EFM32PG_STK3402A_JG - bool "SiLabs EFM32PG-STK3402A (Jade Gecko)" - depends on SOC_SERIES_EFM32JG12B - select SOC_PART_NUMBER_EFM32JG12B500F1024GL125 diff --git a/boards/arm/efm32pg_stk3402a/Kconfig.defconfig b/boards/arm/efm32pg_stk3402a/Kconfig.defconfig index 5f298e584c39b..7f046f1de2761 100644 --- a/boards/arm/efm32pg_stk3402a/Kconfig.defconfig +++ b/boards/arm/efm32pg_stk3402a/Kconfig.defconfig @@ -4,16 +4,8 @@ # Copyright (c) 2019 Lemonbeat GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_EFM32PG_STK3402A || BOARD_EFM32PG_STK3402A_JG - -config BOARD - default "efm32pg_stk3402a" if BOARD_EFM32PG_STK3402A - default "efm32pg_stk3402a_jg" if BOARD_EFM32PG_STK3402A_JG - config CMU_HFXO_FREQ default 40000000 config CMU_LFXO_FREQ default 32768 - -endif # BOARD_EFM32PG_STK3402A || BOARD_EFM32PG_STK3402A_JG diff --git a/boards/arm/efm32pg_stk3402a/Kconfig.efm32pg_stk3402a b/boards/arm/efm32pg_stk3402a/Kconfig.efm32pg_stk3402a new file mode 100644 index 0000000000000..50e11d787ab88 --- /dev/null +++ b/boards/arm/efm32pg_stk3402a/Kconfig.efm32pg_stk3402a @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFM32PG_STK3402A + bool + default y + select SOC_SERIES_EFM32PG12B + select SOC_PART_NUMBER_EFM32PG12B500F1024GL125 diff --git a/boards/arm/efm32pg_stk3402a/Kconfig.efm32pg_stk3402a_jg b/boards/arm/efm32pg_stk3402a/Kconfig.efm32pg_stk3402a_jg new file mode 100644 index 0000000000000..51c157ba077ac --- /dev/null +++ b/boards/arm/efm32pg_stk3402a/Kconfig.efm32pg_stk3402a_jg @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFM32PG_STK3402A_JG + bool + default y + select SOC_SERIES_EFM32JG12B + select SOC_PART_NUMBER_EFM32JG12B500F1024GL125 diff --git a/boards/arm/efm32pg_stk3402a/efm32pg_stk3402a_defconfig b/boards/arm/efm32pg_stk3402a/efm32pg_stk3402a_defconfig index d3805477749ef..f220c60c9a879 100644 --- a/boards/arm/efm32pg_stk3402a/efm32pg_stk3402a_defconfig +++ b/boards/arm/efm32pg_stk3402a/efm32pg_stk3402a_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_EFM32PG12B=y -CONFIG_BOARD_EFM32PG_STK3402A=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/efm32pg_stk3402a/efm32pg_stk3402a_jg_defconfig b/boards/arm/efm32pg_stk3402a/efm32pg_stk3402a_jg_defconfig index 36c92f45d2e01..f220c60c9a879 100644 --- a/boards/arm/efm32pg_stk3402a/efm32pg_stk3402a_jg_defconfig +++ b/boards/arm/efm32pg_stk3402a/efm32pg_stk3402a_jg_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_EFM32JG12B=y -CONFIG_BOARD_EFM32PG_STK3402A_JG=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/efm32wg_stk3800/Kconfig.board b/boards/arm/efm32wg_stk3800/Kconfig.board deleted file mode 100644 index d75311cbe146b..0000000000000 --- a/boards/arm/efm32wg_stk3800/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# EFM32WG STK3800 board - -# Copyright (c) 2017, Christian Taedcke -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_EFM32WG_STK3800 - bool "SiLabs EFM32WG-STK3800 (Wonder Gecko)" - depends on SOC_SERIES_EFM32WG - select SOC_PART_NUMBER_EFM32WG990F256 diff --git a/boards/arm/efm32wg_stk3800/Kconfig.defconfig b/boards/arm/efm32wg_stk3800/Kconfig.defconfig index 90450ad0244bd..aa636a53e7061 100644 --- a/boards/arm/efm32wg_stk3800/Kconfig.defconfig +++ b/boards/arm/efm32wg_stk3800/Kconfig.defconfig @@ -3,15 +3,8 @@ # Copyright (c) 2017, Christian Taedcke # SPDX-License-Identifier: Apache-2.0 -if BOARD_EFM32WG_STK3800 - -config BOARD - default "efm32wg_stk3800" - config CMU_HFXO_FREQ default 48000000 config CMU_LFXO_FREQ default 32768 - -endif # BOARD_EFM32WG_STK3800 diff --git a/boards/arm/efm32wg_stk3800/Kconfig.efm32wg_stk3800 b/boards/arm/efm32wg_stk3800/Kconfig.efm32wg_stk3800 new file mode 100644 index 0000000000000..ee6fcef83c34e --- /dev/null +++ b/boards/arm/efm32wg_stk3800/Kconfig.efm32wg_stk3800 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFM32WG_STK3800 + bool + default y + select SOC_SERIES_EFM32WG + select SOC_PART_NUMBER_EFM32WG990F256 diff --git a/boards/arm/efm32wg_stk3800/efm32wg_stk3800_defconfig b/boards/arm/efm32wg_stk3800/efm32wg_stk3800_defconfig index cda53788ee69f..5563b773d7dbd 100644 --- a/boards/arm/efm32wg_stk3800/efm32wg_stk3800_defconfig +++ b/boards/arm/efm32wg_stk3800/efm32wg_stk3800_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_EFM32WG=y -CONFIG_BOARD_EFM32WG_STK3800=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/efr32_radio/Kconfig.board b/boards/arm/efr32_radio/Kconfig.board deleted file mode 100644 index c493455d55444..0000000000000 --- a/boards/arm/efr32_radio/Kconfig.board +++ /dev/null @@ -1,30 +0,0 @@ -# EFR32BG13 BRD4104A / EFR32MG21 BRD4180A / -# EFR32FG1P BRD4250B / EFR32FG13P BRD4255A board - -# Copyright (c) 2020 Piotr Mienkowski -# Copyright (c) 2020 TriaGnoSys GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_EFR32_RADIO_BRD4104A - bool "Silicon Labs BRD4104A (Blue Gecko Radio Board)" - depends on SOC_SERIES_EFR32BG13P - select BOARD_EFR32_RADIO - select SOC_PART_NUMBER_EFR32BG13P632F512GM48 - -config BOARD_EFR32_RADIO_BRD4250B - bool "Silicon Labs BRD4250B (Flex Gecko Radio Board)" - depends on SOC_SERIES_EFR32FG1P - select BOARD_EFR32_RADIO - select SOC_PART_NUMBER_EFR32FG1P133F256GM48 - -config BOARD_EFR32_RADIO_BRD4180A - bool "Silicon Labs BRD4180A (Mighty Gecko Radio Board)" - depends on SOC_SERIES_EFR32MG21 - select BOARD_EFR32_RADIO - select SOC_PART_NUMBER_EFR32MG21A020F1024IM32 - -config BOARD_EFR32_RADIO_BRD4255A - bool "Silicon Labs BRD4255A (Flex Gecko Radio Board)" - depends on SOC_SERIES_EFR32FG13P - select BOARD_EFR32_RADIO - select SOC_PART_NUMBER_EFR32FG13P233F512GM48 diff --git a/boards/arm/efr32_radio/Kconfig.defconfig b/boards/arm/efr32_radio/Kconfig.defconfig index 2ff8a57ea4e8c..46238c178883c 100644 --- a/boards/arm/efr32_radio/Kconfig.defconfig +++ b/boards/arm/efr32_radio/Kconfig.defconfig @@ -4,14 +4,6 @@ # Copyright (c) 2020 TriaGnoSys GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_EFR32_RADIO - -config BOARD - default "efr32_radio_brd4104a" if BOARD_EFR32_RADIO_BRD4104A - default "efr32_radio_brd4250b" if BOARD_EFR32_RADIO_BRD4250B - default "efr32_radio_brd4180a" if BOARD_EFR32_RADIO_BRD4180A - default "efr32_radio_brd4255a" if BOARD_EFR32_RADIO_BRD4255A - config CMU_HFXO_FREQ default 38400000 @@ -21,5 +13,3 @@ config CMU_LFXO_FREQ config LOG_BACKEND_SWO_FREQ_HZ default 875000 depends on LOG_BACKEND_SWO - -endif # BOARD_EFR32_RADIO diff --git a/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4104a b/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4104a new file mode 100644 index 0000000000000..d564fc95a87b3 --- /dev/null +++ b/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4104a @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFR32_RADIO_BRD4104A + bool + default y + select SOC_SERIES_EFR32BG13P + select BOARD_EFR32_RADIO + select SOC_PART_NUMBER_EFR32BG13P632F512GM48 diff --git a/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4180a b/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4180a new file mode 100644 index 0000000000000..57e4648f57f45 --- /dev/null +++ b/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4180a @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFR32_RADIO_BRD4180A + bool + default y + select SOC_SERIES_EFR32MG21 + select BOARD_EFR32_RADIO + select SOC_PART_NUMBER_EFR32MG21A020F1024IM32 diff --git a/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4250b b/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4250b new file mode 100644 index 0000000000000..719c3a3a93146 --- /dev/null +++ b/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4250b @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFR32_RADIO_BRD4250B + bool + default y + select SOC_SERIES_EFR32FG1P + select BOARD_EFR32_RADIO + select SOC_PART_NUMBER_EFR32FG1P133F256GM48 diff --git a/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4255a b/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4255a new file mode 100644 index 0000000000000..2703bc018f0ba --- /dev/null +++ b/boards/arm/efr32_radio/Kconfig.efr32_radio_brd4255a @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFR32_RADIO_BRD4255A + bool + default y + select SOC_SERIES_EFR32FG13P + select BOARD_EFR32_RADIO + select SOC_PART_NUMBER_EFR32FG13P233F512GM48 diff --git a/boards/arm/efr32_radio/efr32_radio_brd4104a_defconfig b/boards/arm/efr32_radio/efr32_radio_brd4104a_defconfig index 00991a6e4cd2f..17eefb534ca22 100644 --- a/boards/arm/efr32_radio/efr32_radio_brd4104a_defconfig +++ b/boards/arm/efr32_radio/efr32_radio_brd4104a_defconfig @@ -1,8 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM_MPU=y -CONFIG_SOC_SERIES_EFR32BG13P=y -CONFIG_BOARD_EFR32_RADIO_BRD4104A=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/efr32_radio/efr32_radio_brd4180a_defconfig b/boards/arm/efr32_radio/efr32_radio_brd4180a_defconfig index 79da19d546218..cc467ccbd9c0e 100644 --- a/boards/arm/efr32_radio/efr32_radio_brd4180a_defconfig +++ b/boards/arm/efr32_radio/efr32_radio_brd4180a_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_EFR32MG21=y -CONFIG_BOARD_EFR32_RADIO_BRD4180A=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/efr32_radio/efr32_radio_brd4250b_defconfig b/boards/arm/efr32_radio/efr32_radio_brd4250b_defconfig index d9be04bc9cd14..17eefb534ca22 100644 --- a/boards/arm/efr32_radio/efr32_radio_brd4250b_defconfig +++ b/boards/arm/efr32_radio/efr32_radio_brd4250b_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_EFR32FG1P=y -CONFIG_BOARD_EFR32_RADIO_BRD4250B=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/efr32_radio/efr32_radio_brd4255a_defconfig b/boards/arm/efr32_radio/efr32_radio_brd4255a_defconfig index 8d409047b7576..17eefb534ca22 100644 --- a/boards/arm/efr32_radio/efr32_radio_brd4255a_defconfig +++ b/boards/arm/efr32_radio/efr32_radio_brd4255a_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_EFR32FG13P=y -CONFIG_BOARD_EFR32_RADIO_BRD4255A=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/efr32mg_sltb004a/Kconfig.board b/boards/arm/efr32mg_sltb004a/Kconfig.board deleted file mode 100644 index 8e884faf35f7c..0000000000000 --- a/boards/arm/efr32mg_sltb004a/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# EFR32MG SLTB004A board - -# Copyright (c) 2018, Diego Sueiro -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_EFR32MG_SLTB004A - bool "SiLabs EFR32MG-SLTB004A (Thunderboard Sense 2)" - depends on SOC_SERIES_EFR32MG12P - select SOC_PART_NUMBER_EFR32MG12P332F1024GL125 diff --git a/boards/arm/efr32mg_sltb004a/Kconfig.defconfig b/boards/arm/efr32mg_sltb004a/Kconfig.defconfig index d8939cda5d636..c473cef2e57d9 100644 --- a/boards/arm/efr32mg_sltb004a/Kconfig.defconfig +++ b/boards/arm/efr32mg_sltb004a/Kconfig.defconfig @@ -3,15 +3,8 @@ # Copyright (c) 2018, Diego Sueiro # SPDX-License-Identifier: Apache-2.0 -if BOARD_EFR32MG_SLTB004A - -config BOARD - default "efr32mg_sltb004a" - config CMU_HFXO_FREQ default 40000000 config CMU_LFXO_FREQ default 32768 - -endif # BOARD_EFR32MG_SLTB004A diff --git a/boards/arm/efr32mg_sltb004a/Kconfig.efr32mg_sltb004a b/boards/arm/efr32mg_sltb004a/Kconfig.efr32mg_sltb004a new file mode 100644 index 0000000000000..fdb34182d420f --- /dev/null +++ b/boards/arm/efr32mg_sltb004a/Kconfig.efr32mg_sltb004a @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EFR32MG_SLTB004A + bool + default y + select SOC_SERIES_EFR32MG12P + select SOC_PART_NUMBER_EFR32MG12P332F1024GL125 diff --git a/boards/arm/efr32mg_sltb004a/efr32mg_sltb004a_defconfig b/boards/arm/efr32mg_sltb004a/efr32mg_sltb004a_defconfig index 4182a0df8e4da..17eefb534ca22 100644 --- a/boards/arm/efr32mg_sltb004a/efr32mg_sltb004a_defconfig +++ b/boards/arm/efr32mg_sltb004a/efr32mg_sltb004a_defconfig @@ -1,8 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM_MPU=y -CONFIG_SOC_SERIES_EFR32MG12P=y -CONFIG_BOARD_EFR32MG_SLTB004A=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/faze/Kconfig.board b/boards/arm/faze/Kconfig.board deleted file mode 100644 index 22f5bc769c1bc..0000000000000 --- a/boards/arm/faze/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Seagate FireCuda Gaming SSD (FaZe) board - -# Copyright (c) 2020, Seagate Technology LLC -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_FAZE - bool "Seagate FireCuda Gaming SSD (FaZe)" - depends on SOC_SERIES_LPC11U6X - select SOC_PART_NUMBER_LPC11U67JBD48 diff --git a/boards/arm/faze/Kconfig.defconfig b/boards/arm/faze/Kconfig.defconfig deleted file mode 100644 index 39135dabeb84f..0000000000000 --- a/boards/arm/faze/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Seagate FireCuda Gaming SSD (FaZe) board - -# Copyright (c) 2020, Seagate Technology LLC -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_FAZE - -config BOARD - default "faze" - -endif # BOARD_FAZE diff --git a/boards/arm/faze/Kconfig.faze b/boards/arm/faze/Kconfig.faze new file mode 100644 index 0000000000000..ee36c9efb2916 --- /dev/null +++ b/boards/arm/faze/Kconfig.faze @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_FAZE + bool + default y + select SOC_SERIES_LPC11U6X + select SOC_LPC11U67 + select SOC_PART_NUMBER_LPC11U67JBD48 diff --git a/boards/arm/faze/faze_defconfig b/boards/arm/faze/faze_defconfig index f6dc6fafb97dd..257f6fb3c619e 100644 --- a/boards/arm/faze/faze_defconfig +++ b/boards/arm/faze/faze_defconfig @@ -7,8 +7,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 CONFIG_GPIO=y CONFIG_BUILD_OUTPUT_HEX=y -CONFIG_SOC_SERIES_LPC11U6X=y -CONFIG_SOC_LPC11U67=y CONFIG_MAIN_STACK_SIZE=512 CONFIG_ISR_STACK_SIZE=768 CONFIG_CLOCK_CONTROL_LPC11U6X_ENABLE_SRAM1=y diff --git a/boards/arm/frdm_k22f/Kconfig.board b/boards/arm/frdm_k22f/Kconfig.board deleted file mode 100644 index 343dda21e42e3..0000000000000 --- a/boards/arm/frdm_k22f/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# FRDM-K22F board - -# Copyright (c) 2018, Prevas A/S -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_FRDM_K22F - bool "NXP FRDM-K22F" - depends on SOC_SERIES_KINETIS_K2X - select SOC_PART_NUMBER_MK22FN512VLH12 diff --git a/boards/arm/frdm_k22f/Kconfig.defconfig b/boards/arm/frdm_k22f/Kconfig.defconfig index 1f26261992949..0cc9d240e9c65 100644 --- a/boards/arm/frdm_k22f/Kconfig.defconfig +++ b/boards/arm/frdm_k22f/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018 Prevas A/S # SPDX-License-Identifier: Apache-2.0 -if BOARD_FRDM_K22F - -config BOARD - default "frdm_k22f" - config OSC_XTAL0_FREQ default 8000000 @@ -19,5 +14,3 @@ config MCG_VDIV0 config MCG_FCRDIV default 0 - -endif # BOARD_FRDM_K22F diff --git a/boards/arm/frdm_k22f/Kconfig.frdm_k22f b/boards/arm/frdm_k22f/Kconfig.frdm_k22f new file mode 100644 index 0000000000000..a625e0915a0dd --- /dev/null +++ b/boards/arm/frdm_k22f/Kconfig.frdm_k22f @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_FRDM_K22F + bool + default y + select SOC_MK22F51212 + select SOC_SERIES_KINETIS_K2X + select SOC_PART_NUMBER_MK22FN512VLH12 diff --git a/boards/arm/frdm_k22f/frdm_k22f_defconfig b/boards/arm/frdm_k22f/frdm_k22f_defconfig index 4ee913104debf..28e4f2b6ec356 100644 --- a/boards/arm/frdm_k22f/frdm_k22f_defconfig +++ b/boards/arm/frdm_k22f/frdm_k22f_defconfig @@ -6,8 +6,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MK22F51212=y -CONFIG_SOC_SERIES_KINETIS_K2X=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/frdm_k64f/Kconfig.board b/boards/arm/frdm_k64f/Kconfig.board deleted file mode 100644 index d57ffc9070895..0000000000000 --- a/boards/arm/frdm_k64f/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_FRDM_K64F - bool "Freescale FRDM-K64F" - depends on SOC_SERIES_KINETIS_K6X - select SOC_PART_NUMBER_MK64FN1M0VLL12 diff --git a/boards/arm/frdm_k64f/Kconfig.defconfig b/boards/arm/frdm_k64f/Kconfig.defconfig index fc7885e7e129d..adccf83da0815 100644 --- a/boards/arm/frdm_k64f/Kconfig.defconfig +++ b/boards/arm/frdm_k64f/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2016, Freescale Semiconductor, Inc. # SPDX-License-Identifier: Apache-2.0 -if BOARD_FRDM_K64F - -config BOARD - default "frdm_k64f" - config OSC_XTAL0_FREQ default 50000000 @@ -26,5 +21,3 @@ config NET_L2_ETHERNET default y if !MODEM endif # NETWORKING - -endif # BOARD_FRDM_K64F diff --git a/boards/arm/frdm_k64f/Kconfig.frdm_k64f b/boards/arm/frdm_k64f/Kconfig.frdm_k64f new file mode 100644 index 0000000000000..b5fd181999972 --- /dev/null +++ b/boards/arm/frdm_k64f/Kconfig.frdm_k64f @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_FRDM_K64F + bool + default y + select SOC_MK64F12 + select SOC_SERIES_KINETIS_K6X + select SOC_PART_NUMBER_MK64FN1M0VLL12 diff --git a/boards/arm/frdm_k64f/frdm_k64f_defconfig b/boards/arm/frdm_k64f/frdm_k64f_defconfig index 1f2df24a8666d..74d8a115b892a 100644 --- a/boards/arm/frdm_k64f/frdm_k64f_defconfig +++ b/boards/arm/frdm_k64f/frdm_k64f_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_MK64F12=y -CONFIG_SOC_SERIES_KINETIS_K6X=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/frdm_k82f/Kconfig.board b/boards/arm/frdm_k82f/Kconfig.board deleted file mode 100644 index 2c18f441b53cb..0000000000000 --- a/boards/arm/frdm_k82f/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# FRDM-K82F board configuration - -# Copyright (c) 2019 SEAL AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_FRDM_K82F - bool "NXP FRDM-K82F" - depends on SOC_SERIES_KINETIS_K8X - select SOC_PART_NUMBER_MK82FN256VLL15 diff --git a/boards/arm/frdm_k82f/Kconfig.defconfig b/boards/arm/frdm_k82f/Kconfig.defconfig index 70ab0a501ea5d..4062e7d0133e0 100644 --- a/boards/arm/frdm_k82f/Kconfig.defconfig +++ b/boards/arm/frdm_k82f/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2019 SEAL AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_FRDM_K82F - -config BOARD - default "frdm_k82f" - config OSC_XTAL0_FREQ default 12000000 @@ -33,5 +28,3 @@ endif # FXOS8700 config FXOS8700_DRDY_INT1 default y depends on FXOS8700_TRIGGER - -endif # BOARD_FRDM_K82F diff --git a/boards/arm/frdm_k82f/Kconfig.frdm_k82f b/boards/arm/frdm_k82f/Kconfig.frdm_k82f new file mode 100644 index 0000000000000..37a111e9db314 --- /dev/null +++ b/boards/arm/frdm_k82f/Kconfig.frdm_k82f @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_FRDM_K82F + bool + default y + select SOC_SERIES_KINETIS_K8X + select SOC_MK82F25615 + select SOC_PART_NUMBER_MK82FN256VLL15 diff --git a/boards/arm/frdm_k82f/frdm_k82f_defconfig b/boards/arm/frdm_k82f/frdm_k82f_defconfig index 8b8a4e33367ac..752e5539cbb24 100644 --- a/boards/arm/frdm_k82f/frdm_k82f_defconfig +++ b/boards/arm/frdm_k82f/frdm_k82f_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_KINETIS_K8X=y -CONFIG_SOC_MK82F25615=y CONFIG_SERIAL=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/frdm_kl25z/Kconfig.board b/boards/arm/frdm_kl25z/Kconfig.board deleted file mode 100644 index 9a2a41841155d..0000000000000 --- a/boards/arm/frdm_kl25z/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# FRDM-KL25Z board - -# Copyright (c) 2017, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_FRDM_KL25Z - bool "NXP FRDM-KL25Z" - depends on SOC_SERIES_KINETIS_KL2X - select SOC_PART_NUMBER_MKL25Z128VLK4 diff --git a/boards/arm/frdm_kl25z/Kconfig.defconfig b/boards/arm/frdm_kl25z/Kconfig.defconfig index c759787a2196d..2fe6dc362a871 100644 --- a/boards/arm/frdm_kl25z/Kconfig.defconfig +++ b/boards/arm/frdm_kl25z/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2017, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_FRDM_KL25Z - -config BOARD - default "frdm_kl25z" - config OSC_XTAL0_FREQ default 8000000 @@ -30,5 +25,3 @@ choice FXOS8700_MODE endchoice endif # FXOS8700 - -endif # BOARD_FRDM_KL25Z diff --git a/boards/arm/frdm_kl25z/Kconfig.frdm_kl25z b/boards/arm/frdm_kl25z/Kconfig.frdm_kl25z new file mode 100644 index 0000000000000..10173de236d04 --- /dev/null +++ b/boards/arm/frdm_kl25z/Kconfig.frdm_kl25z @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_FRDM_KL25Z + bool + default y + select SOC_SERIES_KINETIS_KL2X + select SOC_PART_NUMBER_MKL25Z128VLK4 + select SOC_MKL25Z4 diff --git a/boards/arm/frdm_kl25z/frdm_kl25z_defconfig b/boards/arm/frdm_kl25z/frdm_kl25z_defconfig index 54f27a6c14e0a..0645bba8800b9 100644 --- a/boards/arm/frdm_kl25z/frdm_kl25z_defconfig +++ b/boards/arm/frdm_kl25z/frdm_kl25z_defconfig @@ -1,6 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_KINETIS_KL2X=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/frdm_kw41z/Kconfig.board b/boards/arm/frdm_kw41z/Kconfig.board deleted file mode 100644 index 7d4a5849f8b6d..0000000000000 --- a/boards/arm/frdm_kw41z/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# FRDM-KW41Z board - -# Copyright (c) 2017, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_FRDM_KW41Z - bool "NXP FRDM-KW41Z" - depends on SOC_SERIES_KINETIS_KWX - select SOC_PART_NUMBER_MKW41Z512VHT4 diff --git a/boards/arm/frdm_kw41z/Kconfig.defconfig b/boards/arm/frdm_kw41z/Kconfig.defconfig index 82f086cd7a5c6..c0341de06126e 100644 --- a/boards/arm/frdm_kw41z/Kconfig.defconfig +++ b/boards/arm/frdm_kw41z/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2017, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_FRDM_KW41Z - -config BOARD - default "frdm_kw41z" - config OSC_XTAL0_FREQ default 32000000 @@ -24,5 +19,3 @@ config FXOS8700_DRDY_INT1 choice ADC_MCUX_ADC16_VREF default ADC_MCUX_ADC16_VREF_ALTERNATE endchoice - -endif # BOARD_FRDM_KW41Z diff --git a/boards/arm/frdm_kw41z/Kconfig.frdm_kw41z b/boards/arm/frdm_kw41z/Kconfig.frdm_kw41z new file mode 100644 index 0000000000000..1dc80162f8b7b --- /dev/null +++ b/boards/arm/frdm_kw41z/Kconfig.frdm_kw41z @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_FRDM_KW41Z + bool + default y + select SOC_MKW41Z4 + select SOC_SERIES_KINETIS_KWX + select SOC_PART_NUMBER_MKW41Z512VHT4 diff --git a/boards/arm/frdm_kw41z/frdm_kw41z_defconfig b/boards/arm/frdm_kw41z/frdm_kw41z_defconfig index f72dbb5af6929..ec5a311d8fe6f 100644 --- a/boards/arm/frdm_kw41z/frdm_kw41z_defconfig +++ b/boards/arm/frdm_kw41z/frdm_kw41z_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_MKW41Z4=y -CONFIG_SOC_SERIES_KINETIS_KWX=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/fvp_baser_aemv8r_aarch32/Kconfig.board b/boards/arm/fvp_baser_aemv8r_aarch32/Kconfig.board deleted file mode 100644 index da1b202a128f6..0000000000000 --- a/boards/arm/fvp_baser_aemv8r_aarch32/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved. -# Copyright (c) 2022 IoT.bzh -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_FVP_BASER_AEMV8R_AARCH32 - bool "FVP BaseR AEMv8R AArch32 simulation board" - depends on SOC_FVP_AEMV8R_AARCH32 diff --git a/boards/arm/fvp_baser_aemv8r_aarch32/Kconfig.defconfig b/boards/arm/fvp_baser_aemv8r_aarch32/Kconfig.defconfig index 262313658822e..303a5bf42edb4 100644 --- a/boards/arm/fvp_baser_aemv8r_aarch32/Kconfig.defconfig +++ b/boards/arm/fvp_baser_aemv8r_aarch32/Kconfig.defconfig @@ -2,12 +2,5 @@ # Copyright (c) 2022 IoT.bzh # SPDX-License-Identifier: Apache-2.0 -if BOARD_FVP_BASER_AEMV8R_AARCH32 - config BUILD_OUTPUT_BIN default y - -config BOARD - default "fvp_baser_aemv8r_aarch32" - -endif # BOARD_FVP_BASER_AEMV8R_AARCH32 diff --git a/boards/arm/fvp_baser_aemv8r_aarch32/Kconfig.fvp_baser_aemv8r_aarch32 b/boards/arm/fvp_baser_aemv8r_aarch32/Kconfig.fvp_baser_aemv8r_aarch32 new file mode 100644 index 0000000000000..4510e7a56602d --- /dev/null +++ b/boards/arm/fvp_baser_aemv8r_aarch32/Kconfig.fvp_baser_aemv8r_aarch32 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_FVP_BASER_AEMV8R_AARCH32 + bool + default y + select SOC_SERIES_FVP_AEMV8R_AARCH32 + select SOC_FVP_AEMV8R_AARCH32 diff --git a/boards/arm/fvp_baser_aemv8r_aarch32/fvp_baser_aemv8r_aarch32_defconfig b/boards/arm/fvp_baser_aemv8r_aarch32/fvp_baser_aemv8r_aarch32_defconfig index d98d707096b6c..50af07dc6a537 100644 --- a/boards/arm/fvp_baser_aemv8r_aarch32/fvp_baser_aemv8r_aarch32_defconfig +++ b/boards/arm/fvp_baser_aemv8r_aarch32/fvp_baser_aemv8r_aarch32_defconfig @@ -2,9 +2,6 @@ # Copyright (c) 2022 IoT.bzh # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_FVP_AEMV8R_AARCH32=y -CONFIG_SOC_FVP_AEMV8R_AARCH32=y -CONFIG_BOARD_FVP_BASER_AEMV8R_AARCH32=y CONFIG_ARM_MPU=y CONFIG_ISR_STACK_SIZE=1024 diff --git a/boards/arm/gd32e103v_eval/Kconfig.board b/boards/arm/gd32e103v_eval/Kconfig.board deleted file mode 100644 index 848f4d82a6a36..0000000000000 --- a/boards/arm/gd32e103v_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021, YuLong Yao -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32E103V_EVAL - bool "GigaDevice GD32E103V Evaluation Kit" - depends on SOC_GD32E103 diff --git a/boards/arm/gd32e103v_eval/Kconfig.defconfig b/boards/arm/gd32e103v_eval/Kconfig.defconfig deleted file mode 100644 index 4681d2b2464a5..0000000000000 --- a/boards/arm/gd32e103v_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 YuLong Yao -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32E103V_EVAL - -config BOARD - default "gd32e103v_eval" - -endif # BOARD_GD32E103V_EVAL diff --git a/boards/arm/gd32e103v_eval/Kconfig.gd32e103v_eval b/boards/arm/gd32e103v_eval/Kconfig.gd32e103v_eval new file mode 100644 index 0000000000000..f29f81689cb17 --- /dev/null +++ b/boards/arm/gd32e103v_eval/Kconfig.gd32e103v_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32E103V_EVAL + bool + default y + select SOC_SERIES_GD32E10X + select SOC_GD32E103 diff --git a/boards/arm/gd32e103v_eval/gd32e103v_eval_defconfig b/boards/arm/gd32e103v_eval/gd32e103v_eval_defconfig index 6af9eba773fc3..62610d5d3ed84 100644 --- a/boards/arm/gd32e103v_eval/gd32e103v_eval_defconfig +++ b/boards/arm/gd32e103v_eval/gd32e103v_eval_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2021, YuLong Yao # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32E10X=y -CONFIG_SOC_GD32E103=y -CONFIG_BOARD_GD32E103V_EVAL=y CONFIG_GD32_HXTAL_8MHZ=y diff --git a/boards/arm/gd32e507v_start/Kconfig.board b/boards/arm/gd32e507v_start/Kconfig.board deleted file mode 100644 index 427e3c414acdb..0000000000000 --- a/boards/arm/gd32e507v_start/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32E507V_START - bool "GigaDevice GD32E507V-START" - depends on SOC_GD32E507 diff --git a/boards/arm/gd32e507v_start/Kconfig.defconfig b/boards/arm/gd32e507v_start/Kconfig.defconfig deleted file mode 100644 index c5ca16fd25be6..0000000000000 --- a/boards/arm/gd32e507v_start/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32E507V_START - -config BOARD - default "gd32e507v_start" - -endif # BOARD_GD32E507V_START diff --git a/boards/arm/gd32e507v_start/Kconfig.gd32e507v_start b/boards/arm/gd32e507v_start/Kconfig.gd32e507v_start new file mode 100644 index 0000000000000..b6c033d20d4d8 --- /dev/null +++ b/boards/arm/gd32e507v_start/Kconfig.gd32e507v_start @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32E507V_START + bool + default y + select SOC_SERIES_GD32E50X + select SOC_GD32E507 diff --git a/boards/arm/gd32e507v_start/gd32e507v_start_defconfig b/boards/arm/gd32e507v_start/gd32e507v_start_defconfig index 581cdd712b101..5ac121367bca0 100644 --- a/boards/arm/gd32e507v_start/gd32e507v_start_defconfig +++ b/boards/arm/gd32e507v_start/gd32e507v_start_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2022, Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32E50X=y -CONFIG_SOC_GD32E507=y -CONFIG_BOARD_GD32E507V_START=y CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32e507z_eval/Kconfig.board b/boards/arm/gd32e507z_eval/Kconfig.board deleted file mode 100644 index 0b9208ff8b791..0000000000000 --- a/boards/arm/gd32e507z_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32E507Z_EVAL - bool "GigaDevice GD32E507Z-EVAL" - depends on SOC_GD32E507 diff --git a/boards/arm/gd32e507z_eval/Kconfig.defconfig b/boards/arm/gd32e507z_eval/Kconfig.defconfig deleted file mode 100644 index 39e067ed59eea..0000000000000 --- a/boards/arm/gd32e507z_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32E507Z_EVAL - -config BOARD - default "gd32e507z_eval" - -endif # BOARD_GD32E507Z_EVAL diff --git a/boards/arm/gd32e507z_eval/Kconfig.gd32e507z_eval b/boards/arm/gd32e507z_eval/Kconfig.gd32e507z_eval new file mode 100644 index 0000000000000..8e42a3e2a2bb3 --- /dev/null +++ b/boards/arm/gd32e507z_eval/Kconfig.gd32e507z_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32E507Z_EVAL + bool + default y + select SOC_SERIES_GD32E50X + select SOC_GD32E507 diff --git a/boards/arm/gd32e507z_eval/gd32e507z_eval_defconfig b/boards/arm/gd32e507z_eval/gd32e507z_eval_defconfig index c6b1f6ad32ca3..5ac121367bca0 100644 --- a/boards/arm/gd32e507z_eval/gd32e507z_eval_defconfig +++ b/boards/arm/gd32e507z_eval/gd32e507z_eval_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2022, Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32E50X=y -CONFIG_SOC_GD32E507=y -CONFIG_BOARD_GD32E507Z_EVAL=y CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32f350r_eval/Kconfig.board b/boards/arm/gd32f350r_eval/Kconfig.board deleted file mode 100644 index b4fbc6635f7c8..0000000000000 --- a/boards/arm/gd32f350r_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 BrainCo Inc. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F350R_EVAL - bool "GigaDevice GD32F350R Evaluation Kit" - depends on SOC_GD32F350 diff --git a/boards/arm/gd32f350r_eval/Kconfig.defconfig b/boards/arm/gd32f350r_eval/Kconfig.defconfig deleted file mode 100644 index 1de5675fb9cd1..0000000000000 --- a/boards/arm/gd32f350r_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 BrainCo Inc. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F350R_EVAL - -config BOARD - default "gd32f350r_eval" - -endif # BOARD_GD32F350R_EVAL diff --git a/boards/arm/gd32f350r_eval/Kconfig.gd32f350r_eval b/boards/arm/gd32f350r_eval/Kconfig.gd32f350r_eval new file mode 100644 index 0000000000000..1fbfe09cde02d --- /dev/null +++ b/boards/arm/gd32f350r_eval/Kconfig.gd32f350r_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F350R_EVAL + bool + default y + select SOC_SERIES_GD32F3X0 + select SOC_GD32F350 diff --git a/boards/arm/gd32f350r_eval/gd32f350r_eval_defconfig b/boards/arm/gd32f350r_eval/gd32f350r_eval_defconfig index dfb61c38eb2ad..b1d2b58718e08 100644 --- a/boards/arm/gd32f350r_eval/gd32f350r_eval_defconfig +++ b/boards/arm/gd32f350r_eval/gd32f350r_eval_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2021 BrainCo Inc. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F3X0=y -CONFIG_SOC_GD32F350=y -CONFIG_BOARD_GD32F350R_EVAL=y CONFIG_CONSOLE=y diff --git a/boards/arm/gd32f403z_eval/Kconfig.board b/boards/arm/gd32f403z_eval/Kconfig.board deleted file mode 100644 index 97273a13f995a..0000000000000 --- a/boards/arm/gd32f403z_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021, ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F403Z_EVAL - bool "GigaDevice GD32F403Z Evaluation Kit" - depends on SOC_GD32F403 diff --git a/boards/arm/gd32f403z_eval/Kconfig.defconfig b/boards/arm/gd32f403z_eval/Kconfig.defconfig deleted file mode 100644 index 39f1df8e53764..0000000000000 --- a/boards/arm/gd32f403z_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F403Z_EVAL - -config BOARD - default "gd32f403z_eval" - -endif # BOARD_GD32F403Z_EVAL diff --git a/boards/arm/gd32f403z_eval/Kconfig.gd32f403z_eval b/boards/arm/gd32f403z_eval/Kconfig.gd32f403z_eval new file mode 100644 index 0000000000000..ccc22c7a535cc --- /dev/null +++ b/boards/arm/gd32f403z_eval/Kconfig.gd32f403z_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F403Z_EVAL + bool + default y + select SOC_SERIES_GD32F403 + select SOC_GD32F403 diff --git a/boards/arm/gd32f403z_eval/gd32f403z_eval_defconfig b/boards/arm/gd32f403z_eval/gd32f403z_eval_defconfig index 759c53a00ad67..68412cbed2b43 100644 --- a/boards/arm/gd32f403z_eval/gd32f403z_eval_defconfig +++ b/boards/arm/gd32f403z_eval/gd32f403z_eval_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2021, ATL Electronics # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F403=y -CONFIG_SOC_GD32F403=y -CONFIG_BOARD_GD32F403Z_EVAL=y CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32f407v_start/Kconfig.board b/boards/arm/gd32f407v_start/Kconfig.board deleted file mode 100644 index 541f1642e9312..0000000000000 --- a/boards/arm/gd32f407v_start/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, TOKITA Hiroshi -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F407V_START - bool "GigaDevice GD32F407V-START" - depends on SOC_GD32F407 diff --git a/boards/arm/gd32f407v_start/Kconfig.defconfig b/boards/arm/gd32f407v_start/Kconfig.defconfig deleted file mode 100644 index 888179c2f6231..0000000000000 --- a/boards/arm/gd32f407v_start/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022, TOKITA Hiroshi -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F407V_START - -config BOARD - default "gd32f407v_start" - -endif # BOARD_GD32F407V_START diff --git a/boards/arm/gd32f407v_start/Kconfig.gd32f407v_start b/boards/arm/gd32f407v_start/Kconfig.gd32f407v_start new file mode 100644 index 0000000000000..4ed70afa126cb --- /dev/null +++ b/boards/arm/gd32f407v_start/Kconfig.gd32f407v_start @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F407V_START + bool + default y + select SOC_SERIES_GD32F4XX + select SOC_GD32F407 diff --git a/boards/arm/gd32f407v_start/gd32f407v_start_defconfig b/boards/arm/gd32f407v_start/gd32f407v_start_defconfig index 1b9e3ff5e18b7..73e1057da5141 100644 --- a/boards/arm/gd32f407v_start/gd32f407v_start_defconfig +++ b/boards/arm/gd32f407v_start/gd32f407v_start_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2022, TOKITA Hiroshi # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F4XX=y -CONFIG_SOC_GD32F407=y -CONFIG_BOARD_GD32F407V_START=y CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32f450i_eval/Kconfig.board b/boards/arm/gd32f450i_eval/Kconfig.board deleted file mode 100644 index 257da26fd035c..0000000000000 --- a/boards/arm/gd32f450i_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021, Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F450I_EVAL - bool "GigaDevice GD32F450I-EVAL" - depends on SOC_GD32F450 diff --git a/boards/arm/gd32f450i_eval/Kconfig.defconfig b/boards/arm/gd32f450i_eval/Kconfig.defconfig deleted file mode 100644 index 3d7624c751e5d..0000000000000 --- a/boards/arm/gd32f450i_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F450I_EVAL - -config BOARD - default "gd32f450i_eval" - -endif # BOARD_GD32F450I_EVAL diff --git a/boards/arm/gd32f450i_eval/Kconfig.gd32f450i_eval b/boards/arm/gd32f450i_eval/Kconfig.gd32f450i_eval new file mode 100644 index 0000000000000..f302fc375c386 --- /dev/null +++ b/boards/arm/gd32f450i_eval/Kconfig.gd32f450i_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F450I_EVAL + bool + default y + select SOC_SERIES_GD32F4XX + select SOC_GD32F450 diff --git a/boards/arm/gd32f450i_eval/gd32f450i_eval_defconfig b/boards/arm/gd32f450i_eval/gd32f450i_eval_defconfig index 57db7c521eb58..48e713ca354a4 100644 --- a/boards/arm/gd32f450i_eval/gd32f450i_eval_defconfig +++ b/boards/arm/gd32f450i_eval/gd32f450i_eval_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2021, Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F4XX=y -CONFIG_SOC_GD32F450=y -CONFIG_BOARD_GD32F450I_EVAL=y CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32f450v_start/Kconfig.board b/boards/arm/gd32f450v_start/Kconfig.board deleted file mode 100644 index 7bd8cfbab73a8..0000000000000 --- a/boards/arm/gd32f450v_start/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F450V_START - bool "GigaDevice GD32F450V-START" - depends on SOC_GD32F450 diff --git a/boards/arm/gd32f450v_start/Kconfig.defconfig b/boards/arm/gd32f450v_start/Kconfig.defconfig deleted file mode 100644 index 3db890ec9d4a5..0000000000000 --- a/boards/arm/gd32f450v_start/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F450V_START - -config BOARD - default "gd32f450v_start" - -endif # BOARD_GD32F450V_START diff --git a/boards/arm/gd32f450v_start/Kconfig.gd32f450v_start b/boards/arm/gd32f450v_start/Kconfig.gd32f450v_start new file mode 100644 index 0000000000000..b754329a19cb5 --- /dev/null +++ b/boards/arm/gd32f450v_start/Kconfig.gd32f450v_start @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F450V_START + bool + default y + select SOC_SERIES_GD32F4XX + select SOC_GD32F450 diff --git a/boards/arm/gd32f450v_start/gd32f450v_start_defconfig b/boards/arm/gd32f450v_start/gd32f450v_start_defconfig index 0767cf26db1d5..5ac121367bca0 100644 --- a/boards/arm/gd32f450v_start/gd32f450v_start_defconfig +++ b/boards/arm/gd32f450v_start/gd32f450v_start_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2022, Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F4XX=y -CONFIG_SOC_GD32F450=y -CONFIG_BOARD_GD32F450V_START=y CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32f450z_eval/Kconfig.board b/boards/arm/gd32f450z_eval/Kconfig.board deleted file mode 100644 index 70ced41611024..0000000000000 --- a/boards/arm/gd32f450z_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, Rtone. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F450Z_EVAL - bool "GigaDevice GD32F450Z-EVAL" - depends on SOC_GD32F450 diff --git a/boards/arm/gd32f450z_eval/Kconfig.defconfig b/boards/arm/gd32f450z_eval/Kconfig.defconfig deleted file mode 100644 index 5c2ecc08b517e..0000000000000 --- a/boards/arm/gd32f450z_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022, Rtone. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F450Z_EVAL - -config BOARD - default "gd32f450z_eval" - -endif # BOARD_GD32F450Z_EVAL diff --git a/boards/arm/gd32f450z_eval/Kconfig.gd32f450z_eval b/boards/arm/gd32f450z_eval/Kconfig.gd32f450z_eval new file mode 100644 index 0000000000000..6035ae894291d --- /dev/null +++ b/boards/arm/gd32f450z_eval/Kconfig.gd32f450z_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F450Z_EVAL + bool + default y + select SOC_SERIES_GD32F4XX + select SOC_GD32F450 diff --git a/boards/arm/gd32f450z_eval/gd32f450z_eval_defconfig b/boards/arm/gd32f450z_eval/gd32f450z_eval_defconfig index 59bc8e32ded2f..634256f38a2c6 100644 --- a/boards/arm/gd32f450z_eval/gd32f450z_eval_defconfig +++ b/boards/arm/gd32f450z_eval/gd32f450z_eval_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2022, Rtone. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F4XX=y -CONFIG_SOC_GD32F450=y -CONFIG_BOARD_GD32F450Z_EVAL=y CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32f470i_eval/Kconfig.board b/boards/arm/gd32f470i_eval/Kconfig.board deleted file mode 100644 index e860b81a40352..0000000000000 --- a/boards/arm/gd32f470i_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, Rtone. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F470I_EVAL - bool "GigaDevice GD32F470I-EVAL" - depends on SOC_GD32F470 diff --git a/boards/arm/gd32f470i_eval/Kconfig.defconfig b/boards/arm/gd32f470i_eval/Kconfig.defconfig deleted file mode 100644 index 89cf5c68842d8..0000000000000 --- a/boards/arm/gd32f470i_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022, Rtone. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F470I_EVAL - -config BOARD - default "gd32f470i_eval" - -endif # BOARD_GD32F470I_EVAL diff --git a/boards/arm/gd32f470i_eval/Kconfig.gd32f470i_eval b/boards/arm/gd32f470i_eval/Kconfig.gd32f470i_eval new file mode 100644 index 0000000000000..37d597bdbc2b9 --- /dev/null +++ b/boards/arm/gd32f470i_eval/Kconfig.gd32f470i_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F470I_EVAL + bool + default y + select SOC_SERIES_GD32F4XX + select SOC_GD32F470 diff --git a/boards/arm/gd32f470i_eval/gd32f470i_eval_defconfig b/boards/arm/gd32f470i_eval/gd32f470i_eval_defconfig index 9a6f3a893d6e3..634256f38a2c6 100644 --- a/boards/arm/gd32f470i_eval/gd32f470i_eval_defconfig +++ b/boards/arm/gd32f470i_eval/gd32f470i_eval_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2022, Rtone. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F4XX=y -CONFIG_SOC_GD32F470=y -CONFIG_BOARD_GD32F470I_EVAL=y CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/google_kukui/Kconfig.board b/boards/arm/google_kukui/Kconfig.board deleted file mode 100644 index d3585a6bc2bae..0000000000000 --- a/boards/arm/google_kukui/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# Google Kukui EC - -# Copyright 2019 The Chromium OS Authors -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GOOGLE_KUKUI - bool "Google Kukui EC" - depends on SOC_STM32F098XX - help - This is the EC (Embedded Controller) inside a Lenovo Chromebook - Duet and 10e Chromebook Tablet. The EC handles battery charging, - keyboard scanning, USB Power Delivery and sensors. - - So far for Zephyr only a simple serial console and I2C are supported. diff --git a/boards/arm/google_kukui/Kconfig.defconfig b/boards/arm/google_kukui/Kconfig.defconfig deleted file mode 100644 index dc735470a35bf..0000000000000 --- a/boards/arm/google_kukui/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Google Kukui EC - -# Copyright 2019 The Chromium OS Authors -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GOOGLE_KUKUI - -config BOARD - default "google_kukui" - -endif # BOARD_GOOGLE_KUKUI diff --git a/boards/arm/google_kukui/Kconfig.google_kukui b/boards/arm/google_kukui/Kconfig.google_kukui new file mode 100644 index 0000000000000..2a7b9cb678fe5 --- /dev/null +++ b/boards/arm/google_kukui/Kconfig.google_kukui @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GOOGLE_KUKUI + bool + default y + select SOC_SERIES_STM32F0X + select SOC_STM32F098XX diff --git a/boards/arm/google_kukui/google_kukui_defconfig b/boards/arm/google_kukui/google_kukui_defconfig index 3390acdaec535..34c7d604c4841 100644 --- a/boards/arm/google_kukui/google_kukui_defconfig +++ b/boards/arm/google_kukui/google_kukui_defconfig @@ -1,11 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration -CONFIG_SOC_STM32F098XX=y -CONFIG_BOARD_GOOGLE_KUKUI=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/hexiwear_k64/Kconfig.board b/boards/arm/hexiwear_k64/Kconfig.board deleted file mode 100644 index 664294d51adc5..0000000000000 --- a/boards/arm/hexiwear_k64/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Hexiwear K64 board - -# Copyright (c) 2016, Freescale Semiconductor, Inc. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_HEXIWEAR_K64 - bool "NXP Hexiwear K64" - depends on SOC_SERIES_KINETIS_K6X - select SOC_PART_NUMBER_MK64FN1M0VDC12 diff --git a/boards/arm/hexiwear_k64/Kconfig.defconfig b/boards/arm/hexiwear_k64/Kconfig.defconfig index 8c00ebed8fc14..77539c40fc22d 100644 --- a/boards/arm/hexiwear_k64/Kconfig.defconfig +++ b/boards/arm/hexiwear_k64/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2016, Freescale Semiconductor, Inc. # SPDX-License-Identifier: Apache-2.0 -if BOARD_HEXIWEAR_K64 - -config BOARD - default "hexiwear_k64" - config OSC_XTAL0_FREQ default 12000000 @@ -22,5 +17,3 @@ config MCG_FCRDIV config REGULATOR default y if ADC || SENSOR - -endif # BOARD_HEXIWEAR_K64 diff --git a/boards/arm/hexiwear_k64/Kconfig.hexiwear_k64 b/boards/arm/hexiwear_k64/Kconfig.hexiwear_k64 new file mode 100644 index 0000000000000..d14eb893ff0dc --- /dev/null +++ b/boards/arm/hexiwear_k64/Kconfig.hexiwear_k64 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HEXIWEAR_K64 + bool + default y + select SOC_MK64F12 + select SOC_SERIES_KINETIS_K6X + select SOC_PART_NUMBER_MK64FN1M0VDC12 diff --git a/boards/arm/hexiwear_k64/hexiwear_k64_defconfig b/boards/arm/hexiwear_k64/hexiwear_k64_defconfig index 6a9303f32be6b..8609fa1f8da4b 100644 --- a/boards/arm/hexiwear_k64/hexiwear_k64_defconfig +++ b/boards/arm/hexiwear_k64/hexiwear_k64_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_MK64F12=y -CONFIG_SOC_SERIES_KINETIS_K6X=y -CONFIG_BOARD_HEXIWEAR_K64=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/hexiwear_kw40z/Kconfig.board b/boards/arm/hexiwear_kw40z/Kconfig.board deleted file mode 100644 index 10b0a98a44360..0000000000000 --- a/boards/arm/hexiwear_kw40z/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Hexiwear KW40Z board - -# Copyright (c) 2017, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_HEXIWEAR_KW40Z - bool "Hexiwear KW40Z" - depends on SOC_SERIES_KINETIS_KWX - select SOC_PART_NUMBER_MKW40Z160VHT4 diff --git a/boards/arm/hexiwear_kw40z/Kconfig.defconfig b/boards/arm/hexiwear_kw40z/Kconfig.defconfig index ef4f65381a845..244b552dd907f 100644 --- a/boards/arm/hexiwear_kw40z/Kconfig.defconfig +++ b/boards/arm/hexiwear_kw40z/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2017, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_HEXIWEAR_KW40Z - -config BOARD - default "hexiwear_kw40z" - config OSC_XTAL0_FREQ default 32000000 @@ -16,5 +11,3 @@ config MCG_FRDIV config MCG_FCRDIV default 0 - -endif # BOARD_HEXIWEAR_KW40Z diff --git a/boards/arm/hexiwear_kw40z/Kconfig.hexiwear_kw40z b/boards/arm/hexiwear_kw40z/Kconfig.hexiwear_kw40z new file mode 100644 index 0000000000000..54227edfb9c9e --- /dev/null +++ b/boards/arm/hexiwear_kw40z/Kconfig.hexiwear_kw40z @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HEXIWEAR_KW40Z + bool + default y + select SOC_MKW40Z4 + select SOC_SERIES_KINETIS_KWX + select SOC_PART_NUMBER_MKW40Z160VHT4 diff --git a/boards/arm/hexiwear_kw40z/hexiwear_kw40z_defconfig b/boards/arm/hexiwear_kw40z/hexiwear_kw40z_defconfig index e7bb17ffa8eb0..4f25cadc1eee4 100644 --- a/boards/arm/hexiwear_kw40z/hexiwear_kw40z_defconfig +++ b/boards/arm/hexiwear_kw40z/hexiwear_kw40z_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_MKW40Z4=y -CONFIG_SOC_SERIES_KINETIS_KWX=y -CONFIG_BOARD_HEXIWEAR_KW40Z=y CONFIG_CONSOLE=y CONFIG_RTT_CONSOLE=y CONFIG_USE_SEGGER_RTT=y diff --git a/boards/arm/holyiot_yj16019/Kconfig.board b/boards/arm/holyiot_yj16019/Kconfig.board deleted file mode 100644 index e49ebf908735f..0000000000000 --- a/boards/arm/holyiot_yj16019/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Holyiot YJ-16019 board configuration - -# Copyright (c) 2019 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_HOLYIOT_YJ16019 - bool "Holyiot YJ-16019" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/holyiot_yj16019/Kconfig.defconfig b/boards/arm/holyiot_yj16019/Kconfig.defconfig index 99373ad286ac5..ad4aaaf132cc9 100644 --- a/boards/arm/holyiot_yj16019/Kconfig.defconfig +++ b/boards/arm/holyiot_yj16019/Kconfig.defconfig @@ -3,15 +3,8 @@ # Copyright (c) 2019 Henrik Brix Andersen # SPDX-License-Identifier: Apache-2.0 -if BOARD_HOLYIOT_YJ16019 - -config BOARD - default "holyiot_yj16019" - config GPIO_AS_PINRESET default n config BT_CTLR default BT - -endif # BOARD_HOLYIOT_YJ16019 diff --git a/boards/arm/holyiot_yj16019/Kconfig.holyiot_yj16019 b/boards/arm/holyiot_yj16019/Kconfig.holyiot_yj16019 new file mode 100644 index 0000000000000..db0d5ca7997c2 --- /dev/null +++ b/boards/arm/holyiot_yj16019/Kconfig.holyiot_yj16019 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HOLYIOT_YJ16019 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/holyiot_yj16019/holyiot_yj16019_defconfig b/boards/arm/holyiot_yj16019/holyiot_yj16019_defconfig index 8cd91b6b694de..c212f6e26d348 100644 --- a/boards/arm/holyiot_yj16019/holyiot_yj16019_defconfig +++ b/boards/arm/holyiot_yj16019/holyiot_yj16019_defconfig @@ -1,7 +1,3 @@ -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_HOLYIOT_YJ16019=y - # 32kHz clock source CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y diff --git a/boards/arm/ip_k66f/Kconfig.board b/boards/arm/ip_k66f/Kconfig.board deleted file mode 100644 index ec73f2a88b1b8..0000000000000 --- a/boards/arm/ip_k66f/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2020 DENX Software Engineering GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_IP_K66F - bool "Segger IP-K66F" - depends on SOC_SERIES_KINETIS_K6X - select SOC_PART_NUMBER_MK66FN2M0VMD18 diff --git a/boards/arm/ip_k66f/Kconfig.defconfig b/boards/arm/ip_k66f/Kconfig.defconfig index 2543e52684a10..72e85464553bd 100644 --- a/boards/arm/ip_k66f/Kconfig.defconfig +++ b/boards/arm/ip_k66f/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2020 DENX Software Engineering GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_IP_K66F - -config BOARD - default "ip_k66f" - config OSC_XTAL0_FREQ default 12000000 @@ -32,5 +27,3 @@ config ETH_MCUX_NO_PHY_SMI default y if ETH_MCUX endif # NETWORKING - -endif # BOARD_IP_K66F diff --git a/boards/arm/ip_k66f/Kconfig.ip_k66f b/boards/arm/ip_k66f/Kconfig.ip_k66f new file mode 100644 index 0000000000000..4877a08dd909e --- /dev/null +++ b/boards/arm/ip_k66f/Kconfig.ip_k66f @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_IP_K66F + bool + default y + select SOC_MK66F18 + select SOC_SERIES_KINETIS_K6X + select SOC_PART_NUMBER_MK66FN2M0VMD18 diff --git a/boards/arm/ip_k66f/ip_k66f_defconfig b/boards/arm/ip_k66f/ip_k66f_defconfig index 6bb29071f79f6..3a283228fafe6 100644 --- a/boards/arm/ip_k66f/ip_k66f_defconfig +++ b/boards/arm/ip_k66f/ip_k66f_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_MK66F18=y -CONFIG_SOC_SERIES_KINETIS_K6X=y -CONFIG_BOARD_IP_K66F=y CONFIG_GPIO=y CONFIG_PINCTRL=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=180000000 diff --git a/boards/arm/legend/Kconfig.board b/boards/arm/legend/Kconfig.board deleted file mode 100644 index 6820a8c0dcd6d..0000000000000 --- a/boards/arm/legend/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Legend board family configuration - -# Copyright (c) 2021 Seagate Technology -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LEGEND - bool "Legend board" - depends on SOC_STM32F070XB diff --git a/boards/arm/legend/Kconfig.defconfig b/boards/arm/legend/Kconfig.defconfig index 06c47f232fd8d..806c00035261d 100644 --- a/boards/arm/legend/Kconfig.defconfig +++ b/boards/arm/legend/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2021, Seagate Technology LLC # SPDX-License-Identifier: Apache-2.0 -if BOARD_LEGEND - -config BOARD - default "legend" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_LEGEND diff --git a/boards/arm/legend/Kconfig.legend b/boards/arm/legend/Kconfig.legend new file mode 100644 index 0000000000000..83c2e9bb992a8 --- /dev/null +++ b/boards/arm/legend/Kconfig.legend @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LEGEND + bool + default y + select SOC_SERIES_STM32F0X + select SOC_STM32F070XB diff --git a/boards/arm/legend/legend_defconfig b/boards/arm/legend/legend_defconfig index 1ab444cc39b05..fcf4342aa39b3 100644 --- a/boards/arm/legend/legend_defconfig +++ b/boards/arm/legend/legend_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration -CONFIG_SOC_STM32F070XB=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/lora_e5_dev_board/Kconfig.board b/boards/arm/lora_e5_dev_board/Kconfig.board deleted file mode 100644 index 78fd5de63cd8e..0000000000000 --- a/boards/arm/lora_e5_dev_board/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# LoRa-E5 Dev board configuration - -# Copyright (c) 2021 Thomas Stranger -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LORA_E5_DEV_BOARD - bool "LoRa E5 Development Board" - depends on SOC_STM32WLE5XX diff --git a/boards/arm/lora_e5_dev_board/Kconfig.defconfig b/boards/arm/lora_e5_dev_board/Kconfig.defconfig deleted file mode 100644 index 857cd45e6842f..0000000000000 --- a/boards/arm/lora_e5_dev_board/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# LoRa-E5 Dev board configuration - -# Copyright (c) 2021 Thomas Stranger -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_LORA_E5_DEV_BOARD - -config BOARD - default "lora_e5_dev_board" - -endif # BOARD_LORA_E5_DEV_BOARD diff --git a/boards/arm/lora_e5_dev_board/Kconfig.lora_e5_dev_board b/boards/arm/lora_e5_dev_board/Kconfig.lora_e5_dev_board new file mode 100644 index 0000000000000..1fcd4525f303c --- /dev/null +++ b/boards/arm/lora_e5_dev_board/Kconfig.lora_e5_dev_board @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LORA_E5_DEV_BOARD + bool + default y + select SOC_SERIES_STM32WLX + select SOC_STM32WLE5XX diff --git a/boards/arm/lora_e5_dev_board/lora_e5_dev_board_defconfig b/boards/arm/lora_e5_dev_board/lora_e5_dev_board_defconfig index 912493764e21d..98cedbd0b4c65 100644 --- a/boards/arm/lora_e5_dev_board/lora_e5_dev_board_defconfig +++ b/boards/arm/lora_e5_dev_board/lora_e5_dev_board_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_STM32WLX=y -CONFIG_SOC_STM32WLE5XX=y - # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/lpcxpresso11u68/Kconfig.board b/boards/arm/lpcxpresso11u68/Kconfig.board deleted file mode 100644 index 721104975a2de..0000000000000 --- a/boards/arm/lpcxpresso11u68/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# LPCXpresso11U68 board - -# Copyright (c) 2020, Seagate -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LPCXPRESSO11U68 - bool "NXP LPCXPRESSO-11U68" - depends on SOC_SERIES_LPC11U6X - select SOC_PART_NUMBER_LPC11U68JBD100 diff --git a/boards/arm/lpcxpresso11u68/Kconfig.defconfig b/boards/arm/lpcxpresso11u68/Kconfig.defconfig deleted file mode 100644 index da0fd7aacacdf..0000000000000 --- a/boards/arm/lpcxpresso11u68/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# LPCXpresso11U68 board - -# Copyright (c) 2020, Seagate -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_LPCXPRESSO11U68 - -config BOARD - default "lpcxpresso11u68" - -endif # BOARD_LPCXPRESSO11U68 diff --git a/boards/arm/lpcxpresso11u68/Kconfig.lpcxpresso11u68 b/boards/arm/lpcxpresso11u68/Kconfig.lpcxpresso11u68 new file mode 100644 index 0000000000000..e7b50718dd84e --- /dev/null +++ b/boards/arm/lpcxpresso11u68/Kconfig.lpcxpresso11u68 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LPCXPRESSO11U68 + bool + default y + select SOC_SERIES_LPC11U6X + select SOC_LPC11U68 + select SOC_PART_NUMBER_LPC11U68JBD100 diff --git a/boards/arm/lpcxpresso11u68/lpcxpresso11u68_defconfig b/boards/arm/lpcxpresso11u68/lpcxpresso11u68_defconfig index 45ee27f2f7249..523128641eaf8 100644 --- a/boards/arm/lpcxpresso11u68/lpcxpresso11u68_defconfig +++ b/boards/arm/lpcxpresso11u68/lpcxpresso11u68_defconfig @@ -2,7 +2,6 @@ CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 CONFIG_GPIO=y CONFIG_BUILD_OUTPUT_HEX=y -CONFIG_SOC_SERIES_LPC11U6X=y # Since the board has little memory (32k), stack sizes are lowered # so that the application has more RAM for itself. CONFIG_MAIN_STACK_SIZE=512 diff --git a/boards/arm/lpcxpresso51u68/Kconfig.board b/boards/arm/lpcxpresso51u68/Kconfig.board deleted file mode 100644 index 21ae8f8571a2a..0000000000000 --- a/boards/arm/lpcxpresso51u68/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# LPCXpresso51U68 board - -# Copyright (c) 2021 metraTec GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LPCXPRESSO51U68 - bool "NXP LPCXPRESSO-51U68" - depends on SOC_SERIES_LPC51U68 - select SOC_PART_NUMBER_LPC51U68JBD64 diff --git a/boards/arm/lpcxpresso51u68/Kconfig.defconfig b/boards/arm/lpcxpresso51u68/Kconfig.defconfig deleted file mode 100644 index 6d8144da6921f..0000000000000 --- a/boards/arm/lpcxpresso51u68/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# LPCXpresso51U68 board - -# Copyright (c) 2021 metraTec GmbH -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_LPCXPRESSO51U68 - -config BOARD - default "lpcxpresso51u68" - -endif # BOARD_LPCXPRESSO51U68 diff --git a/boards/arm/lpcxpresso51u68/Kconfig.lpcxpresso51u68 b/boards/arm/lpcxpresso51u68/Kconfig.lpcxpresso51u68 new file mode 100644 index 0000000000000..a9160e29e2df5 --- /dev/null +++ b/boards/arm/lpcxpresso51u68/Kconfig.lpcxpresso51u68 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LPCXPRESSO51U68 + bool + default y + select SOC_SERIES_LPC51U68 + select SOC_LPC51U68 + select SOC_PART_NUMBER_LPC51U68JBD64 diff --git a/boards/arm/lpcxpresso51u68/lpcxpresso51u68_defconfig b/boards/arm/lpcxpresso51u68/lpcxpresso51u68_defconfig index 1c5669285f896..50e3b593d0e33 100644 --- a/boards/arm/lpcxpresso51u68/lpcxpresso51u68_defconfig +++ b/boards/arm/lpcxpresso51u68/lpcxpresso51u68_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_LPC51U68=y -CONFIG_SOC_LPC51U68=y -CONFIG_BOARD_LPCXPRESSO51U68=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/lpcxpresso54114/Kconfig.board b/boards/arm/lpcxpresso54114/Kconfig.board deleted file mode 100644 index ad0e5f55a6183..0000000000000 --- a/boards/arm/lpcxpresso54114/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# LPCXpresso54114 board - -# Copyright (c) 2017, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LPCXPRESSO54114_M4 - bool "NXP LPCXPRESSO-54114 M4" - depends on SOC_SERIES_LPC54XXX - select SOC_PART_NUMBER_LPC54114J256BD64 - -config BOARD_LPCXPRESSO54114_M0 - bool "NXP LPCXPRESSO-54114 M0" - depends on SOC_SERIES_LPC54XXX - select SOC_PART_NUMBER_LPC54114J256BD64 diff --git a/boards/arm/lpcxpresso54114/Kconfig.defconfig b/boards/arm/lpcxpresso54114/Kconfig.defconfig deleted file mode 100644 index 8621f98ea18a7..0000000000000 --- a/boards/arm/lpcxpresso54114/Kconfig.defconfig +++ /dev/null @@ -1,12 +0,0 @@ -# LPCXpresso54114 board - -# Copyright (c) 2017, NXP -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_LPCXPRESSO54114_M4 || BOARD_LPCXPRESSO54114_M0 - -config BOARD - default "lpcxpresso54114_m4" if BOARD_LPCXPRESSO54114_M4 - default "lpcxpresso54114_m0" if BOARD_LPCXPRESSO54114_M0 - -endif # BOARD_LPCXPRESSO54114_M4 || BOARD_LPCXPRESSO54114_M0 diff --git a/boards/arm/lpcxpresso54114/Kconfig.lpcxpresso54114_m0 b/boards/arm/lpcxpresso54114/Kconfig.lpcxpresso54114_m0 new file mode 100644 index 0000000000000..9182c312dbb73 --- /dev/null +++ b/boards/arm/lpcxpresso54114/Kconfig.lpcxpresso54114_m0 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LPCXPRESSO54114_M0 + bool + default y + select SOC_LPC54114_M0 + select SOC_SERIES_LPC54XXX + select SOC_PART_NUMBER_LPC54114J256BD64 diff --git a/boards/arm/lpcxpresso54114/Kconfig.lpcxpresso54114_m4 b/boards/arm/lpcxpresso54114/Kconfig.lpcxpresso54114_m4 new file mode 100644 index 0000000000000..c2589c7eef808 --- /dev/null +++ b/boards/arm/lpcxpresso54114/Kconfig.lpcxpresso54114_m4 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LPCXPRESSO54114_M4 + bool + default y + select SOC_LPC54114_M4 + select SOC_SERIES_LPC54XXX + select SOC_PART_NUMBER_LPC54114J256BD64 diff --git a/boards/arm/lpcxpresso54114/lpcxpresso54114_m0_defconfig b/boards/arm/lpcxpresso54114/lpcxpresso54114_m0_defconfig index a6a7ebc28a130..4968668a62a7c 100644 --- a/boards/arm/lpcxpresso54114/lpcxpresso54114_m0_defconfig +++ b/boards/arm/lpcxpresso54114/lpcxpresso54114_m0_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_LPC54114_M0=y -CONFIG_SOC_SERIES_LPC54XXX=y -CONFIG_BOARD_LPCXPRESSO54114_M0=y CONFIG_USE_SEGGER_RTT=y CONFIG_SERIAL=n CONFIG_GPIO=n diff --git a/boards/arm/lpcxpresso54114/lpcxpresso54114_m4_defconfig b/boards/arm/lpcxpresso54114/lpcxpresso54114_m4_defconfig index 3749cbba716f8..a1ab28ee531a7 100644 --- a/boards/arm/lpcxpresso54114/lpcxpresso54114_m4_defconfig +++ b/boards/arm/lpcxpresso54114/lpcxpresso54114_m4_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_LPC54114_M4=y -CONFIG_SOC_SERIES_LPC54XXX=y -CONFIG_BOARD_LPCXPRESSO54114_M4=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/lpcxpresso55s06/Kconfig.board b/boards/arm/lpcxpresso55s06/Kconfig.board deleted file mode 100644 index 516f098775c0d..0000000000000 --- a/boards/arm/lpcxpresso55s06/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# LPCXpresso55S06 board - -# Copyright (c) 2022 metraTec -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LPCXPRESSO55S06 - bool "NXP LPCXPRESSO-55S06" - depends on SOC_SERIES_LPC55XXX - select SOC_PART_NUMBER_LPC55S06JBD64 diff --git a/boards/arm/lpcxpresso55s06/Kconfig.defconfig b/boards/arm/lpcxpresso55s06/Kconfig.defconfig deleted file mode 100644 index 57d53c1489ac6..0000000000000 --- a/boards/arm/lpcxpresso55s06/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# LPCXpresso55S06 board - -# Copyright (c) 2022 metraTec -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_LPCXPRESSO55S06 - -config BOARD - default "lpcxpresso55s06" - -endif # BOARD_LPCXPRESSO55S06 diff --git a/boards/arm/lpcxpresso55s06/Kconfig.lpcxpresso55s06 b/boards/arm/lpcxpresso55s06/Kconfig.lpcxpresso55s06 new file mode 100644 index 0000000000000..544b60c43a0a3 --- /dev/null +++ b/boards/arm/lpcxpresso55s06/Kconfig.lpcxpresso55s06 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LPCXPRESSO55S06 + bool + default y + select SOC_SERIES_LPC55XXX + select SOC_LPC55S06 + select SOC_PART_NUMBER_LPC55S06JBD64 diff --git a/boards/arm/lpcxpresso55s06/lpcxpresso55s06_defconfig b/boards/arm/lpcxpresso55s06/lpcxpresso55s06_defconfig index b239a73b8c0c4..8419e4bd50c1b 100644 --- a/boards/arm/lpcxpresso55s06/lpcxpresso55s06_defconfig +++ b/boards/arm/lpcxpresso55s06/lpcxpresso55s06_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_LPC55XXX=y -CONFIG_SOC_LPC55S06=y -CONFIG_BOARD_LPCXPRESSO55S06=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/lpcxpresso55s16/Kconfig.board b/boards/arm/lpcxpresso55s16/Kconfig.board deleted file mode 100644 index 0a39989427f25..0000000000000 --- a/boards/arm/lpcxpresso55s16/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# LPCXpresso55S16 board - -# Copyright (c) 2020 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LPCXPRESSO55S16 - bool "NXP LPCXPRESSO-55S16" - depends on SOC_SERIES_LPC55XXX - select SOC_PART_NUMBER_LPC55S16JBD100 diff --git a/boards/arm/lpcxpresso55s16/Kconfig.defconfig b/boards/arm/lpcxpresso55s16/Kconfig.defconfig index 49ed6830ed2e6..6beeaf11ac1b3 100644 --- a/boards/arm/lpcxpresso55s16/Kconfig.defconfig +++ b/boards/arm/lpcxpresso55s16/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2020 Henrik Brix Andersen # SPDX-License-Identifier: Apache-2.0 -if BOARD_LPCXPRESSO55S16 - -config BOARD - default "lpcxpresso55S16" - config FXOS8700_DRDY_INT1 default y depends on FXOS8700_TRIGGER - -endif # BOARD_LPCXPRESSO55S16 diff --git a/boards/arm/lpcxpresso55s16/Kconfig.lpcxpresso55s16 b/boards/arm/lpcxpresso55s16/Kconfig.lpcxpresso55s16 new file mode 100644 index 0000000000000..1b895ef9418a5 --- /dev/null +++ b/boards/arm/lpcxpresso55s16/Kconfig.lpcxpresso55s16 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LPCXPRESSO55S16 + bool + default y + select SOC_SERIES_LPC55XXX + select SOC_LPC55S16 + select SOC_PART_NUMBER_LPC55S16JBD100 diff --git a/boards/arm/lpcxpresso55s16/lpcxpresso55s16_defconfig b/boards/arm/lpcxpresso55s16/lpcxpresso55s16_defconfig index 1c7617436cee7..be6b21ed01920 100644 --- a/boards/arm/lpcxpresso55s16/lpcxpresso55s16_defconfig +++ b/boards/arm/lpcxpresso55s16/lpcxpresso55s16_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_LPC55XXX=y -CONFIG_SOC_LPC55S16=y -CONFIG_BOARD_LPCXPRESSO55S16=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/lpcxpresso55s28/Kconfig.board b/boards/arm/lpcxpresso55s28/Kconfig.board deleted file mode 100644 index 871dd381a1f3f..0000000000000 --- a/boards/arm/lpcxpresso55s28/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# LPCXpresso55S28 board - -# Copyright (c) 2020 Lemonbeat GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LPCXPRESSO55S28 - bool "NXP LPCXPRESSO-55S28" - depends on SOC_SERIES_LPC55XXX - select SOC_PART_NUMBER_LPC55S28JBD100 diff --git a/boards/arm/lpcxpresso55s28/Kconfig.defconfig b/boards/arm/lpcxpresso55s28/Kconfig.defconfig index 62b78f42eec74..c08a5c1a13e6e 100644 --- a/boards/arm/lpcxpresso55s28/Kconfig.defconfig +++ b/boards/arm/lpcxpresso55s28/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2020 Lemonbeat GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_LPCXPRESSO55S28 - -config BOARD - default "lpcxpresso55S28" - if FXOS8700 choice FXOS8700_MODE @@ -37,8 +32,6 @@ config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) depends on BOARD_LPCXPRESSO55S28 && TRUSTED_EXECUTION_SECURE -endif # BOARD_LPCXPRESSO55S28 - if DMA_MCUX_LPC # Memory from the heap pool is used to allocate DMA descriptors for diff --git a/boards/arm/lpcxpresso55s28/Kconfig.lpcxpresso55s28 b/boards/arm/lpcxpresso55s28/Kconfig.lpcxpresso55s28 new file mode 100644 index 0000000000000..9985725d248a0 --- /dev/null +++ b/boards/arm/lpcxpresso55s28/Kconfig.lpcxpresso55s28 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LPCXPRESSO55S28 + bool + default y + select SOC_SERIES_LPC55XXX + select SOC_LPC55S28 + select SOC_PART_NUMBER_LPC55S28JBD100 diff --git a/boards/arm/lpcxpresso55s28/lpcxpresso55s28_defconfig b/boards/arm/lpcxpresso55s28/lpcxpresso55s28_defconfig index d99a3d01c5599..c06c52a4f6b9e 100644 --- a/boards/arm/lpcxpresso55s28/lpcxpresso55s28_defconfig +++ b/boards/arm/lpcxpresso55s28/lpcxpresso55s28_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_LPC55XXX=y -CONFIG_SOC_LPC55S28=y -CONFIG_BOARD_LPCXPRESSO55S28=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/lpcxpresso55s36/Kconfig.board b/boards/arm/lpcxpresso55s36/Kconfig.board deleted file mode 100644 index afa4f1133852c..0000000000000 --- a/boards/arm/lpcxpresso55s36/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# LPCXpresso55S36 board - -# Copyright 2022 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LPCXPRESSO55S36 - bool "NXP LPCXPRESSO-55S36" - depends on SOC_SERIES_LPC55XXX - select SOC_PART_NUMBER_LPC55S36JBD100 diff --git a/boards/arm/lpcxpresso55s36/Kconfig.defconfig b/boards/arm/lpcxpresso55s36/Kconfig.defconfig deleted file mode 100644 index 3f3b1305bf796..0000000000000 --- a/boards/arm/lpcxpresso55s36/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# LPCXpresso55S36 board - -# Copyright 2022 NXP -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_LPCXPRESSO55S36 - -config BOARD - default "lpcxpresso55s36" - -endif # BOARD_LPCXPRESSO55S36 diff --git a/boards/arm/lpcxpresso55s36/Kconfig.lpcxpresso55s36 b/boards/arm/lpcxpresso55s36/Kconfig.lpcxpresso55s36 new file mode 100644 index 0000000000000..7043d95250358 --- /dev/null +++ b/boards/arm/lpcxpresso55s36/Kconfig.lpcxpresso55s36 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LPCXPRESSO55S36 + bool + default y + select SOC_SERIES_LPC55XXX + select SOC_LPC55S36 + select SOC_PART_NUMBER_LPC55S36JBD100 diff --git a/boards/arm/lpcxpresso55s36/lpcxpresso55s36_defconfig b/boards/arm/lpcxpresso55s36/lpcxpresso55s36_defconfig index 40c1b5fec75a6..4b3859199dcdb 100644 --- a/boards/arm/lpcxpresso55s36/lpcxpresso55s36_defconfig +++ b/boards/arm/lpcxpresso55s36/lpcxpresso55s36_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_LPC55XXX=y -CONFIG_SOC_LPC55S36=y -CONFIG_BOARD_LPCXPRESSO55S36=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/lpcxpresso55s69/Kconfig.board b/boards/arm/lpcxpresso55s69/Kconfig.board deleted file mode 100644 index afdf017e36b7e..0000000000000 --- a/boards/arm/lpcxpresso55s69/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# LPCXpresso55S69 board - -# Copyright (c) 2019, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LPCXPRESSO55S69_CPU0 - bool "NXP LPCXPRESSO-55S69 [CPU0]" - depends on SOC_SERIES_LPC55XXX - select SOC_PART_NUMBER_LPC55S69JBD100 - -config BOARD_LPCXPRESSO55S69_CPU1 - bool "NXP LPCXPRESSO-55S69 [CPU1]" - depends on SOC_SERIES_LPC55XXX - select SOC_PART_NUMBER_LPC55S69JBD100 diff --git a/boards/arm/lpcxpresso55s69/Kconfig.defconfig b/boards/arm/lpcxpresso55s69/Kconfig.defconfig index ff70c42bf4359..f0886b99623d7 100644 --- a/boards/arm/lpcxpresso55s69/Kconfig.defconfig +++ b/boards/arm/lpcxpresso55s69/Kconfig.defconfig @@ -3,12 +3,6 @@ # Copyright (c) 2019, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_LPCXPRESSO55S69_CPU0 || BOARD_LPCXPRESSO55S69_CPU1 - -config BOARD - default "lpcxpresso55S69_cpu0" if BOARD_LPCXPRESSO55S69_CPU0 - default "lpcxpresso55S69_cpu1" if BOARD_LPCXPRESSO55S69_CPU1 - if FXOS8700 choice FXOS8700_MODE @@ -59,8 +53,6 @@ endchoice config DISK_DRIVER_SDMMC default y if DISK_DRIVERS -endif # BOARD_LPCXPRESSO55S69_CPU0 || BOARD_LPCXPRESSO55S69_CPU1 - if DMA_MCUX_LPC # Memory from the heap pool is used to allocate DMA descriptors for diff --git a/boards/arm/lpcxpresso55s69/Kconfig.lpcxpresso55s69_cpu0 b/boards/arm/lpcxpresso55s69/Kconfig.lpcxpresso55s69_cpu0 new file mode 100644 index 0000000000000..aa2160a3c7060 --- /dev/null +++ b/boards/arm/lpcxpresso55s69/Kconfig.lpcxpresso55s69_cpu0 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LPCXPRESSO55S69_CPU0 + bool + default y + select SOC_SERIES_LPC55XXX + select SOC_LPC55S69_CPU0 + select SOC_PART_NUMBER_LPC55S69JBD100 diff --git a/boards/arm/lpcxpresso55s69/Kconfig.lpcxpresso55s69_cpu1 b/boards/arm/lpcxpresso55s69/Kconfig.lpcxpresso55s69_cpu1 new file mode 100644 index 0000000000000..34a7cda5693e2 --- /dev/null +++ b/boards/arm/lpcxpresso55s69/Kconfig.lpcxpresso55s69_cpu1 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LPCXPRESSO55S69_CPU1 + bool + default y + select SOC_SERIES_LPC55XXX + select SOC_LPC55S69_CPU1 + select SOC_PART_NUMBER_LPC55S69JBD100 diff --git a/boards/arm/lpcxpresso55s69/Kconfig.lpcxpresso55s69_ns b/boards/arm/lpcxpresso55s69/Kconfig.lpcxpresso55s69_ns new file mode 100644 index 0000000000000..ef627ce4fc372 --- /dev/null +++ b/boards/arm/lpcxpresso55s69/Kconfig.lpcxpresso55s69_ns @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LPCXPRESSO55S69_NS + bool + default y + select SOC_SERIES_LPC55XXX + select SOC_LPC55S69_CPU0 + select SOC_PART_NUMBER_LPC55S69JBD100 diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0_defconfig b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0_defconfig index f6bfb945eec76..991d4629c9aca 100644 --- a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0_defconfig +++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_LPC55XXX=y -CONFIG_SOC_LPC55S69_CPU0=y -CONFIG_BOARD_LPCXPRESSO55S69_CPU0=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1_defconfig b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1_defconfig index 63d748062212b..ef9ce513e51c6 100644 --- a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1_defconfig +++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_LPC55XXX=y -CONFIG_SOC_LPC55S69_CPU1=y -CONFIG_BOARD_LPCXPRESSO55S69_CPU1=y CONFIG_GPIO=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000 CONFIG_PINCTRL=y diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_ns_defconfig b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_ns_defconfig index a82f0241fed80..f90e185576880 100644 --- a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_ns_defconfig +++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_ns_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_LPC55XXX=y -CONFIG_SOC_LPC55S69_CPU0=y -CONFIG_BOARD_LPCXPRESSO55S69_CPU0=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mec1501modular_assy6885/Kconfig.board b/boards/arm/mec1501modular_assy6885/Kconfig.board deleted file mode 100644 index 0e9b720abb7cd..0000000000000 --- a/boards/arm/mec1501modular_assy6885/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2019, Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MEC1501MODULAR_ASSY6885 - bool "Microchip MEC1501 Modular ASSY 6885 Development board" - depends on SOC_MEC1501_HSZ diff --git a/boards/arm/mec1501modular_assy6885/Kconfig.defconfig b/boards/arm/mec1501modular_assy6885/Kconfig.defconfig index b22c410d8a30a..c4216aabc26b9 100644 --- a/boards/arm/mec1501modular_assy6885/Kconfig.defconfig +++ b/boards/arm/mec1501modular_assy6885/Kconfig.defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2019 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -if BOARD_MEC1501MODULAR_ASSY6885 - -config BOARD - default "mec1501modular_assy6885" - #PS/2 driver is compiled in terms of this flag. config ESPI_PERIPHERAL_8042_KBC default y @@ -45,5 +40,3 @@ config ESPI_PERIPHERAL_UART_SOC_MAPPING endif # ESPI endif # RTOS_TIMER - -endif # BOARD_MEC1501MODULAR_ASSY6885 diff --git a/boards/arm/mec1501modular_assy6885/Kconfig.mec1501modular_assy6885 b/boards/arm/mec1501modular_assy6885/Kconfig.mec1501modular_assy6885 new file mode 100644 index 0000000000000..f66f5a07b58a6 --- /dev/null +++ b/boards/arm/mec1501modular_assy6885/Kconfig.mec1501modular_assy6885 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MEC1501MODULAR_ASSY6885 + bool + default y + select SOC_MEC1501_HSZ + select SOC_SERIES_MEC1501X + select SOC_MEC1501_VCI_PINS_AS_GPIOS diff --git a/boards/arm/mec1501modular_assy6885/mec1501modular_assy6885_defconfig b/boards/arm/mec1501modular_assy6885/mec1501modular_assy6885_defconfig index cbfc39a80fc32..e0501e6a7f049 100644 --- a/boards/arm/mec1501modular_assy6885/mec1501modular_assy6885_defconfig +++ b/boards/arm/mec1501modular_assy6885/mec1501modular_assy6885_defconfig @@ -4,12 +4,8 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MEC1501_HSZ=y -CONFIG_SOC_SERIES_MEC1501X=y # Make sure external power management setup is as indicated in documentation CONFIG_SOC_MEC1501_VTR3_1_8V=y -CONFIG_SOC_MEC1501_VCI_PINS_AS_GPIOS=n -CONFIG_BOARD_MEC1501MODULAR_ASSY6885=y CONFIG_RTOS_TIMER=y CONFIG_CONSOLE=y diff --git a/boards/arm/mec15xxevb_assy6853/Kconfig.board b/boards/arm/mec15xxevb_assy6853/Kconfig.board deleted file mode 100644 index fb7158fb795c7..0000000000000 --- a/boards/arm/mec15xxevb_assy6853/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2019, Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MEC15XXEVB_ASSY6853 - bool "Microchip MEC15XX EVB ASSY 6853 Development board" - depends on SOC_MEC1501_HSZ diff --git a/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig b/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig index 99c5fbeb1dd41..2fbf362e3989f 100644 --- a/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig +++ b/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2019 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -if BOARD_MEC15XXEVB_ASSY6853 - -config BOARD - default "mec15xxevb_assy6853" - config ESPI_XEC default y depends on ESPI @@ -38,5 +33,3 @@ config SYS_CLOCK_TICKS_PER_SEC default 1000 endif # RTOS_TIMER - -endif # BOARD_MEC15XXEVB_ASSY6853 diff --git a/boards/arm/mec15xxevb_assy6853/Kconfig.mec15xxevb_assy6853 b/boards/arm/mec15xxevb_assy6853/Kconfig.mec15xxevb_assy6853 new file mode 100644 index 0000000000000..8e7e434b4f962 --- /dev/null +++ b/boards/arm/mec15xxevb_assy6853/Kconfig.mec15xxevb_assy6853 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MEC15XXEVB_ASSY6853 + bool + default y + select SOC_MEC1501_HSZ + select SOC_SERIES_MEC1501X diff --git a/boards/arm/mec15xxevb_assy6853/mec15xxevb_assy6853_defconfig b/boards/arm/mec15xxevb_assy6853/mec15xxevb_assy6853_defconfig index be5f25373591d..b88d1fd730ce0 100644 --- a/boards/arm/mec15xxevb_assy6853/mec15xxevb_assy6853_defconfig +++ b/boards/arm/mec15xxevb_assy6853/mec15xxevb_assy6853_defconfig @@ -4,10 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MEC1501_HSZ=y -CONFIG_SOC_SERIES_MEC1501X=y CONFIG_SOC_MEC1501_VTR3_1_8V=y -CONFIG_BOARD_MEC15XXEVB_ASSY6853=y CONFIG_RTOS_TIMER=y CONFIG_CONSOLE=y diff --git a/boards/arm/mec172xevb_assy6906/Kconfig.board b/boards/arm/mec172xevb_assy6906/Kconfig.board deleted file mode 100644 index df628d000ee02..0000000000000 --- a/boards/arm/mec172xevb_assy6906/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021, Microchip Technology Inc. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MEC172XEVB_ASSY6906 - bool "Microchip MEC172X EVB ASSY 6906 Development board" - depends on SOC_MEC172X_NSZ diff --git a/boards/arm/mec172xevb_assy6906/Kconfig.defconfig b/boards/arm/mec172xevb_assy6906/Kconfig.defconfig index 8b23b520e1f6d..6641235a88c84 100644 --- a/boards/arm/mec172xevb_assy6906/Kconfig.defconfig +++ b/boards/arm/mec172xevb_assy6906/Kconfig.defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2021 Microchip Technology Inc. # SPDX-License-Identifier: Apache-2.0 -if BOARD_MEC172XEVB_ASSY6906 - -config BOARD - default "mec172xevb_assy6906" - if RTOS_TIMER # XEC RTOS timer HW frequency is fixed at 32768 Hz. @@ -35,5 +30,3 @@ config SYS_CLOCK_TICKS_PER_SEC default 1000 endif # RTOS_TIMER - -endif # BOARD_MEC172XEVB_ASSY6906 diff --git a/boards/arm/mec172xevb_assy6906/Kconfig.mec172xevb_assy6906 b/boards/arm/mec172xevb_assy6906/Kconfig.mec172xevb_assy6906 new file mode 100644 index 0000000000000..b165422eca41d --- /dev/null +++ b/boards/arm/mec172xevb_assy6906/Kconfig.mec172xevb_assy6906 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MEC172XEVB_ASSY6906 + bool + default y + select SOC_MEC172X_NSZ + select SOC_SERIES_MEC172X diff --git a/boards/arm/mec172xevb_assy6906/mec172xevb_assy6906_defconfig b/boards/arm/mec172xevb_assy6906/mec172xevb_assy6906_defconfig index 63e6a6be73b77..a925bc7538db3 100644 --- a/boards/arm/mec172xevb_assy6906/mec172xevb_assy6906_defconfig +++ b/boards/arm/mec172xevb_assy6906/mec172xevb_assy6906_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MEC172X_NSZ=y -CONFIG_SOC_SERIES_MEC172X=y -CONFIG_BOARD_MEC172XEVB_ASSY6906=y CONFIG_RTOS_TIMER=y CONFIG_CLOCK_CONTROL=y diff --git a/boards/arm/mec2016evb_assy6797/Kconfig.board b/boards/arm/mec2016evb_assy6797/Kconfig.board deleted file mode 100644 index 0ab279fccdeeb..0000000000000 --- a/boards/arm/mec2016evb_assy6797/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2019, Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MEC2016EVB_ASSY6797 - bool "Microchip MEC2016 EVB ASSY 6797 Development board" - depends on SOC_MEC1701_QSZ diff --git a/boards/arm/mec2016evb_assy6797/Kconfig.defconfig b/boards/arm/mec2016evb_assy6797/Kconfig.defconfig deleted file mode 100644 index fd416a22c4300..0000000000000 --- a/boards/arm/mec2016evb_assy6797/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2019 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_MEC2016EVB_ASSY6797 - -config BOARD - default "mec2016evb_assy6797" - -endif # BOARD_MEC2016EVB_ASSY6797 diff --git a/boards/arm/mec2016evb_assy6797/Kconfig.mec2016evb_assy6797 b/boards/arm/mec2016evb_assy6797/Kconfig.mec2016evb_assy6797 new file mode 100644 index 0000000000000..b64760a4ecc86 --- /dev/null +++ b/boards/arm/mec2016evb_assy6797/Kconfig.mec2016evb_assy6797 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MEC2016EVB_ASSY6797 + bool + default y + select SOC_MEC1701_QSZ + select SOC_SERIES_MEC1701X diff --git a/boards/arm/mec2016evb_assy6797/mec2016evb_assy6797_defconfig b/boards/arm/mec2016evb_assy6797/mec2016evb_assy6797_defconfig index 77a9d525b5e4b..2aaeccf928d7a 100644 --- a/boards/arm/mec2016evb_assy6797/mec2016evb_assy6797_defconfig +++ b/boards/arm/mec2016evb_assy6797/mec2016evb_assy6797_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MEC1701_QSZ=y -CONFIG_SOC_SERIES_MEC1701X=y -CONFIG_BOARD_MEC2016EVB_ASSY6797=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 CONFIG_CONSOLE=y diff --git a/boards/arm/mercury_xu/Kconfig.board b/boards/arm/mercury_xu/Kconfig.board deleted file mode 100644 index 929cf6db518ab..0000000000000 --- a/boards/arm/mercury_xu/Kconfig.board +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2020, Antmicro -# SPDX-License-Identifier: Apache-2.0 -config BOARD_MERCURY_XU - bool "Mercury XU Board" - depends on SOC_XILINX_ZYNQMP_RPU diff --git a/boards/arm/mercury_xu/Kconfig.defconfig b/boards/arm/mercury_xu/Kconfig.defconfig index 856e4d2ac0176..88dfbc381d72e 100644 --- a/boards/arm/mercury_xu/Kconfig.defconfig +++ b/boards/arm/mercury_xu/Kconfig.defconfig @@ -1,16 +1,9 @@ # Copyright (c) 2020, Antmicro # SPDX-License-Identifier: Apache-2.0 -if BOARD_MERCURY_XU - -config BOARD - default "mercury_xu" - config FLASH_SIZE int default 64 config FLASH_BASE_ADDRESS default 0x08000000 - -endif diff --git a/boards/arm/mercury_xu/Kconfig.mercury_xu b/boards/arm/mercury_xu/Kconfig.mercury_xu new file mode 100644 index 0000000000000..e8dc8afece670 --- /dev/null +++ b/boards/arm/mercury_xu/Kconfig.mercury_xu @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MERCURY_XU + bool + default y + select SOC_XILINX_ZYNQMP_RPU diff --git a/boards/arm/mercury_xu/mercury_xu_defconfig b/boards/arm/mercury_xu/mercury_xu_defconfig index 6655cf9a44290..2d1b975a6ca15 100644 --- a/boards/arm/mercury_xu/mercury_xu_defconfig +++ b/boards/arm/mercury_xu/mercury_xu_defconfig @@ -1,6 +1,4 @@ # Copyright (c) 2020, Antmicro -CONFIG_SOC_XILINX_ZYNQMP_RPU=y -CONFIG_BOARD_MERCURY_XU=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/mikroe_clicker_2/Kconfig.board b/boards/arm/mikroe_clicker_2/Kconfig.board deleted file mode 100644 index 81e95e3fd3b45..0000000000000 --- a/boards/arm/mikroe_clicker_2/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# MikroE Clicker 2 board configuration - -# Copyright (c) 2020 Trifork -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIKROE_CLICKER_2 - bool "MikroE Clicker 2 for STM32 board" - depends on SOC_STM32F407XG diff --git a/boards/arm/mikroe_clicker_2/Kconfig.defconfig b/boards/arm/mikroe_clicker_2/Kconfig.defconfig index 08a87aeca7607..f3b2a19cf48e0 100644 --- a/boards/arm/mikroe_clicker_2/Kconfig.defconfig +++ b/boards/arm/mikroe_clicker_2/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2020 Trifork # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIKROE_CLICKER_2 - -config BOARD - default "mikroe_clicker_2" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif #BOARD_MIKROE_CLICKER_2 diff --git a/boards/arm/mikroe_clicker_2/Kconfig.mikroe_clicker_2 b/boards/arm/mikroe_clicker_2/Kconfig.mikroe_clicker_2 new file mode 100644 index 0000000000000..180efb778d76e --- /dev/null +++ b/boards/arm/mikroe_clicker_2/Kconfig.mikroe_clicker_2 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIKROE_CLICKER_2 + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F407XG diff --git a/boards/arm/mikroe_clicker_2/mikroe_clicker_2_defconfig b/boards/arm/mikroe_clicker_2/mikroe_clicker_2_defconfig index 0d46fd7c84e65..5a18aebe73c4d 100644 --- a/boards/arm/mikroe_clicker_2/mikroe_clicker_2_defconfig +++ b/boards/arm/mikroe_clicker_2/mikroe_clicker_2_defconfig @@ -1,7 +1,3 @@ -CONFIG_BOARD_MIKROE_CLICKER_2=y -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F407XG=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.board b/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.board deleted file mode 100644 index 5680d9a084600..0000000000000 --- a/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Mikroe MINI-M4 for STM32 board configuration - -# Copyright (c) 2019, Kwon Tae-young -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIKROE_MINI_M4_FOR_STM32 - bool "Mikroe MINI-M4 for STM32 Board" - depends on SOC_STM32F415XX diff --git a/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.defconfig b/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.defconfig index 3a2bbe8f5d4b7..074d04e1f7138 100644 --- a/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.defconfig +++ b/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2019, Kwon Tae-young # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIKROE_MINI_M4_FOR_STM32 - -config BOARD - default "mikroe_mini_m4_for_stm32" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_MIKROE_MINI_M4_FOR_STM32 diff --git a/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.mikroe_mini_m4_for_stm32 b/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.mikroe_mini_m4_for_stm32 new file mode 100644 index 0000000000000..a34c30a4ceaf2 --- /dev/null +++ b/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.mikroe_mini_m4_for_stm32 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIKROE_MINI_M4_FOR_STM32 + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F415XX diff --git a/boards/arm/mikroe_mini_m4_for_stm32/mikroe_mini_m4_for_stm32_defconfig b/boards/arm/mikroe_mini_m4_for_stm32/mikroe_mini_m4_for_stm32_defconfig index 3f0ccc9cca746..201c26b992aa3 100644 --- a/boards/arm/mikroe_mini_m4_for_stm32/mikroe_mini_m4_for_stm32_defconfig +++ b/boards/arm/mikroe_mini_m4_for_stm32/mikroe_mini_m4_for_stm32_defconfig @@ -1,7 +1,3 @@ -CONFIG_BOARD_MIKROE_MINI_M4_FOR_STM32=y -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F415XX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/mimx8mm_evk/Kconfig.board b/boards/arm/mimx8mm_evk/Kconfig.board deleted file mode 100644 index 0e7c9865cf1b2..0000000000000 --- a/boards/arm/mimx8mm_evk/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# MIMX8MM EVK board - -# Copyright (c) 2020, Manivannan Sadhasivam -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMX8MM_EVK - bool "NXP i.MX8M Mini EVK" - depends on SOC_SERIES_IMX8MM_M4 - select SOC_PART_NUMBER_MIMX8MM6DVTLZ diff --git a/boards/arm/mimx8mm_evk/Kconfig.defconfig b/boards/arm/mimx8mm_evk/Kconfig.defconfig index aee76b9834b99..cdbd19b11b1aa 100644 --- a/boards/arm/mimx8mm_evk/Kconfig.defconfig +++ b/boards/arm/mimx8mm_evk/Kconfig.defconfig @@ -3,16 +3,12 @@ # Copyright (c) 2020, Manivannan Sadhasivam # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMX8MM_EVK - -config BOARD - default "mimx8mm_evk" - if !XIP + config FLASH_SIZE default 0 + config FLASH_BASE_ADDRESS default 0 -endif -endif # BOARD_MIMX8MM_EVK +endif diff --git a/boards/arm/mimx8mm_evk/Kconfig.mimx8mm_evk b/boards/arm/mimx8mm_evk/Kconfig.mimx8mm_evk new file mode 100644 index 0000000000000..e1304bcdfa173 --- /dev/null +++ b/boards/arm/mimx8mm_evk/Kconfig.mimx8mm_evk @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMX8MM_EVK + bool + default y + select SOC_SERIES_IMX8MM_M4 + select SOC_MIMX8MM6 + select SOC_PART_NUMBER_MIMX8MM6DVTLZ diff --git a/boards/arm/mimx8mm_evk/mimx8mm_evk_defconfig b/boards/arm/mimx8mm_evk/mimx8mm_evk_defconfig index f51c8ac2b109d..9a21c6ac3e906 100644 --- a/boards/arm/mimx8mm_evk/mimx8mm_evk_defconfig +++ b/boards/arm/mimx8mm_evk/mimx8mm_evk_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_IMX8MM_M4=y -CONFIG_SOC_MIMX8MM6=y -CONFIG_BOARD_MIMX8MM_EVK=y CONFIG_CLOCK_CONTROL=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimx8mp_evk/Kconfig.board b/boards/arm/mimx8mp_evk/Kconfig.board deleted file mode 100644 index 1595301fa2922..0000000000000 --- a/boards/arm/mimx8mp_evk/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# MIMX8MP EVK board - -# Copyright (c) 2021, Laird Connectivity -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMX8MP_EVK - bool "NXP i.MX8M Plus EVK" - depends on SOC_SERIES_IMX8ML_M7 - select SOC_PART_NUMBER_MIMX8ML8DVNLZ diff --git a/boards/arm/mimx8mp_evk/Kconfig.defconfig b/boards/arm/mimx8mp_evk/Kconfig.defconfig index 41d7a120fd1d5..fd4401f2c7a5f 100644 --- a/boards/arm/mimx8mp_evk/Kconfig.defconfig +++ b/boards/arm/mimx8mp_evk/Kconfig.defconfig @@ -3,16 +3,12 @@ # Copyright (c) 2021, Laird Connectivity # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMX8MP_EVK - -config BOARD - default "mimx8mp_evk" - if !XIP + config FLASH_SIZE default 0 + config FLASH_BASE_ADDRESS default 0 -endif -endif # BOARD_MIMX8MP_EVK +endif diff --git a/boards/arm/mimx8mp_evk/Kconfig.mimx8mp_evk_ddr b/boards/arm/mimx8mp_evk/Kconfig.mimx8mp_evk_ddr new file mode 100644 index 0000000000000..bcc1dfd64b23c --- /dev/null +++ b/boards/arm/mimx8mp_evk/Kconfig.mimx8mp_evk_ddr @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMX8MP_EVK_DDR + bool + default y + select SOC_SERIES_IMX8ML_M7 + select SOC_MIMX8ML8 + select SOC_PART_NUMBER_MIMX8ML8DVNLZ diff --git a/boards/arm/mimx8mp_evk/Kconfig.mimx8mp_evk_itcm b/boards/arm/mimx8mp_evk/Kconfig.mimx8mp_evk_itcm new file mode 100644 index 0000000000000..45824fda9c129 --- /dev/null +++ b/boards/arm/mimx8mp_evk/Kconfig.mimx8mp_evk_itcm @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMX8MP_EVK_ITCM + bool + default y + select SOC_SERIES_IMX8ML_M7 + select SOC_MIMX8ML8 + select SOC_PART_NUMBER_MIMX8ML8DVNLZ diff --git a/boards/arm/mimx8mp_evk/mimx8mp_evk_ddr_defconfig b/boards/arm/mimx8mp_evk/mimx8mp_evk_ddr_defconfig index 4a77ad558c24d..17542cb4eec07 100644 --- a/boards/arm/mimx8mp_evk/mimx8mp_evk_ddr_defconfig +++ b/boards/arm/mimx8mp_evk/mimx8mp_evk_ddr_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_IMX8ML_M7=y -CONFIG_SOC_MIMX8ML8=y -CONFIG_BOARD_MIMX8MP_EVK=y CONFIG_CLOCK_CONTROL=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimx8mp_evk/mimx8mp_evk_itcm_defconfig b/boards/arm/mimx8mp_evk/mimx8mp_evk_itcm_defconfig index 8b2a3b770540c..0f7d91f447e96 100644 --- a/boards/arm/mimx8mp_evk/mimx8mp_evk_itcm_defconfig +++ b/boards/arm/mimx8mp_evk/mimx8mp_evk_itcm_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_IMX8ML_M7=y -CONFIG_SOC_MIMX8ML8=y -CONFIG_BOARD_MIMX8MP_EVK=y CONFIG_CLOCK_CONTROL=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimx8mq_evk/Kconfig.board b/boards/arm/mimx8mq_evk/Kconfig.board deleted file mode 100644 index 7f0533f705399..0000000000000 --- a/boards/arm/mimx8mq_evk/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# MIMX8MQ EVK board - -# Copyright (c) 2021, Kwon Tae-young -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMX8MQ_EVK_CM4 - bool "NXP i.MX8MQ EVK" - depends on SOC_SERIES_IMX8MQ_M4 - select SOC_PART_NUMBER_MIMX8MQ6DVAJZ diff --git a/boards/arm/mimx8mq_evk/Kconfig.defconfig b/boards/arm/mimx8mq_evk/Kconfig.defconfig index fa66b520e6e85..6b43cff148d49 100644 --- a/boards/arm/mimx8mq_evk/Kconfig.defconfig +++ b/boards/arm/mimx8mq_evk/Kconfig.defconfig @@ -3,16 +3,12 @@ # Copyright (c) 2021, Kwon Tae-young # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMX8MQ_EVK_CM4 - -config BOARD - default "mimx8mq_evk_cm4" - if !XIP + config FLASH_SIZE default 0 + config FLASH_BASE_ADDRESS default 0 -endif -endif # BOARD_MIMX8MQ_EVK_CM4 +endif diff --git a/boards/arm/mimx8mq_evk/Kconfig.mimx8mq_evk_cm4 b/boards/arm/mimx8mq_evk/Kconfig.mimx8mq_evk_cm4 new file mode 100644 index 0000000000000..c54a8938cd31a --- /dev/null +++ b/boards/arm/mimx8mq_evk/Kconfig.mimx8mq_evk_cm4 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMX8MQ_EVK_CM4 + bool + default y + select SOC_SERIES_IMX8MQ_M4 + select SOC_MIMX8MQ6 + select SOC_PART_NUMBER_MIMX8MQ6DVAJZ diff --git a/boards/arm/mimx8mq_evk/mimx8mq_evk_cm4_defconfig b/boards/arm/mimx8mq_evk/mimx8mq_evk_cm4_defconfig index d1b9de332f6b4..1ab611cf08484 100644 --- a/boards/arm/mimx8mq_evk/mimx8mq_evk_cm4_defconfig +++ b/boards/arm/mimx8mq_evk/mimx8mq_evk_cm4_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_IMX8MQ_M4=y -CONFIG_SOC_MIMX8MQ6=y -CONFIG_BOARD_MIMX8MQ_EVK_CM4=y CONFIG_CLOCK_CONTROL=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1010_evk/Kconfig.board b/boards/arm/mimxrt1010_evk/Kconfig.board deleted file mode 100644 index 7ccc20510739d..0000000000000 --- a/boards/arm/mimxrt1010_evk/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2019, NXP -# -# SPDX-License-Identifier: Apache-2.0 -# - -config BOARD_MIMXRT1010_EVK - bool "NXP MIMXRT1010-EVK" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1011DAE5A diff --git a/boards/arm/mimxrt1010_evk/Kconfig.defconfig b/boards/arm/mimxrt1010_evk/Kconfig.defconfig index da98cdf9ffaec..6e13b373b17de 100644 --- a/boards/arm/mimxrt1010_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1010_evk/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2019, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1010_EVK - -config BOARD - default "mimxrt1010_evk" if BOARD_MIMXRT1010_EVK - choice CODE_LOCATION default CODE_FLEXSPI endchoice - -endif # BOARD_MIMXRT1010_EVK diff --git a/boards/arm/mimxrt1010_evk/Kconfig.mimxrt1010_evk b/boards/arm/mimxrt1010_evk/Kconfig.mimxrt1010_evk new file mode 100644 index 0000000000000..fde4651e3db18 --- /dev/null +++ b/boards/arm/mimxrt1010_evk/Kconfig.mimxrt1010_evk @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1010_EVK + bool + default y + select SOC_MIMXRT1011 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1011DAE5A diff --git a/boards/arm/mimxrt1010_evk/mimxrt1010_evk_defconfig b/boards/arm/mimxrt1010_evk/mimxrt1010_evk_defconfig index 2e6ad98a5e79b..dc0fdc31f2ae4 100644 --- a/boards/arm/mimxrt1010_evk/mimxrt1010_evk_defconfig +++ b/boards/arm/mimxrt1010_evk/mimxrt1010_evk_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1011=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1015_evk/Kconfig.board b/boards/arm/mimxrt1015_evk/Kconfig.board deleted file mode 100644 index a5dee5762f866..0000000000000 --- a/boards/arm/mimxrt1015_evk/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2019, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMXRT1015_EVK - bool "NXP MIMXRT1015-EVK" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1015DAF5A diff --git a/boards/arm/mimxrt1015_evk/Kconfig.defconfig b/boards/arm/mimxrt1015_evk/Kconfig.defconfig index 215f75a827ee6..eac2c4af8efe6 100644 --- a/boards/arm/mimxrt1015_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1015_evk/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2019, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1015_EVK - -config BOARD - default "mimxrt1015_evk" if BOARD_MIMXRT1015_EVK - choice CODE_LOCATION default CODE_FLEXSPI endchoice - -endif # BOARD_MIMXRT1015_EVK diff --git a/boards/arm/mimxrt1015_evk/Kconfig.mimxrt1015_evk b/boards/arm/mimxrt1015_evk/Kconfig.mimxrt1015_evk new file mode 100644 index 0000000000000..2a14c899a845c --- /dev/null +++ b/boards/arm/mimxrt1015_evk/Kconfig.mimxrt1015_evk @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1015_EVK + bool + default y + select SOC_MIMXRT1015 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1015DAF5A diff --git a/boards/arm/mimxrt1015_evk/mimxrt1015_evk_defconfig b/boards/arm/mimxrt1015_evk/mimxrt1015_evk_defconfig index 3268f61aebccf..dc0fdc31f2ae4 100644 --- a/boards/arm/mimxrt1015_evk/mimxrt1015_evk_defconfig +++ b/boards/arm/mimxrt1015_evk/mimxrt1015_evk_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1015=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1020_evk/Kconfig.board b/boards/arm/mimxrt1020_evk/Kconfig.board deleted file mode 100644 index e8ac44ef19269..0000000000000 --- a/boards/arm/mimxrt1020_evk/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2018, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMXRT1020_EVK - bool "NXP MIMXRT1020-EVK" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1021DAG5A diff --git a/boards/arm/mimxrt1020_evk/Kconfig.defconfig b/boards/arm/mimxrt1020_evk/Kconfig.defconfig index f1318a33dd085..ba99552298522 100644 --- a/boards/arm/mimxrt1020_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1020_evk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1020_EVK - -config BOARD - default "mimxrt1020_evk" if BOARD_MIMXRT1020_EVK - choice CODE_LOCATION default CODE_FLEXSPI endchoice @@ -24,5 +19,3 @@ config ETH_MCUX_PHY_RESET default y endif # NETWORKING - -endif # BOARD_MIMXRT1020_EVK diff --git a/boards/arm/mimxrt1020_evk/Kconfig.mimxrt1020_evk b/boards/arm/mimxrt1020_evk/Kconfig.mimxrt1020_evk new file mode 100644 index 0000000000000..1888001f38471 --- /dev/null +++ b/boards/arm/mimxrt1020_evk/Kconfig.mimxrt1020_evk @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1020_EVK + bool + default y + select SOC_MIMXRT1021 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1021DAG5A diff --git a/boards/arm/mimxrt1020_evk/mimxrt1020_evk_defconfig b/boards/arm/mimxrt1020_evk/mimxrt1020_evk_defconfig index 3ca8b4d09f09c..8af2d46280907 100644 --- a/boards/arm/mimxrt1020_evk/mimxrt1020_evk_defconfig +++ b/boards/arm/mimxrt1020_evk/mimxrt1020_evk_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1021=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1024_evk/Kconfig.board b/boards/arm/mimxrt1024_evk/Kconfig.board deleted file mode 100644 index e3468871e2a1e..0000000000000 --- a/boards/arm/mimxrt1024_evk/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2020, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMXRT1024_EVK - bool "NXP MIMXRT1024-EVK" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1024DAG5A diff --git a/boards/arm/mimxrt1024_evk/Kconfig.defconfig b/boards/arm/mimxrt1024_evk/Kconfig.defconfig index 768d74e7d46e7..c63bb96fd0e61 100644 --- a/boards/arm/mimxrt1024_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1024_evk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2020, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1024_EVK - -config BOARD - default "mimxrt1024_evk" if BOARD_MIMXRT1024_EVK - choice CODE_LOCATION default CODE_FLEXSPI endchoice @@ -25,5 +20,3 @@ config ETH_MCUX_PHY_RESET default y endif # NETWORKING - -endif # BOARD_MIMXRT1024_EVK diff --git a/boards/arm/mimxrt1024_evk/Kconfig.mimxrt1024_evk b/boards/arm/mimxrt1024_evk/Kconfig.mimxrt1024_evk new file mode 100644 index 0000000000000..59cb730f0549f --- /dev/null +++ b/boards/arm/mimxrt1024_evk/Kconfig.mimxrt1024_evk @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1024_EVK + bool + default y + select SOC_MIMXRT1024 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1024DAG5A diff --git a/boards/arm/mimxrt1024_evk/mimxrt1024_evk_defconfig b/boards/arm/mimxrt1024_evk/mimxrt1024_evk_defconfig index c41a65e312d97..591d807155216 100644 --- a/boards/arm/mimxrt1024_evk/mimxrt1024_evk_defconfig +++ b/boards/arm/mimxrt1024_evk/mimxrt1024_evk_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1024=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1050_evk/Kconfig.board b/boards/arm/mimxrt1050_evk/Kconfig.board deleted file mode 100644 index 9627ee203198b..0000000000000 --- a/boards/arm/mimxrt1050_evk/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2017, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMXRT1050_EVK - bool "NXP MIMXRT1050-EVK" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1052DVL6A - -config BOARD_MIMXRT1050_EVK_QSPI - bool "NXP MIMXRT1050-EVK-QSPI" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1052DVL6A diff --git a/boards/arm/mimxrt1050_evk/Kconfig.defconfig b/boards/arm/mimxrt1050_evk/Kconfig.defconfig index 28b4d844e74e1..ea2b211e5b0d9 100644 --- a/boards/arm/mimxrt1050_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1050_evk/Kconfig.defconfig @@ -3,12 +3,6 @@ # Copyright (c) 2017, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1050_EVK || BOARD_MIMXRT1050_EVK_QSPI - -config BOARD - default "mimxrt1050_evk" if BOARD_MIMXRT1050_EVK - default "mimxrt1050_evk_qspi" if BOARD_MIMXRT1050_EVK_QSPI - choice CODE_LOCATION default CODE_FLEXSPI endchoice @@ -25,7 +19,7 @@ config FLASH_MCUX_FLEXSPI_NOR default y if BOARD_MIMXRT1050_EVK_QSPI default n if BOARD_MIMXRT1050_EVK -endif #FLASH +endif # FLASH config KSCAN default y if LVGL @@ -63,5 +57,3 @@ choice LV_COLOR_DEPTH endchoice endif # LVGL - -endif # BOARD_MIMXRT1050_EVK || BOARD_MIMXRT1050_EVK_QSPI diff --git a/boards/arm/mimxrt1050_evk/Kconfig.mimxrt1050_evk b/boards/arm/mimxrt1050_evk/Kconfig.mimxrt1050_evk new file mode 100644 index 0000000000000..cf77202c14262 --- /dev/null +++ b/boards/arm/mimxrt1050_evk/Kconfig.mimxrt1050_evk @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1050_EVK + bool + default y + select SOC_MIMXRT1052 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1052DVL6A diff --git a/boards/arm/mimxrt1050_evk/Kconfig.mimxrt1050_evk_qspi b/boards/arm/mimxrt1050_evk/Kconfig.mimxrt1050_evk_qspi new file mode 100644 index 0000000000000..159156b9bbc1d --- /dev/null +++ b/boards/arm/mimxrt1050_evk/Kconfig.mimxrt1050_evk_qspi @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1050_EVK_QSPI + bool + default y + select SOC_MIMXRT1052 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1052DVL6A diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig index 0c3fd3485d8be..e4f0cbedcc261 100644 --- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig +++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1052=y -CONFIG_SOC_SERIES_IMX_RT=y -CONFIG_BOARD_MIMXRT1050_EVK=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi_defconfig b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi_defconfig index 5ad5307db8caa..e4f0cbedcc261 100644 --- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi_defconfig +++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1052=y -CONFIG_SOC_SERIES_IMX_RT=y -CONFIG_BOARD_MIMXRT1050_EVK_QSPI=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1060_evk/Kconfig.board b/boards/arm/mimxrt1060_evk/Kconfig.board deleted file mode 100644 index d075c432477e7..0000000000000 --- a/boards/arm/mimxrt1060_evk/Kconfig.board +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2018, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMXRT1060_EVK - bool "NXP MIMXRT1060-EVK" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1062DVL6A - -config BOARD_MIMXRT1060_EVK_HYPERFLASH - bool "NXP MIMXRT1060-EVK-HYPERFLASH" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1062DVL6A - -config BOARD_MIMXRT1060_EVKB - bool "NXP MIMXRT1060-EVKB" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1062DVL6A diff --git a/boards/arm/mimxrt1060_evk/Kconfig.defconfig b/boards/arm/mimxrt1060_evk/Kconfig.defconfig index e07fec94510c5..bd9a5f62aef88 100644 --- a/boards/arm/mimxrt1060_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1060_evk/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2018, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVK_HYPERFLASH || BOARD_MIMXRT1060_EVKB - -config BOARD - default "mimxrt1060_evk" if BOARD_MIMXRT1060_EVK - default "mimxrt1060_evk_hyperflash" if BOARD_MIMXRT1060_EVK_HYPERFLASH - default "mimxrt1060_evkb" if BOARD_MIMXRT1060_EVKB - choice CODE_LOCATION default CODE_FLEXSPI endchoice @@ -29,7 +22,7 @@ config FLASH_MCUX_FLEXSPI_HYPERFLASH default n if BOARD_MIMXRT1060_EVK default n if BOARD_MIMXRT1060_EVKB -endif #FLASH +endif # FLASH config KSCAN default y if LVGL @@ -67,5 +60,3 @@ choice LV_COLOR_DEPTH endchoice endif # LVGL - -endif # BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVK_HYPERFLASH || BOARD_MIMXRT1060_EVKB diff --git a/boards/arm/mimxrt1060_evk/Kconfig.mimxrt1060_evk b/boards/arm/mimxrt1060_evk/Kconfig.mimxrt1060_evk new file mode 100644 index 0000000000000..20c0ef28c8b70 --- /dev/null +++ b/boards/arm/mimxrt1060_evk/Kconfig.mimxrt1060_evk @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1060_EVK + bool + default y + select SOC_MIMXRT1062 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1062DVL6A diff --git a/boards/arm/mimxrt1060_evk/Kconfig.mimxrt1060_evk_hyperflash b/boards/arm/mimxrt1060_evk/Kconfig.mimxrt1060_evk_hyperflash new file mode 100644 index 0000000000000..5e53418bc6d85 --- /dev/null +++ b/boards/arm/mimxrt1060_evk/Kconfig.mimxrt1060_evk_hyperflash @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1060_EVK_HYPERFLASH + bool + default y + select SOC_MIMXRT1062 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1062DVL6A diff --git a/boards/arm/mimxrt1060_evk/Kconfig.mimxrt1060_evkb b/boards/arm/mimxrt1060_evk/Kconfig.mimxrt1060_evkb new file mode 100644 index 0000000000000..d940c7e38371b --- /dev/null +++ b/boards/arm/mimxrt1060_evk/Kconfig.mimxrt1060_evkb @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1060_EVKB + bool + default y + select SOC_MIMXRT1062 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1062DVL6A diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk_defconfig b/boards/arm/mimxrt1060_evk/mimxrt1060_evk_defconfig index 40d615261b37a..8af2d46280907 100644 --- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk_defconfig +++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1062=y -CONFIG_SOC_SERIES_IMX_RT=y -CONFIG_BOARD_MIMXRT1060_EVK=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash_defconfig b/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash_defconfig index 418a8293e11dd..8af2d46280907 100644 --- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash_defconfig +++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1062=y -CONFIG_SOC_SERIES_IMX_RT=y -CONFIG_BOARD_MIMXRT1060_EVK_HYPERFLASH=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evkb_defconfig b/boards/arm/mimxrt1060_evk/mimxrt1060_evkb_defconfig index bb1a6edb66876..365bcc53c40dd 100644 --- a/boards/arm/mimxrt1060_evk/mimxrt1060_evkb_defconfig +++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evkb_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1062=y -CONFIG_SOC_SERIES_IMX_RT=y -CONFIG_BOARD_MIMXRT1060_EVKB=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1064_evk/Kconfig.board b/boards/arm/mimxrt1064_evk/Kconfig.board deleted file mode 100644 index 0ce09d06fd441..0000000000000 --- a/boards/arm/mimxrt1064_evk/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2018, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMXRT1064_EVK - bool "NXP MIMXRT1064-EVK" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1064DVL6A diff --git a/boards/arm/mimxrt1064_evk/Kconfig.defconfig b/boards/arm/mimxrt1064_evk/Kconfig.defconfig index 3ec181c3e1208..d93babb154ebb 100644 --- a/boards/arm/mimxrt1064_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1064_evk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1064_EVK - -config BOARD - default "mimxrt1064_evk" - choice CODE_LOCATION default CODE_FLEXSPI2 endchoice @@ -51,5 +46,3 @@ choice LV_COLOR_DEPTH endchoice endif # LVGL - -endif # BOARD_MIMXRT1064_EVK diff --git a/boards/arm/mimxrt1064_evk/Kconfig.mimxrt1064_evk b/boards/arm/mimxrt1064_evk/Kconfig.mimxrt1064_evk new file mode 100644 index 0000000000000..1325579a8dca7 --- /dev/null +++ b/boards/arm/mimxrt1064_evk/Kconfig.mimxrt1064_evk @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1064_EVK + bool + default y + select SOC_MIMXRT1064 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1064DVL6A diff --git a/boards/arm/mimxrt1064_evk/mimxrt1064_evk_defconfig b/boards/arm/mimxrt1064_evk/mimxrt1064_evk_defconfig index 22911d8b782b9..8af2d46280907 100644 --- a/boards/arm/mimxrt1064_evk/mimxrt1064_evk_defconfig +++ b/boards/arm/mimxrt1064_evk/mimxrt1064_evk_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1064=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1160_evk/Kconfig.board b/boards/arm/mimxrt1160_evk/Kconfig.board deleted file mode 100644 index 2f7b3533bf7bf..0000000000000 --- a/boards/arm/mimxrt1160_evk/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2021, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMXRT1160_EVK_CM7 - bool "NXP MIMXRT1160-EVK CM7" - depends on SOC_MIMXRT1166_CM7 - select SOC_PART_NUMBER_MIMXRT1166DVM6A - -config BOARD_MIMXRT1160_EVK_CM4 - bool "NXP MIMXRT1160-EVK CM4" - depends on SOC_MIMXRT1166_CM4 - select SOC_PART_NUMBER_MIMXRT1166DVM6A diff --git a/boards/arm/mimxrt1160_evk/Kconfig.defconfig b/boards/arm/mimxrt1160_evk/Kconfig.defconfig index 3142c46bfe1cd..615d9e3f35b62 100644 --- a/boards/arm/mimxrt1160_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1160_evk/Kconfig.defconfig @@ -3,12 +3,6 @@ # Copyright (c) 2021, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1160_EVK_CM7 || BOARD_MIMXRT1160_EVK_CM4 - -config BOARD - default "mimxrt1160_evk_cm7" if BOARD_MIMXRT1160_EVK_CM7 - default "mimxrt1160_evk_cm4" if BOARD_MIMXRT1160_EVK_CM4 - choice CODE_LOCATION default CODE_FLEXSPI if BOARD_MIMXRT1160_EVK_CM7 default CODE_SRAM0 if BOARD_MIMXRT1160_EVK_CM4 @@ -25,7 +19,7 @@ choice FLASH_MCUX_FLEXSPI_XIP_MEM_TARGET default FLASH_MCUX_FLEXSPI_XIP_MEM_SRAM if CPU_CORTEX_M4 endchoice -endif #FLASH +endif # FLASH if NETWORKING @@ -36,5 +30,3 @@ config ETH_MCUX_PHY_RESET default y endif # NETWORKING - -endif # BOARD_MIMXRT1160_EVK_CM7 || BOARD_MIMXRT1160_EVK_CM4 diff --git a/boards/arm/mimxrt1160_evk/Kconfig.mimxrt1160_evk_cm4 b/boards/arm/mimxrt1160_evk/Kconfig.mimxrt1160_evk_cm4 new file mode 100644 index 0000000000000..27ce7002ee816 --- /dev/null +++ b/boards/arm/mimxrt1160_evk/Kconfig.mimxrt1160_evk_cm4 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1160_EVK_CM4 + bool + default y + select SOC_MIMXRT1166_CM4 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1166DVM6A diff --git a/boards/arm/mimxrt1160_evk/Kconfig.mimxrt1160_evk_cm7 b/boards/arm/mimxrt1160_evk/Kconfig.mimxrt1160_evk_cm7 new file mode 100644 index 0000000000000..d579e3d549ed4 --- /dev/null +++ b/boards/arm/mimxrt1160_evk/Kconfig.mimxrt1160_evk_cm7 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1160_EVK_CM7 + bool + default y + select SOC_MIMXRT1166_CM7 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1166DVM6A diff --git a/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm4_defconfig b/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm4_defconfig index ac3f4bf5b930d..8afab5dd555aa 100644 --- a/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm4_defconfig +++ b/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm4_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1166_CM4=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm7_defconfig b/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm7_defconfig index 7cdde24c5a0ab..be52544068c4e 100644 --- a/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm7_defconfig +++ b/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm7_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1166_CM7=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1170_evk/Kconfig.board b/boards/arm/mimxrt1170_evk/Kconfig.board deleted file mode 100644 index 3e3ee89a609d3..0000000000000 --- a/boards/arm/mimxrt1170_evk/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2021, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMXRT1170_EVK_CM7 - bool "NXP MIMXRT1170-EVK CM7" - depends on SOC_MIMXRT1176_CM7 - select SOC_PART_NUMBER_MIMXRT1176DVMAA - -config BOARD_MIMXRT1170_EVK_CM4 - bool "NXP MIMXRT1170-EVK CM4" - depends on SOC_MIMXRT1176_CM4 - select SOC_PART_NUMBER_MIMXRT1176DVMAA diff --git a/boards/arm/mimxrt1170_evk/Kconfig.defconfig b/boards/arm/mimxrt1170_evk/Kconfig.defconfig index ac1569c88e299..3d30227b6a9c6 100644 --- a/boards/arm/mimxrt1170_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1170_evk/Kconfig.defconfig @@ -3,12 +3,6 @@ # Copyright (c) 2021, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1170_EVK_CM7 || BOARD_MIMXRT1170_EVK_CM4 - -config BOARD - default "mimxrt1170_evk_cm7" if BOARD_MIMXRT1170_EVK_CM7 - default "mimxrt1170_evk_cm4" if BOARD_MIMXRT1170_EVK_CM4 - choice CODE_LOCATION default CODE_FLEXSPI if BOARD_MIMXRT1170_EVK_CM7 default CODE_SRAM0 if BOARD_MIMXRT1170_EVK_CM4 @@ -31,7 +25,7 @@ choice FLASH_MCUX_FLEXSPI_XIP_MEM_TARGET default FLASH_MCUX_FLEXSPI_XIP_MEM_SRAM if CPU_CORTEX_M4 endchoice -endif #FLASH +endif # FLASH if KSCAN @@ -59,5 +53,3 @@ config REGULATOR default y endif # DISPLAY - -endif # BOARD_MIMXRT1170_EVK_CM7 || BOARD_MIMXRT1170_EVK_CM4 diff --git a/boards/arm/mimxrt1170_evk/Kconfig.mimxrt1170_evk_cm4 b/boards/arm/mimxrt1170_evk/Kconfig.mimxrt1170_evk_cm4 new file mode 100644 index 0000000000000..d9ede8fbc464e --- /dev/null +++ b/boards/arm/mimxrt1170_evk/Kconfig.mimxrt1170_evk_cm4 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1170_EVK_CM4 + bool + default y + select SOC_MIMXRT1176_CM4 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1176DVMAA diff --git a/boards/arm/mimxrt1170_evk/Kconfig.mimxrt1170_evk_cm7 b/boards/arm/mimxrt1170_evk/Kconfig.mimxrt1170_evk_cm7 new file mode 100644 index 0000000000000..9b734332849cc --- /dev/null +++ b/boards/arm/mimxrt1170_evk/Kconfig.mimxrt1170_evk_cm7 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1170_EVK_CM7 + bool + default y + select SOC_MIMXRT1176_CM7 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1176DVMAA diff --git a/boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm4_defconfig b/boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm4_defconfig index 0f35d0fc274e2..8afab5dd555aa 100644 --- a/boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm4_defconfig +++ b/boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm4_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1176_CM4=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm7_defconfig b/boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm7_defconfig index d6835e582bcd0..be52544068c4e 100644 --- a/boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm7_defconfig +++ b/boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm7_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1176_CM7=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt595_evk/Kconfig.board b/boards/arm/mimxrt595_evk/Kconfig.board deleted file mode 100644 index 3716c5ec334c5..0000000000000 --- a/boards/arm/mimxrt595_evk/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMXRT595_EVK - bool "NXP MIMXRT595-EVK" - depends on SOC_SERIES_IMX_RT5XX - select CODE_DATA_RELOCATION_SRAM - select SOC_PART_NUMBER_MIMXRT595SFFOC - select NXP_IMX_RT5XX_BOOT_HEADER if !BOOTLOADER_MCUBOOT diff --git a/boards/arm/mimxrt595_evk/Kconfig.defconfig b/boards/arm/mimxrt595_evk/Kconfig.defconfig index 8da61f5134cd9..be5a6d289849f 100644 --- a/boards/arm/mimxrt595_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt595_evk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2022, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT595_EVK - -config BOARD - default "mimxrt595_evk_cm33" - config FLASH_MCUX_FLEXSPI_MX25UM51345G default y if FLASH config FLASH_SIZE @@ -34,5 +29,3 @@ config HEAP_MEM_POOL_SIZE default 4096 endif # DMA_MCUX_LPC - -endif # BOARD_MIMXRT595_EVK diff --git a/boards/arm/mimxrt595_evk/Kconfig.mimxrt595_evk_cm33 b/boards/arm/mimxrt595_evk/Kconfig.mimxrt595_evk_cm33 new file mode 100644 index 0000000000000..e2a9a6290a4f3 --- /dev/null +++ b/boards/arm/mimxrt595_evk/Kconfig.mimxrt595_evk_cm33 @@ -0,0 +1,11 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT595_EVK_CM33 + bool + default y + select SOC_MIMXRT595S_CM33 + select SOC_SERIES_IMX_RT5XX + select CODE_DATA_RELOCATION_SRAM + select SOC_PART_NUMBER_MIMXRT595SFFOC + select NXP_IMX_RT5XX_BOOT_HEADER if !BOOTLOADER_MCUBOOT diff --git a/boards/arm/mimxrt595_evk/mimxrt595_evk_cm33_defconfig b/boards/arm/mimxrt595_evk/mimxrt595_evk_cm33_defconfig index 4439402d524ca..e7d21c51298e0 100644 --- a/boards/arm/mimxrt595_evk/mimxrt595_evk_cm33_defconfig +++ b/boards/arm/mimxrt595_evk/mimxrt595_evk_cm33_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT595S_CM33=y -CONFIG_SOC_SERIES_IMX_RT5XX=y -CONFIG_BOARD_MIMXRT595_EVK=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mimxrt685_evk/Kconfig.board b/boards/arm/mimxrt685_evk/Kconfig.board deleted file mode 100644 index e1223fa03f398..0000000000000 --- a/boards/arm/mimxrt685_evk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2020, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMXRT685_EVK - bool "NXP MIMXRT685-EVK" - depends on SOC_SERIES_IMX_RT6XX - select SOC_PART_NUMBER_MIMXRT685SFVKB - select NXP_IMX_RT6XX_BOOT_HEADER if !BOOTLOADER_MCUBOOT diff --git a/boards/arm/mimxrt685_evk/Kconfig.defconfig b/boards/arm/mimxrt685_evk/Kconfig.defconfig index 87e69aaf607aa..ede4b043264ef 100644 --- a/boards/arm/mimxrt685_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt685_evk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2020, NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT685_EVK - -config BOARD - default "mimxrt685_evk_cm33" - config XTAL_SYS_CLK_HZ default 24000000 @@ -45,5 +40,3 @@ endif # DMA_MCUX_LPC config DISK_DRIVER_SDMMC default y if DISK_DRIVERS - -endif # BOARD_MIMXRT685_EVK diff --git a/boards/arm/mimxrt685_evk/Kconfig.mimxrt685_evk_cm33 b/boards/arm/mimxrt685_evk/Kconfig.mimxrt685_evk_cm33 new file mode 100644 index 0000000000000..52ffd9ef2f2df --- /dev/null +++ b/boards/arm/mimxrt685_evk/Kconfig.mimxrt685_evk_cm33 @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT685_EVK_CM33 + bool + default y + select SOC_MIMXRT685S_CM33 + select SOC_SERIES_IMX_RT6XX + select SOC_PART_NUMBER_MIMXRT685SFVKB + select NXP_IMX_RT6XX_BOOT_HEADER if !BOOTLOADER_MCUBOOT diff --git a/boards/arm/mimxrt685_evk/mimxrt685_evk_cm33_defconfig b/boards/arm/mimxrt685_evk/mimxrt685_evk_cm33_defconfig index 05673abdd6b7b..47128760e08ed 100644 --- a/boards/arm/mimxrt685_evk/mimxrt685_evk_cm33_defconfig +++ b/boards/arm/mimxrt685_evk/mimxrt685_evk_cm33_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT685S_CM33=y -CONFIG_SOC_SERIES_IMX_RT6XX=y -CONFIG_BOARD_MIMXRT685_EVK=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mm_feather/Kconfig.board b/boards/arm/mm_feather/Kconfig.board deleted file mode 100644 index c003514fdab12..0000000000000 --- a/boards/arm/mm_feather/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2021, MADMACHINE LIMITED -# -# SPDX-License-Identifier: Apache-2.0 -# - -config BOARD_MM_FEATHER - bool "MM MM-FEATHER" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1062DVL6A diff --git a/boards/arm/mm_feather/Kconfig.defconfig b/boards/arm/mm_feather/Kconfig.defconfig index a0f6910a7dcc0..f1f50a3841679 100644 --- a/boards/arm/mm_feather/Kconfig.defconfig +++ b/boards/arm/mm_feather/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2021, MADMACHINE LIMITED # SPDX-License-Identifier: Apache-2.0 -if BOARD_MM_FEATHER - -config BOARD - default "mm_feather" - choice CODE_LOCATION default CODE_FLEXSPI endchoice config DISK_DRIVER_SDMMC default y if DISK_DRIVERS - -endif # BOARD_MM_FEATHER diff --git a/boards/arm/mm_feather/Kconfig.mm_feather b/boards/arm/mm_feather/Kconfig.mm_feather new file mode 100644 index 0000000000000..bcda84c14b9c8 --- /dev/null +++ b/boards/arm/mm_feather/Kconfig.mm_feather @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MM_FEATHER + bool + default y + select SOC_MIMXRT1062 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1062DVL6A diff --git a/boards/arm/mm_feather/mm_feather_defconfig b/boards/arm/mm_feather/mm_feather_defconfig index 1ec155fc2fedd..65cb3610d48c3 100644 --- a/boards/arm/mm_feather/mm_feather_defconfig +++ b/boards/arm/mm_feather/mm_feather_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1062=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mm_swiftio/Kconfig.board b/boards/arm/mm_swiftio/Kconfig.board deleted file mode 100644 index 65352dfdc01cc..0000000000000 --- a/boards/arm/mm_swiftio/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2019, MADMACHINE LIMITED -# -# SPDX-License-Identifier: Apache-2.0 -# - -config BOARD_MM_SWIFTIO - bool "MM MM-SWIFTIO" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1052DVL6A diff --git a/boards/arm/mm_swiftio/Kconfig.defconfig b/boards/arm/mm_swiftio/Kconfig.defconfig index f0b8a47b04322..6c1d61860653e 100644 --- a/boards/arm/mm_swiftio/Kconfig.defconfig +++ b/boards/arm/mm_swiftio/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2019, MADMACHINE LIMITED # SPDX-License-Identifier: Apache-2.0 -if BOARD_MM_SWIFTIO - -config BOARD - default "mm_swiftio" - choice CODE_LOCATION default CODE_FLEXSPI endchoice config DISK_DRIVER_SDMMC default y if DISK_DRIVERS - -endif # BOARD_MM_SWIFTIO diff --git a/boards/arm/mm_swiftio/Kconfig.mm_swiftio b/boards/arm/mm_swiftio/Kconfig.mm_swiftio new file mode 100644 index 0000000000000..9c974d8693577 --- /dev/null +++ b/boards/arm/mm_swiftio/Kconfig.mm_swiftio @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MM_SWIFTIO + bool + default y + select SOC_MIMXRT1052 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1052DVL6A diff --git a/boards/arm/mm_swiftio/mm_swiftio_defconfig b/boards/arm/mm_swiftio/mm_swiftio_defconfig index d09c986b33ad4..0aee57c3625b4 100644 --- a/boards/arm/mm_swiftio/mm_swiftio_defconfig +++ b/boards/arm/mm_swiftio/mm_swiftio_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1052=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/mps2_an385/Kconfig.board b/boards/arm/mps2_an385/Kconfig.board deleted file mode 100644 index f2f9be26f503e..0000000000000 --- a/boards/arm/mps2_an385/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2017 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MPS2_AN385 - bool "ARM Cortex-M3 SMM on V2M-MPS2 (Application Note AN385)" - depends on SOC_MPS2_AN385 - select QEMU_TARGET - select HAS_COVERAGE_SUPPORT diff --git a/boards/arm/mps2_an385/Kconfig.defconfig b/boards/arm/mps2_an385/Kconfig.defconfig index f9037de0c4fa7..4acf151a3cfe4 100644 --- a/boards/arm/mps2_an385/Kconfig.defconfig +++ b/boards/arm/mps2_an385/Kconfig.defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2017 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_MPS2_AN385 - -config BOARD - default "mps2_an385" - if SERIAL config UART_INTERRUPT_DRIVEN @@ -34,5 +29,3 @@ config TEST_EXTRA_STACK_SIZE default 4096 endif # COVERAGE - -endif diff --git a/boards/arm/mps2_an385/Kconfig.mps2_an385 b/boards/arm/mps2_an385/Kconfig.mps2_an385 new file mode 100644 index 0000000000000..fb6707c9ee78e --- /dev/null +++ b/boards/arm/mps2_an385/Kconfig.mps2_an385 @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MPS2_AN385 + bool + default y + select SOC_SERIES_MPS2 + select SOC_MPS2_AN385 + select QEMU_TARGET + select HAS_COVERAGE_SUPPORT diff --git a/boards/arm/mps2_an385/mps2_an385_defconfig b/boards/arm/mps2_an385/mps2_an385_defconfig index a32334189532d..1d55b8fe94919 100644 --- a/boards/arm/mps2_an385/mps2_an385_defconfig +++ b/boards/arm/mps2_an385/mps2_an385_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_MPS2=y -CONFIG_SOC_MPS2_AN385=y -CONFIG_BOARD_MPS2_AN385=y CONFIG_RUNTIME_NMI=y CONFIG_QEMU_ICOUNT_SHIFT=7 diff --git a/boards/arm/mps2_an521/Kconfig.board b/boards/arm/mps2_an521/Kconfig.board deleted file mode 100644 index 6fff4bd21f502..0000000000000 --- a/boards/arm/mps2_an521/Kconfig.board +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2018-2019 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MPS2_AN521_CPU0 - bool "ARM Cortex-M33 SMM on V2M-MPS2 (AN521) (CPU0)" - depends on SOC_MPS2_AN521_CPU0 - select QEMU_TARGET - select HAS_COVERAGE_SUPPORT - -config BOARD_MPS2_AN521_CPU0_NS - bool "ARM Cortex-M33 SMM on V2M-MPS2 (AN521) (CPU0 Non-Secure)" - depends on SOC_MPS2_AN521_CPU0 - select QEMU_TARGET - select HAS_COVERAGE_SUPPORT - -config BOARD_MPS2_AN521_CPU1 - bool "ARM Cortex-M33 SMM on V2M-MPS2 (AN521) CPU1" - depends on SOC_MPS2_AN521_CPU1 - select QEMU_TARGET - select HAS_COVERAGE_SUPPORT diff --git a/boards/arm/mps2_an521/Kconfig.defconfig b/boards/arm/mps2_an521/Kconfig.defconfig index 29c97bf30be0d..f119437e4e6b3 100644 --- a/boards/arm/mps2_an521/Kconfig.defconfig +++ b/boards/arm/mps2_an521/Kconfig.defconfig @@ -1,8 +1,6 @@ # Copyright (c) 2018-2019 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_MPS2_AN521_CPU0 || BOARD_MPS2_AN521_CPU0_NS || BOARD_MPS2_AN521_CPU1 - # MPU-based null-pointer dereferencing detection cannot # be applied as the (0x0 - 0x400) is unmapped but QEMU # will still permit bus access. @@ -11,17 +9,11 @@ choice NULL_POINTER_EXCEPTION_DETECTION default NULL_POINTER_EXCEPTION_DETECTION_NONE if QEMU_TARGET endchoice -config BOARD - default "mps2_an521_ns" if TRUSTED_EXECUTION_NONSECURE - default "mps2_an521_remote" if BOARD_MPS2_AN521_CPU1 - default "mps2_an521" - # By default, if we build for a Non-Secure version of the board, # force building with TF-M as the Secure Execution Environment. config BUILD_WITH_TFM default y if TRUSTED_EXECUTION_NONSECURE - if SERIAL config UART_INTERRUPT_DRIVEN @@ -35,5 +27,3 @@ config IPM_MHU default y endif # IPM - -endif diff --git a/boards/arm/mps2_an521/Kconfig.mps2_an521 b/boards/arm/mps2_an521/Kconfig.mps2_an521 new file mode 100644 index 0000000000000..0d2a1427c0ea8 --- /dev/null +++ b/boards/arm/mps2_an521/Kconfig.mps2_an521 @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MPS2_AN521 + bool + default y + select SOC_SERIES_MPS2 + select SOC_MPS2_AN521_CPU0 + select QEMU_TARGET + select HAS_COVERAGE_SUPPORT diff --git a/boards/arm/mps2_an521/Kconfig.mps2_an521_ns b/boards/arm/mps2_an521/Kconfig.mps2_an521_ns new file mode 100644 index 0000000000000..639d2e5005a6f --- /dev/null +++ b/boards/arm/mps2_an521/Kconfig.mps2_an521_ns @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MPS2_AN521_NS + bool + default y + select SOC_SERIES_MPS2 + select SOC_MPS2_AN521_CPU0 + select QEMU_TARGET + select HAS_COVERAGE_SUPPORT diff --git a/boards/arm/mps2_an521/Kconfig.mps2_an521_remote b/boards/arm/mps2_an521/Kconfig.mps2_an521_remote new file mode 100644 index 0000000000000..95f69b2e725bb --- /dev/null +++ b/boards/arm/mps2_an521/Kconfig.mps2_an521_remote @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MPS2_AN521_REMOTE + bool + default y + select SOC_SERIES_MPS2 + select SOC_MPS2_AN521_CPU1 + select QEMU_TARGET + select HAS_COVERAGE_SUPPORT diff --git a/boards/arm/mps2_an521/mps2_an521_defconfig b/boards/arm/mps2_an521/mps2_an521_defconfig index 032f9bad9d112..413c8cdc5c3ac 100644 --- a/boards/arm/mps2_an521/mps2_an521_defconfig +++ b/boards/arm/mps2_an521/mps2_an521_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_MPS2=y -CONFIG_SOC_MPS2_AN521_CPU0=y -CONFIG_BOARD_MPS2_AN521_CPU0=y CONFIG_RUNTIME_NMI=y CONFIG_ARM_TRUSTZONE_M=y CONFIG_ARM_MPU=y diff --git a/boards/arm/mps2_an521/mps2_an521_ns_defconfig b/boards/arm/mps2_an521/mps2_an521_ns_defconfig index 780fdaf097f48..3e044a55d0442 100644 --- a/boards/arm/mps2_an521/mps2_an521_ns_defconfig +++ b/boards/arm/mps2_an521/mps2_an521_ns_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_MPS2=y -CONFIG_SOC_MPS2_AN521_CPU0=y -CONFIG_BOARD_MPS2_AN521_CPU0_NS=y CONFIG_ARM_TRUSTZONE_M=y CONFIG_RUNTIME_NMI=y CONFIG_TRUSTED_EXECUTION_NONSECURE=y diff --git a/boards/arm/mps2_an521/mps2_an521_remote_defconfig b/boards/arm/mps2_an521/mps2_an521_remote_defconfig index 9bc7f496873db..0c8740a2fb992 100644 --- a/boards/arm/mps2_an521/mps2_an521_remote_defconfig +++ b/boards/arm/mps2_an521/mps2_an521_remote_defconfig @@ -5,9 +5,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_MPS2=y -CONFIG_SOC_MPS2_AN521_CPU1=y -CONFIG_BOARD_MPS2_AN521_CPU1=y CONFIG_RUNTIME_NMI=y CONFIG_ARM_MPU=y CONFIG_QEMU_ICOUNT_SHIFT=7 diff --git a/boards/arm/mps3_an547/Kconfig.board b/boards/arm/mps3_an547/Kconfig.board deleted file mode 100644 index f8e755f12ed55..0000000000000 --- a/boards/arm/mps3_an547/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2021 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MPS3_AN547 - bool "Arm Cortex-M55 (Corstone-300, SSE-300 w/Ethos-U55) on MPS3 (AN547)" - depends on SOC_MPS3_AN547 - select QEMU_TARGET diff --git a/boards/arm/mps3_an547/Kconfig.defconfig b/boards/arm/mps3_an547/Kconfig.defconfig index a318d14aefe6c..4d9dcf2fc989e 100644 --- a/boards/arm/mps3_an547/Kconfig.defconfig +++ b/boards/arm/mps3_an547/Kconfig.defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2018-2021 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_MPS3_AN547 - -config BOARD - default "mps3_an547" - # MPU-based null-pointer dereferencing detection cannot # be applied as the (0x0 - 0x400) is unmapped but QEMU # will still permit bus access. @@ -20,5 +15,3 @@ config UART_INTERRUPT_DRIVEN default y endif # SERIAL - -endif diff --git a/boards/arm/mps3_an547/Kconfig.mps3_an547 b/boards/arm/mps3_an547/Kconfig.mps3_an547 new file mode 100644 index 0000000000000..4a7436e3df21b --- /dev/null +++ b/boards/arm/mps3_an547/Kconfig.mps3_an547 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MPS3_AN547 + bool + default y + select SOC_SERIES_MPS3 + select SOC_MPS3_AN547 + select QEMU_TARGET diff --git a/boards/arm/mps3_an547/Kconfig.mps3_an547_ns b/boards/arm/mps3_an547/Kconfig.mps3_an547_ns new file mode 100644 index 0000000000000..35ab7d3ba177f --- /dev/null +++ b/boards/arm/mps3_an547/Kconfig.mps3_an547_ns @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MPS3_AN547_NS + bool + default y + select SOC_SERIES_MPS3 + select SOC_MPS3_AN547 + select QEMU_TARGET diff --git a/boards/arm/mps3_an547/mps3_an547_defconfig b/boards/arm/mps3_an547/mps3_an547_defconfig index ec0c9fccc3303..90c9b6a9f8e42 100644 --- a/boards/arm/mps3_an547/mps3_an547_defconfig +++ b/boards/arm/mps3_an547/mps3_an547_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_MPS3=y -CONFIG_SOC_MPS3_AN547=y -CONFIG_BOARD_MPS3_AN547=y CONFIG_RUNTIME_NMI=y CONFIG_ARM_TRUSTZONE_M=y CONFIG_ARM_MPU=y diff --git a/boards/arm/mps3_an547/mps3_an547_ns_defconfig b/boards/arm/mps3_an547/mps3_an547_ns_defconfig index f782f9f8623c0..dcf5a1703408e 100644 --- a/boards/arm/mps3_an547/mps3_an547_ns_defconfig +++ b/boards/arm/mps3_an547/mps3_an547_ns_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_MPS3=y -CONFIG_SOC_MPS3_AN547=y -CONFIG_BOARD_MPS3_AN547=y CONFIG_ARM_TRUSTZONE_M=y CONFIG_RUNTIME_NMI=y CONFIG_TRUSTED_EXECUTION_NONSECURE=y diff --git a/boards/arm/msp_exp432p401r_launchxl/Kconfig b/boards/arm/msp_exp432p401r_launchxl/Kconfig deleted file mode 100644 index 13d6b2ad41a06..0000000000000 --- a/boards/arm/msp_exp432p401r_launchxl/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -# TI MSP-EXP432P401R LaunchXL configuration - -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_MSP_EXP432P401R_LAUNCHXL - -endif # BOARD_MSP_EXP432P401R_LAUNCHXL diff --git a/boards/arm/msp_exp432p401r_launchxl/Kconfig.board b/boards/arm/msp_exp432p401r_launchxl/Kconfig.board deleted file mode 100644 index 3a15e56a5d436..0000000000000 --- a/boards/arm/msp_exp432p401r_launchxl/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# TI SimpleLink MSP-EXP432P401R LaunchXL Development Board - -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MSP_EXP432P401R_LAUNCHXL - bool "TI MSP-EXP432P401R LAUNCHXL" - depends on SOC_MSP432P401R diff --git a/boards/arm/msp_exp432p401r_launchxl/Kconfig.defconfig b/boards/arm/msp_exp432p401r_launchxl/Kconfig.defconfig deleted file mode 100644 index f3a70f2bb6ba0..0000000000000 --- a/boards/arm/msp_exp432p401r_launchxl/Kconfig.defconfig +++ /dev/null @@ -1,7 +0,0 @@ -# TI MSP-EXP432P401R LaunchXL development board configuration - -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "msp_exp432p401r_launchxl" - depends on BOARD_MSP_EXP432P401R_LAUNCHXL diff --git a/boards/arm/msp_exp432p401r_launchxl/Kconfig.msp_exp432p401r_launchxl b/boards/arm/msp_exp432p401r_launchxl/Kconfig.msp_exp432p401r_launchxl new file mode 100644 index 0000000000000..c95d1fd7980c6 --- /dev/null +++ b/boards/arm/msp_exp432p401r_launchxl/Kconfig.msp_exp432p401r_launchxl @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MSP_EXP432P401R_LAUNCHXL + bool + default y + select SOC_SERIES_MSP432P4XX + select SOC_MSP432P401R diff --git a/boards/arm/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl_defconfig b/boards/arm/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl_defconfig index a71dce228ebd9..989c1f248dace 100644 --- a/boards/arm/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl_defconfig +++ b/boards/arm/msp_exp432p401r_launchxl/msp_exp432p401r_launchxl_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_MSP_EXP432P401R_LAUNCHXL=y -CONFIG_SOC_SERIES_MSP432P4XX=y -CONFIG_SOC_MSP432P401R=y - # Floating point options CONFIG_FPU=y diff --git a/boards/arm/npcx7m6fb_evb/Kconfig.board b/boards/arm/npcx7m6fb_evb/Kconfig.board deleted file mode 100644 index 84b39c5a9ae6c..0000000000000 --- a/boards/arm/npcx7m6fb_evb/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2020 Nuvoton Technology Corporation. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NPCX7M6FB_EVB - bool "Nuvoton NPCX7M6FB EVB Development board" - depends on SOC_NPCX7M6FB diff --git a/boards/arm/npcx7m6fb_evb/Kconfig.defconfig b/boards/arm/npcx7m6fb_evb/Kconfig.defconfig index fed7b694229ac..824959461942a 100644 --- a/boards/arm/npcx7m6fb_evb/Kconfig.defconfig +++ b/boards/arm/npcx7m6fb_evb/Kconfig.defconfig @@ -1,12 +1,5 @@ # Copyright (c) 2020 Nuvoton Technology Corporation. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NPCX7M6FB_EVB - -config BOARD - default "npcx7m6fb_evb" - -endif # BOARD_NPCX7M6FB_EVB - config SYS_CLOCK_TICKS_PER_SEC default 1000 diff --git a/boards/arm/npcx7m6fb_evb/Kconfig.npcx7m6fb_evb b/boards/arm/npcx7m6fb_evb/Kconfig.npcx7m6fb_evb new file mode 100644 index 0000000000000..afd94375d60b5 --- /dev/null +++ b/boards/arm/npcx7m6fb_evb/Kconfig.npcx7m6fb_evb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NPCX7M6FB_EVB + bool + default y + select SOC_NPCX7M6FB + select SOC_SERIES_NPCX7 diff --git a/boards/arm/npcx7m6fb_evb/npcx7m6fb_evb_defconfig b/boards/arm/npcx7m6fb_evb/npcx7m6fb_evb_defconfig index c1abbbb44f98f..6a79ed9104279 100644 --- a/boards/arm/npcx7m6fb_evb/npcx7m6fb_evb_defconfig +++ b/boards/arm/npcx7m6fb_evb/npcx7m6fb_evb_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_NPCX7M6FB=y -CONFIG_SOC_SERIES_NPCX7=y -CONFIG_BOARD_NPCX7M6FB_EVB=y # Enable NPCX firmware header CONFIG_NPCX_HEADER=y diff --git a/boards/arm/npcx9m6f_evb/Kconfig.board b/boards/arm/npcx9m6f_evb/Kconfig.board deleted file mode 100644 index a652be619d039..0000000000000 --- a/boards/arm/npcx9m6f_evb/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Nuvoton Technology Corporation. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NPCX9M6F_EVB - bool "Nuvoton NPCX9M6F EVB Development board" - depends on SOC_NPCX9M6F diff --git a/boards/arm/npcx9m6f_evb/Kconfig.defconfig b/boards/arm/npcx9m6f_evb/Kconfig.defconfig index 70652315fbc4e..2114a4ad349f1 100644 --- a/boards/arm/npcx9m6f_evb/Kconfig.defconfig +++ b/boards/arm/npcx9m6f_evb/Kconfig.defconfig @@ -1,12 +1,5 @@ # Copyright (c) 2021 Nuvoton Technology Corporation. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NPCX9M6F_EVB - -config BOARD - default "npcx9m6f_evb" - -endif # BOARD_NPCX9M6F_EVB - config SYS_CLOCK_TICKS_PER_SEC default 1000 diff --git a/boards/arm/npcx9m6f_evb/Kconfig.npcx9m6f_evb b/boards/arm/npcx9m6f_evb/Kconfig.npcx9m6f_evb new file mode 100644 index 0000000000000..05e67a3f54066 --- /dev/null +++ b/boards/arm/npcx9m6f_evb/Kconfig.npcx9m6f_evb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NPCX9M6F_EVB + bool + default y + select SOC_NPCX9M6F + select SOC_SERIES_NPCX9 diff --git a/boards/arm/npcx9m6f_evb/npcx9m6f_evb_defconfig b/boards/arm/npcx9m6f_evb/npcx9m6f_evb_defconfig index ae8b83cf8eb44..588c78345991c 100644 --- a/boards/arm/npcx9m6f_evb/npcx9m6f_evb_defconfig +++ b/boards/arm/npcx9m6f_evb/npcx9m6f_evb_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_NPCX9M6F=y -CONFIG_SOC_SERIES_NPCX9=y -CONFIG_BOARD_NPCX9M6F_EVB=y # Enable NPCX firmware header CONFIG_NPCX_HEADER=y diff --git a/boards/arm/nrf21540dk_nrf52840/Kconfig.board b/boards/arm/nrf21540dk_nrf52840/Kconfig.board deleted file mode 100644 index b2c9c86d53eb0..0000000000000 --- a/boards/arm/nrf21540dk_nrf52840/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF21540 DK NRF52840 board configuration - -# Copyright (c) 2020 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF21540DK_NRF52840 - bool "nRF21540 DK NRF52840" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/nrf21540dk_nrf52840/Kconfig.defconfig b/boards/arm/nrf21540dk_nrf52840/Kconfig.defconfig index 71cb76615ed54..f4ef7738a4a89 100644 --- a/boards/arm/nrf21540dk_nrf52840/Kconfig.defconfig +++ b/boards/arm/nrf21540dk_nrf52840/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2020 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF21540DK_NRF52840 - -config BOARD - default "nrf21540dk_nrf52840" - config BT_CTLR default BT - -endif # BOARD_NRF21540DK_NRF52840 diff --git a/boards/arm/nrf21540dk_nrf52840/Kconfig.nrf21540dk_nrf52840 b/boards/arm/nrf21540dk_nrf52840/Kconfig.nrf21540dk_nrf52840 new file mode 100644 index 0000000000000..604d337b26d5d --- /dev/null +++ b/boards/arm/nrf21540dk_nrf52840/Kconfig.nrf21540dk_nrf52840 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF21540DK_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840_defconfig b/boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840_defconfig index 56d8497b43a7b..b407b31ef3ec0 100644 --- a/boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840_defconfig +++ b/boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NRF21540DK_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf51_ble400/Kconfig.board b/boards/arm/nrf51_ble400/Kconfig.board deleted file mode 100644 index 111b359355ba0..0000000000000 --- a/boards/arm/nrf51_ble400/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF51 BLE400 board configuration - -# Copyright (c) 2018 Roman Tataurov -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF51_BLE400 - bool "nRF51 BLE400" - depends on SOC_NRF51822_QFAC diff --git a/boards/arm/nrf51_ble400/Kconfig.defconfig b/boards/arm/nrf51_ble400/Kconfig.defconfig index 7f453a497bd18..8b9e502a9c1a9 100644 --- a/boards/arm/nrf51_ble400/Kconfig.defconfig +++ b/boards/arm/nrf51_ble400/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2018 Roman Tataurov # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF51_BLE400 - -config BOARD - default "nrf51_ble400" - config BT_CTLR default BT - -endif # BOARD_NRF51_BLE400 diff --git a/boards/arm/nrf51_ble400/Kconfig.nrf51_ble400 b/boards/arm/nrf51_ble400/Kconfig.nrf51_ble400 new file mode 100644 index 0000000000000..3d1ec4608ee79 --- /dev/null +++ b/boards/arm/nrf51_ble400/Kconfig.nrf51_ble400 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF51_BLE400 + bool + default y + select SOC_SERIES_NRF51X + select SOC_NRF51822_QFAC diff --git a/boards/arm/nrf51_ble400/nrf51_ble400_defconfig b/boards/arm/nrf51_ble400/nrf51_ble400_defconfig index 57332970318f8..e4da7d34197b5 100644 --- a/boards/arm/nrf51_ble400/nrf51_ble400_defconfig +++ b/boards/arm/nrf51_ble400/nrf51_ble400_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF51X=y -CONFIG_SOC_NRF51822_QFAC=y -CONFIG_BOARD_NRF51_BLE400=y # enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/nrf51_blenano/Kconfig.board b/boards/arm/nrf51_blenano/Kconfig.board deleted file mode 100644 index a708a1ac5df96..0000000000000 --- a/boards/arm/nrf51_blenano/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF51 BLENANO board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF51_BLENANO - bool "nRF51 BLENANO" - depends on SOC_NRF51822_QFAA diff --git a/boards/arm/nrf51_blenano/Kconfig.defconfig b/boards/arm/nrf51_blenano/Kconfig.defconfig index 57a6b286d4df8..21e1278357ea9 100644 --- a/boards/arm/nrf51_blenano/Kconfig.defconfig +++ b/boards/arm/nrf51_blenano/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF51_BLENANO - -config BOARD - default "nrf51_blenano" - config BT_CTLR default BT - -endif # BOARD_NRF51_BLENANO diff --git a/boards/arm/nrf51_blenano/Kconfig.nrf51_blenano b/boards/arm/nrf51_blenano/Kconfig.nrf51_blenano new file mode 100644 index 0000000000000..8cb2bd98f0db6 --- /dev/null +++ b/boards/arm/nrf51_blenano/Kconfig.nrf51_blenano @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF51_BLENANO + bool + default y + select SOC_SERIES_NRF51X + select SOC_NRF51822_QFAA diff --git a/boards/arm/nrf51_blenano/nrf51_blenano_defconfig b/boards/arm/nrf51_blenano/nrf51_blenano_defconfig index e4a5441877a11..e4da7d34197b5 100644 --- a/boards/arm/nrf51_blenano/nrf51_blenano_defconfig +++ b/boards/arm/nrf51_blenano/nrf51_blenano_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF51X=y -CONFIG_SOC_NRF51822_QFAA=y -CONFIG_BOARD_NRF51_BLENANO=y # enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/nrf51_vbluno51/Kconfig.board b/boards/arm/nrf51_vbluno51/Kconfig.board deleted file mode 100644 index d0e686662a4a1..0000000000000 --- a/boards/arm/nrf51_vbluno51/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF51-VBLUNO51 board configuration - -# Copyright (c) 2017 VNG IoT Lab Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF51_VBLUNO51 - bool "nRF51 VBLUno51 BLE" - depends on SOC_NRF51822_QFAC diff --git a/boards/arm/nrf51_vbluno51/Kconfig.defconfig b/boards/arm/nrf51_vbluno51/Kconfig.defconfig index bcb1c0d21602a..10e7bfa4288d6 100644 --- a/boards/arm/nrf51_vbluno51/Kconfig.defconfig +++ b/boards/arm/nrf51_vbluno51/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2017 VNG IoT Lab Limited. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF51_VBLUNO51 - -config BOARD - default "nrf51_vbluno51" - config BT_CTLR default BT - -endif # BOARD_NRF51_VBLUNO51 diff --git a/boards/arm/nrf51_vbluno51/Kconfig.nrf51_vbluno51 b/boards/arm/nrf51_vbluno51/Kconfig.nrf51_vbluno51 new file mode 100644 index 0000000000000..031dbb5e52087 --- /dev/null +++ b/boards/arm/nrf51_vbluno51/Kconfig.nrf51_vbluno51 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF51_VBLUNO51 + bool + default y + select SOC_SERIES_NRF51X + select SOC_NRF51822_QFAC diff --git a/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig b/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig index 9cdf638b99c25..e4da7d34197b5 100644 --- a/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig +++ b/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF51X=y -CONFIG_SOC_NRF51822_QFAC=y -CONFIG_BOARD_NRF51_VBLUNO51=y # enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/nrf51dk_nrf51422/Kconfig.board b/boards/arm/nrf51dk_nrf51422/Kconfig.board deleted file mode 100644 index 0d93e23182006..0000000000000 --- a/boards/arm/nrf51dk_nrf51422/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF51 DK NRF51422 board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF51DK_NRF51422 - bool "nRF51 DK NRF51422" - depends on SOC_NRF51822_QFAC diff --git a/boards/arm/nrf51dk_nrf51422/Kconfig.defconfig b/boards/arm/nrf51dk_nrf51422/Kconfig.defconfig index 54d65d88a5e94..af3dce0c9f48f 100644 --- a/boards/arm/nrf51dk_nrf51422/Kconfig.defconfig +++ b/boards/arm/nrf51dk_nrf51422/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2016 Linaro Limited. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF51DK_NRF51422 - -config BOARD - default "nrf51dk_nrf51422" - config BT_CTLR default BT - -endif # BOARD_NRF51DK_NRF51422 diff --git a/boards/arm/nrf51dk_nrf51422/Kconfig.nrf51dk_nrf51422 b/boards/arm/nrf51dk_nrf51422/Kconfig.nrf51dk_nrf51422 new file mode 100644 index 0000000000000..61ab14211de42 --- /dev/null +++ b/boards/arm/nrf51dk_nrf51422/Kconfig.nrf51dk_nrf51422 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF51DK_NRF51422 + bool + default y + select SOC_SERIES_NRF51X + select SOC_NRF51822_QFAC diff --git a/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422_defconfig b/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422_defconfig index 0aba32cb596fe..46dc69d74cde7 100644 --- a/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422_defconfig +++ b/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF51X=y -CONFIG_SOC_NRF51822_QFAC=y -CONFIG_BOARD_NRF51DK_NRF51422=y - # enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/nrf51dongle_nrf51422/Kconfig.board b/boards/arm/nrf51dongle_nrf51422/Kconfig.board deleted file mode 100644 index 733c12ea3a66f..0000000000000 --- a/boards/arm/nrf51dongle_nrf51422/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF51 Dongle NRF51422 board configuration - -# Copyright (c) 2018 Nordic Semiconductor ASA. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF51DONGLE_NRF51422 - bool "nRF51 Dongle NRF51422" - depends on SOC_NRF51822_QFAC diff --git a/boards/arm/nrf51dongle_nrf51422/Kconfig.defconfig b/boards/arm/nrf51dongle_nrf51422/Kconfig.defconfig index baad053bacaad..37802892ade6b 100644 --- a/boards/arm/nrf51dongle_nrf51422/Kconfig.defconfig +++ b/boards/arm/nrf51dongle_nrf51422/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2018-2020 Nordic Semiconductor ASA. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF51DONGLE_NRF51422 - -config BOARD - default "nrf51dongle_nrf51422" - config BT_CTLR default BT - -endif # BOARD_NRF51DONGLE_NRF51422 diff --git a/boards/arm/nrf51dongle_nrf51422/Kconfig.nrf51dongle_nrf51422 b/boards/arm/nrf51dongle_nrf51422/Kconfig.nrf51dongle_nrf51422 new file mode 100644 index 0000000000000..3940e55f27353 --- /dev/null +++ b/boards/arm/nrf51dongle_nrf51422/Kconfig.nrf51dongle_nrf51422 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF51DONGLE_NRF51422 + bool + default y + select SOC_SERIES_NRF51X + select SOC_NRF51822_QFAC diff --git a/boards/arm/nrf51dongle_nrf51422/nrf51dongle_nrf51422_defconfig b/boards/arm/nrf51dongle_nrf51422/nrf51dongle_nrf51422_defconfig index dbe03eef66db1..e4da7d34197b5 100644 --- a/boards/arm/nrf51dongle_nrf51422/nrf51dongle_nrf51422_defconfig +++ b/boards/arm/nrf51dongle_nrf51422/nrf51dongle_nrf51422_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF51X=y -CONFIG_SOC_NRF51822_QFAC=y -CONFIG_BOARD_NRF51DONGLE_NRF51422=y # enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/nrf52832_mdk/Kconfig.board b/boards/arm/nrf52832_mdk/Kconfig.board deleted file mode 100644 index 1707bf292164b..0000000000000 --- a/boards/arm/nrf52832_mdk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52832-MDK board configuration - -# Copyright (c) 2018 makerdiary.com. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52832_MDK - bool "nRF52832-MDK" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52832_mdk/Kconfig.defconfig b/boards/arm/nrf52832_mdk/Kconfig.defconfig index 0e5c3fd78174c..abcfdb6acd007 100644 --- a/boards/arm/nrf52832_mdk/Kconfig.defconfig +++ b/boards/arm/nrf52832_mdk/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2018 makerdiary.com. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52832_MDK - -config BOARD - default "nrf52832_mdk" - config BT_CTLR default BT - -endif # BOARD_NRF52832_MDK diff --git a/boards/arm/nrf52832_mdk/Kconfig.nrf52832_mdk b/boards/arm/nrf52832_mdk/Kconfig.nrf52832_mdk new file mode 100644 index 0000000000000..def9067a11745 --- /dev/null +++ b/boards/arm/nrf52832_mdk/Kconfig.nrf52832_mdk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52832_MDK + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52832_mdk/nrf52832_mdk_defconfig b/boards/arm/nrf52832_mdk/nrf52832_mdk_defconfig index 2c283bda97ee7..4781339a59ec8 100644 --- a/boards/arm/nrf52832_mdk/nrf52832_mdk_defconfig +++ b/boards/arm/nrf52832_mdk/nrf52832_mdk_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_NRF52832_MDK=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52833dk_nrf52820/Kconfig.board b/boards/arm/nrf52833dk_nrf52820/Kconfig.board deleted file mode 100644 index 5be8867d80419..0000000000000 --- a/boards/arm/nrf52833dk_nrf52820/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52833DK nRF52820 board configuration - -# Copyright (c) 2020 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52833DK_NRF52820 - bool "nRF52833 DK NRF52820" - depends on SOC_NRF52820_QDAA diff --git a/boards/arm/nrf52833dk_nrf52820/Kconfig.defconfig b/boards/arm/nrf52833dk_nrf52820/Kconfig.defconfig index 705821fa71d2a..784d83fdfa968 100644 --- a/boards/arm/nrf52833dk_nrf52820/Kconfig.defconfig +++ b/boards/arm/nrf52833dk_nrf52820/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2020 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52833DK_NRF52820 - -config BOARD - default "nrf52833dk_nrf52820" - config BT_CTLR default BT - -endif # BOARD_NRF52833DK_NRF52820 diff --git a/boards/arm/nrf52833dk_nrf52820/Kconfig.nrf52833dk_nrf52820 b/boards/arm/nrf52833dk_nrf52820/Kconfig.nrf52833dk_nrf52820 new file mode 100644 index 0000000000000..8a63c9ebc34d0 --- /dev/null +++ b/boards/arm/nrf52833dk_nrf52820/Kconfig.nrf52833dk_nrf52820 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52833DK_NRF52820 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52820_QDAA diff --git a/boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820_defconfig b/boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820_defconfig index 9bbc4da98cbea..b407b31ef3ec0 100644 --- a/boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820_defconfig +++ b/boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52820_QDAA=y -CONFIG_BOARD_NRF52833DK_NRF52820=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52833dk_nrf52833/Kconfig.board b/boards/arm/nrf52833dk_nrf52833/Kconfig.board deleted file mode 100644 index 11ab4befc9785..0000000000000 --- a/boards/arm/nrf52833dk_nrf52833/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52833 DK NRF52833 board configuration - -# Copyright (c) 2019 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52833DK_NRF52833 - bool "NRF52833 DK NRF52833" - depends on SOC_NRF52833_QIAA diff --git a/boards/arm/nrf52833dk_nrf52833/Kconfig.defconfig b/boards/arm/nrf52833dk_nrf52833/Kconfig.defconfig index 6ec17b788646b..de25bfa8bf946 100644 --- a/boards/arm/nrf52833dk_nrf52833/Kconfig.defconfig +++ b/boards/arm/nrf52833dk_nrf52833/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2019 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52833DK_NRF52833 - -config BOARD - default "nrf52833dk_nrf52833" - config BT_CTLR default BT - -endif # BOARD_NRF52833DK_NRF52833 diff --git a/boards/arm/nrf52833dk_nrf52833/Kconfig.nrf52833dk_nrf52833 b/boards/arm/nrf52833dk_nrf52833/Kconfig.nrf52833dk_nrf52833 new file mode 100644 index 0000000000000..d653dc36622ec --- /dev/null +++ b/boards/arm/nrf52833dk_nrf52833/Kconfig.nrf52833dk_nrf52833 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52833DK_NRF52833 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52833_QIAA diff --git a/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833_defconfig b/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833_defconfig index 7fe9f4e480c54..b407b31ef3ec0 100644 --- a/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833_defconfig +++ b/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52833_QIAA=y -CONFIG_BOARD_NRF52833DK_NRF52833=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52840_blip/Kconfig.board b/boards/arm/nrf52840_blip/Kconfig.board deleted file mode 100644 index 12236998c6dea..0000000000000 --- a/boards/arm/nrf52840_blip/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Electronut Labs Blip board configuration - -# Copyright (c) 2018 Electronut Labs -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52840_BLIP - bool "Electronut Labs Blip" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840_blip/Kconfig.defconfig b/boards/arm/nrf52840_blip/Kconfig.defconfig index ab5424a1dd01f..eb21a54bae167 100644 --- a/boards/arm/nrf52840_blip/Kconfig.defconfig +++ b/boards/arm/nrf52840_blip/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2018 Electronut Labs # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840_BLIP - -config BOARD - default "nrf52840_blip" - config BT_CTLR default BT - -endif # BOARD_NRF52840_BLIP diff --git a/boards/arm/nrf52840_blip/Kconfig.nrf52840_blip b/boards/arm/nrf52840_blip/Kconfig.nrf52840_blip new file mode 100644 index 0000000000000..e3b10278f39b7 --- /dev/null +++ b/boards/arm/nrf52840_blip/Kconfig.nrf52840_blip @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52840_BLIP + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840_blip/nrf52840_blip_defconfig b/boards/arm/nrf52840_blip/nrf52840_blip_defconfig index 82c0146ecf114..4781339a59ec8 100644 --- a/boards/arm/nrf52840_blip/nrf52840_blip_defconfig +++ b/boards/arm/nrf52840_blip/nrf52840_blip_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NRF52840_BLIP=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52840_mdk/Kconfig.board b/boards/arm/nrf52840_mdk/Kconfig.board deleted file mode 100644 index 81f9b3a88f75f..0000000000000 --- a/boards/arm/nrf52840_mdk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52840-MDK board configuration - -# Copyright (c) 2018 makerdiary.com -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52840_MDK - bool "NRF52840-MDK" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840_mdk/Kconfig.defconfig b/boards/arm/nrf52840_mdk/Kconfig.defconfig index 8c321634996dd..0feea30715dd2 100644 --- a/boards/arm/nrf52840_mdk/Kconfig.defconfig +++ b/boards/arm/nrf52840_mdk/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2018 makerdiary.com # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840_MDK - -config BOARD - default "nrf52840_mdk" - config BT_CTLR default BT - -endif # BOARD_NRF52840_MDK diff --git a/boards/arm/nrf52840_mdk/Kconfig.nrf52840_mdk b/boards/arm/nrf52840_mdk/Kconfig.nrf52840_mdk new file mode 100644 index 0000000000000..6c5c41d2ed4cf --- /dev/null +++ b/boards/arm/nrf52840_mdk/Kconfig.nrf52840_mdk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52840_MDK + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840_mdk/nrf52840_mdk_defconfig b/boards/arm/nrf52840_mdk/nrf52840_mdk_defconfig index f0ed2a2fbad88..4781339a59ec8 100644 --- a/boards/arm/nrf52840_mdk/nrf52840_mdk_defconfig +++ b/boards/arm/nrf52840_mdk/nrf52840_mdk_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NRF52840_MDK=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52840_mdk_usb_dongle/Kconfig b/boards/arm/nrf52840_mdk_usb_dongle/Kconfig index fb658864a0bae..6f70460e9b0fa 100644 --- a/boards/arm/nrf52840_mdk_usb_dongle/Kconfig +++ b/boards/arm/nrf52840_mdk_usb_dongle/Kconfig @@ -4,8 +4,6 @@ # Copyright (c) 2018 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840_MDK_USB_DONGLE - config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X @@ -17,5 +15,3 @@ config BOARD_HAS_NRF5_BOOTLOADER help If selected, applications are linked so that they can be loaded by Nordic nRF5 bootloader. - -endif # BOARD_NRF52840_MDK_USB_DONGLE diff --git a/boards/arm/nrf52840_mdk_usb_dongle/Kconfig.board b/boards/arm/nrf52840_mdk_usb_dongle/Kconfig.board deleted file mode 100644 index 975e4bd9e9e67..0000000000000 --- a/boards/arm/nrf52840_mdk_usb_dongle/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# nRF52840 MDK USB Dongle board configuration - -# Copyright (c) 2022 Nikola Trifunovic -# Copyright (c) 2018 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52840_MDK_USB_DONGLE - bool "nRF52840 MDK USB DONGLE" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840_mdk_usb_dongle/Kconfig.defconfig b/boards/arm/nrf52840_mdk_usb_dongle/Kconfig.defconfig index 7fb8a5fde94c6..40539422f448e 100644 --- a/boards/arm/nrf52840_mdk_usb_dongle/Kconfig.defconfig +++ b/boards/arm/nrf52840_mdk_usb_dongle/Kconfig.defconfig @@ -6,11 +6,6 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840_MDK_USB_DONGLE - -config BOARD - default "nrf52840_mdk_usb_dongle" - # To let the nRF5 bootloader load an application, the application # must be linked after Nordic MBR, that is factory-programmed on the board. @@ -36,5 +31,3 @@ endif # USB_DEVICE_STACK config BT_CTLR default BT - -endif # BOARD_NRF52840_MDK_USB_DONGLE diff --git a/boards/arm/nrf52840_mdk_usb_dongle/Kconfig.nrf52840_mdk_usb_dongle b/boards/arm/nrf52840_mdk_usb_dongle/Kconfig.nrf52840_mdk_usb_dongle new file mode 100644 index 0000000000000..8967a84ef1ed6 --- /dev/null +++ b/boards/arm/nrf52840_mdk_usb_dongle/Kconfig.nrf52840_mdk_usb_dongle @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52840_MDK_USB_DONGLE + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840_mdk_usb_dongle/nrf52840_mdk_usb_dongle_defconfig b/boards/arm/nrf52840_mdk_usb_dongle/nrf52840_mdk_usb_dongle_defconfig index 92ec1dc78852b..9a7555854826f 100644 --- a/boards/arm/nrf52840_mdk_usb_dongle/nrf52840_mdk_usb_dongle_defconfig +++ b/boards/arm/nrf52840_mdk_usb_dongle/nrf52840_mdk_usb_dongle_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NRF52840_MDK_USB_DONGLE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52840_papyr/Kconfig.board b/boards/arm/nrf52840_papyr/Kconfig.board deleted file mode 100644 index 574b885163e7f..0000000000000 --- a/boards/arm/nrf52840_papyr/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Electronut Labs Papyr board configuration - -# Copyright (c) 2018 Electronut Labs -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52840_PAPYR - bool "NRF52840 PAPYR" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840_papyr/Kconfig.defconfig b/boards/arm/nrf52840_papyr/Kconfig.defconfig index 339d481404b4e..37ae9d121fee6 100644 --- a/boards/arm/nrf52840_papyr/Kconfig.defconfig +++ b/boards/arm/nrf52840_papyr/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2018 Electronut Labs # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840_PAPYR - -config BOARD - default "nrf52840_papyr" - config BT_CTLR default BT - -endif # BOARD_NRF52840_PAPYR diff --git a/boards/arm/nrf52840_papyr/Kconfig.nrf52840_papyr b/boards/arm/nrf52840_papyr/Kconfig.nrf52840_papyr new file mode 100644 index 0000000000000..d2ae98fbed4f7 --- /dev/null +++ b/boards/arm/nrf52840_papyr/Kconfig.nrf52840_papyr @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52840_PAPYR + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840_papyr/nrf52840_papyr_defconfig b/boards/arm/nrf52840_papyr/nrf52840_papyr_defconfig index 0ad48d7f94050..4781339a59ec8 100644 --- a/boards/arm/nrf52840_papyr/nrf52840_papyr_defconfig +++ b/boards/arm/nrf52840_papyr/nrf52840_papyr_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NRF52840_PAPYR=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52840dk_nrf52811/Kconfig.board b/boards/arm/nrf52840dk_nrf52811/Kconfig.board deleted file mode 100644 index 5eefb967cd7a3..0000000000000 --- a/boards/arm/nrf52840dk_nrf52811/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52840 DK NRF52811 board configuration - -# Copyright (c) 2019 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52840DK_NRF52811 - bool "nRF52840 DK NRF52811" - depends on SOC_NRF52811_QFAA diff --git a/boards/arm/nrf52840dk_nrf52811/Kconfig.defconfig b/boards/arm/nrf52840dk_nrf52811/Kconfig.defconfig index 2d933bf12b3d1..62002ce305d09 100644 --- a/boards/arm/nrf52840dk_nrf52811/Kconfig.defconfig +++ b/boards/arm/nrf52840dk_nrf52811/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2019 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840DK_NRF52811 - -config BOARD - default "nrf52840dk_nrf52811" - config BT_CTLR default BT - -endif # BOARD_NRF52840DK_NRF52811 diff --git a/boards/arm/nrf52840dk_nrf52811/Kconfig.nrf52840dk_nrf52811 b/boards/arm/nrf52840dk_nrf52811/Kconfig.nrf52840dk_nrf52811 new file mode 100644 index 0000000000000..f0e669d77022f --- /dev/null +++ b/boards/arm/nrf52840dk_nrf52811/Kconfig.nrf52840dk_nrf52811 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52840DK_NRF52811 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52811_QFAA diff --git a/boards/arm/nrf52840dk_nrf52811/nrf52840dk_nrf52811_defconfig b/boards/arm/nrf52840dk_nrf52811/nrf52840dk_nrf52811_defconfig index 36553a757eb68..bdb11434ca75c 100644 --- a/boards/arm/nrf52840dk_nrf52811/nrf52840dk_nrf52811_defconfig +++ b/boards/arm/nrf52840dk_nrf52811/nrf52840dk_nrf52811_defconfig @@ -2,9 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52811_QFAA=y -CONFIG_BOARD_NRF52840DK_NRF52811=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52840dk_nrf52840/Kconfig b/boards/arm/nrf52840dk_nrf52840/Kconfig index 037d1dc9216d0..b56c12bdcec0f 100644 --- a/boards/arm/nrf52840dk_nrf52840/Kconfig +++ b/boards/arm/nrf52840dk_nrf52840/Kconfig @@ -3,8 +3,6 @@ # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840DK_NRF52840 - config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X @@ -14,5 +12,3 @@ config BOARD_ENABLE_DCDC_HV bool "High Voltage DCDC converter" select SOC_DCDC_NRF52X_HV default y - -endif # BOARD_NRF52840DK_NRF52840 diff --git a/boards/arm/nrf52840dk_nrf52840/Kconfig.board b/boards/arm/nrf52840dk_nrf52840/Kconfig.board deleted file mode 100644 index dcfdb550a4361..0000000000000 --- a/boards/arm/nrf52840dk_nrf52840/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52840 DK NRF52840 board configuration - -# Copyright (c) 2016 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52840DK_NRF52840 - bool "nRF52840 DK NRF52840" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840dk_nrf52840/Kconfig.defconfig b/boards/arm/nrf52840dk_nrf52840/Kconfig.defconfig index 31850c6593754..205c4dfe4930d 100644 --- a/boards/arm/nrf52840dk_nrf52840/Kconfig.defconfig +++ b/boards/arm/nrf52840dk_nrf52840/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840DK_NRF52840 - -config BOARD - default "nrf52840dk_nrf52840" - config BT_CTLR default BT - -endif # BOARD_NRF52840DK_NRF52840 diff --git a/boards/arm/nrf52840dk_nrf52840/Kconfig.nrf52840dk_nrf52840 b/boards/arm/nrf52840dk_nrf52840/Kconfig.nrf52840dk_nrf52840 new file mode 100644 index 0000000000000..ec1e0ea701ca7 --- /dev/null +++ b/boards/arm/nrf52840dk_nrf52840/Kconfig.nrf52840dk_nrf52840 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52840DK_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840_defconfig b/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840_defconfig index 100d91ed3203b..f4129c730a9d8 100644 --- a/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840_defconfig +++ b/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NRF52840DK_NRF52840=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52840dongle_nrf52840/Kconfig b/boards/arm/nrf52840dongle_nrf52840/Kconfig index cdf1b51844e46..a69b71eee6663 100644 --- a/boards/arm/nrf52840dongle_nrf52840/Kconfig +++ b/boards/arm/nrf52840dongle_nrf52840/Kconfig @@ -3,8 +3,6 @@ # Copyright (c) 2018 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840DONGLE_NRF52840 - config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X @@ -21,5 +19,3 @@ config BOARD_HAS_NRF5_BOOTLOADER help If selected, applications are linked so that they can be loaded by Nordic nRF5 bootloader. - -endif # BOARD_NRF52840DONGLE_NRF52840 diff --git a/boards/arm/nrf52840dongle_nrf52840/Kconfig.board b/boards/arm/nrf52840dongle_nrf52840/Kconfig.board deleted file mode 100644 index 463bd53b38180..0000000000000 --- a/boards/arm/nrf52840dongle_nrf52840/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52840 Dongle NRF52840 board configuration - -# Copyright (c) 2018 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52840DONGLE_NRF52840 - bool "nRF52840 DONGLE NRF52840" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840dongle_nrf52840/Kconfig.defconfig b/boards/arm/nrf52840dongle_nrf52840/Kconfig.defconfig index afa76573ea68e..82d586ed96cf6 100644 --- a/boards/arm/nrf52840dongle_nrf52840/Kconfig.defconfig +++ b/boards/arm/nrf52840dongle_nrf52840/Kconfig.defconfig @@ -4,11 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52840DONGLE_NRF52840 - -config BOARD - default "nrf52840dongle_nrf52840" - # To let the nRF5 bootloader load an application, the application # must be linked after Nordic MBR, that is factory-programmed on the board. @@ -34,5 +29,3 @@ endif # USB_DEVICE_STACK config BT_CTLR default BT - -endif # BOARD_NRF52840DONGLE_NRF52840 diff --git a/boards/arm/nrf52840dongle_nrf52840/Kconfig.nrf52840dongle_nrf52840 b/boards/arm/nrf52840dongle_nrf52840/Kconfig.nrf52840dongle_nrf52840 new file mode 100644 index 0000000000000..71319e2b5945e --- /dev/null +++ b/boards/arm/nrf52840dongle_nrf52840/Kconfig.nrf52840dongle_nrf52840 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52840DONGLE_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840_defconfig b/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840_defconfig index 58bedfe452dc4..9a7555854826f 100644 --- a/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840_defconfig +++ b/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NRF52840DONGLE_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52_adafruit_feather/Kconfig.board b/boards/arm/nrf52_adafruit_feather/Kconfig.board deleted file mode 100644 index 0f629d853df00..0000000000000 --- a/boards/arm/nrf52_adafruit_feather/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52 ADAFRUIT FEATHER board configuration - -# Copyright (c) 2018 LEDCity AG. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52_ADAFRUIT_FEATHER - bool "nRF52 ADAFRUIT FEATHER" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52_adafruit_feather/Kconfig.defconfig b/boards/arm/nrf52_adafruit_feather/Kconfig.defconfig index c75ff94e5203c..23895c2002ee6 100644 --- a/boards/arm/nrf52_adafruit_feather/Kconfig.defconfig +++ b/boards/arm/nrf52_adafruit_feather/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2018 LEDCity AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52_ADAFRUIT_FEATHER - -config BOARD - default "nrf52_adafruit_feather" - config BT_CTLR default BT - -endif # BOARD_NRF52_ADAFRUIT_FEATHER diff --git a/boards/arm/nrf52_adafruit_feather/Kconfig.nrf52_adafruit_feather b/boards/arm/nrf52_adafruit_feather/Kconfig.nrf52_adafruit_feather new file mode 100644 index 0000000000000..48ad0f35f6f6a --- /dev/null +++ b/boards/arm/nrf52_adafruit_feather/Kconfig.nrf52_adafruit_feather @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52_ADAFRUIT_FEATHER + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig b/boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig index 42948633b2f9d..4781339a59ec8 100644 --- a/boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig +++ b/boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_NRF52_ADAFRUIT_FEATHER=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52_blenano2/Kconfig.board b/boards/arm/nrf52_blenano2/Kconfig.board deleted file mode 100644 index 05fe6ab53d52a..0000000000000 --- a/boards/arm/nrf52_blenano2/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52 BLENANO 2 board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52_BLENANO2 - bool "nRF52 BLENANO2" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52_blenano2/Kconfig.defconfig b/boards/arm/nrf52_blenano2/Kconfig.defconfig index b5a7184c1a80c..158d0dd3c0444 100644 --- a/boards/arm/nrf52_blenano2/Kconfig.defconfig +++ b/boards/arm/nrf52_blenano2/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52_BLENANO2 - -config BOARD - default "nrf52_blenano2" - config BT_CTLR default BT - -endif # BOARD_NRF52_BLENANO2 diff --git a/boards/arm/nrf52_blenano2/Kconfig.nrf52_blenano2 b/boards/arm/nrf52_blenano2/Kconfig.nrf52_blenano2 new file mode 100644 index 0000000000000..0fb7b0ccd911d --- /dev/null +++ b/boards/arm/nrf52_blenano2/Kconfig.nrf52_blenano2 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52_BLENANO2 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig index 5c51849c0d9a7..b2cfffd1184c5 100644 --- a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig +++ b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_NRF52_BLENANO2=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52_sparkfun/Kconfig.board b/boards/arm/nrf52_sparkfun/Kconfig.board deleted file mode 100644 index 3f290f593cf34..0000000000000 --- a/boards/arm/nrf52_sparkfun/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Sparkfun nRF52832 breakout board configuration - -# Copyright (c) 2017 Shawn Nock -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52_SPARKFUN - bool "nRF52 SPARKFUN" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52_sparkfun/Kconfig.defconfig b/boards/arm/nrf52_sparkfun/Kconfig.defconfig index 7629db89439cd..81f3f805b7268 100644 --- a/boards/arm/nrf52_sparkfun/Kconfig.defconfig +++ b/boards/arm/nrf52_sparkfun/Kconfig.defconfig @@ -4,12 +4,5 @@ # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52_SPARKFUN - -config BOARD - default "nrf52_sparkfun" - config BT_CTLR default BT - -endif # BOARD_NRF52_SPARKFUN diff --git a/boards/arm/nrf52_sparkfun/Kconfig.nrf52_sparkfun b/boards/arm/nrf52_sparkfun/Kconfig.nrf52_sparkfun new file mode 100644 index 0000000000000..04a1ce0af1a5a --- /dev/null +++ b/boards/arm/nrf52_sparkfun/Kconfig.nrf52_sparkfun @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52_SPARKFUN + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52_sparkfun/nrf52_sparkfun_defconfig b/boards/arm/nrf52_sparkfun/nrf52_sparkfun_defconfig index 944fc20b9c8f5..5b8f845bc23e9 100644 --- a/boards/arm/nrf52_sparkfun/nrf52_sparkfun_defconfig +++ b/boards/arm/nrf52_sparkfun/nrf52_sparkfun_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_NRF52_SPARKFUN=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52_vbluno52/Kconfig b/boards/arm/nrf52_vbluno52/Kconfig deleted file mode 100644 index 026b4b301a7af..0000000000000 --- a/boards/arm/nrf52_vbluno52/Kconfig +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52 VBLUno52 board configuration - -# Copyright (c) 2017 VNG IoT Lab -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NRF52_VBLUNO52 - -endif # BOARD_NRF52_VBLUNO52 diff --git a/boards/arm/nrf52_vbluno52/Kconfig.board b/boards/arm/nrf52_vbluno52/Kconfig.board deleted file mode 100644 index bb1c223f4801a..0000000000000 --- a/boards/arm/nrf52_vbluno52/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52 VBLUno52 board configuration -# Copyright (c) 2017 VNG IoT Lab - -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52_VBLUNO52 - bool "nRF52 VBLUno52" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52_vbluno52/Kconfig.defconfig b/boards/arm/nrf52_vbluno52/Kconfig.defconfig index 28f6149636788..203901d25d0bb 100644 --- a/boards/arm/nrf52_vbluno52/Kconfig.defconfig +++ b/boards/arm/nrf52_vbluno52/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2017 VNG IoT Lab # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52_VBLUNO52 - -config BOARD - default "nrf52_vbluno52" - config BT_CTLR default BT - -endif # BOARD_NRF52_VBLUNO52 diff --git a/boards/arm/nrf52_vbluno52/Kconfig.nrf52_vbluno52 b/boards/arm/nrf52_vbluno52/Kconfig.nrf52_vbluno52 new file mode 100644 index 0000000000000..117992e862cf9 --- /dev/null +++ b/boards/arm/nrf52_vbluno52/Kconfig.nrf52_vbluno52 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52_VBLUNO52 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig b/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig index 97f4efbc23650..4781339a59ec8 100644 --- a/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig +++ b/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_NRF52_VBLUNO52=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52dk_nrf52805/Kconfig.board b/boards/arm/nrf52dk_nrf52805/Kconfig.board deleted file mode 100644 index cf5fede287265..0000000000000 --- a/boards/arm/nrf52dk_nrf52805/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52 DK nRF52805 board configuration - -# Copyright (c) 2020 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52DK_NRF52805 - bool "nRF52 DK NRF52805" - depends on SOC_NRF52805_CAAA diff --git a/boards/arm/nrf52dk_nrf52805/Kconfig.defconfig b/boards/arm/nrf52dk_nrf52805/Kconfig.defconfig index 6fa1686219e0f..dd2a4a7565e96 100644 --- a/boards/arm/nrf52dk_nrf52805/Kconfig.defconfig +++ b/boards/arm/nrf52dk_nrf52805/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2020 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52DK_NRF52805 - -config BOARD - default "nrf52dk_nrf52805" - config BT_CTLR default BT - -endif # BOARD_NRF52DK_NRF52805 diff --git a/boards/arm/nrf52dk_nrf52805/Kconfig.nrf52dk_nrf52805 b/boards/arm/nrf52dk_nrf52805/Kconfig.nrf52dk_nrf52805 new file mode 100644 index 0000000000000..b776fd6bd8089 --- /dev/null +++ b/boards/arm/nrf52dk_nrf52805/Kconfig.nrf52dk_nrf52805 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52DK_NRF52805 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52805_CAAA diff --git a/boards/arm/nrf52dk_nrf52805/nrf52dk_nrf52805_defconfig b/boards/arm/nrf52dk_nrf52805/nrf52dk_nrf52805_defconfig index 31571f10fb48a..e8a8cbc7c14cb 100644 --- a/boards/arm/nrf52dk_nrf52805/nrf52dk_nrf52805_defconfig +++ b/boards/arm/nrf52dk_nrf52805/nrf52dk_nrf52805_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52805_CAAA=y -CONFIG_BOARD_NRF52DK_NRF52805=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52dk_nrf52810/Kconfig b/boards/arm/nrf52dk_nrf52810/Kconfig index 4bb3d0a20ccb1..45eef340324ec 100644 --- a/boards/arm/nrf52dk_nrf52810/Kconfig +++ b/boards/arm/nrf52dk_nrf52810/Kconfig @@ -3,8 +3,6 @@ # Copyright (c) 2018 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52DK_NRF52810 - config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X @@ -14,5 +12,3 @@ config BOARD_ENABLE_DCDC # enabling the controller. config BT_CTLR default y if BT - -endif # BOARD_NRF52DK_NRF52810 diff --git a/boards/arm/nrf52dk_nrf52810/Kconfig.board b/boards/arm/nrf52dk_nrf52810/Kconfig.board deleted file mode 100644 index 03004863b14db..0000000000000 --- a/boards/arm/nrf52dk_nrf52810/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52 DK nRF52810 board configuration - -# Copyright (c) 2018 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52DK_NRF52810 - bool "nRF52 DK NRF52810" - depends on SOC_NRF52810_QFAA diff --git a/boards/arm/nrf52dk_nrf52810/Kconfig.defconfig b/boards/arm/nrf52dk_nrf52810/Kconfig.defconfig deleted file mode 100644 index d98b71c5e61c2..0000000000000 --- a/boards/arm/nrf52dk_nrf52810/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# nRF52 DK nRF52810 board configuration - -# Copyright (c) 2018 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NRF52DK_NRF52810 - -config BOARD - default "nrf52dk_nrf52810" - -endif # BOARD_NRF52DK_NRF52810 diff --git a/boards/arm/nrf52dk_nrf52810/Kconfig.nrf52dk_nrf52810 b/boards/arm/nrf52dk_nrf52810/Kconfig.nrf52dk_nrf52810 new file mode 100644 index 0000000000000..13c33834d2c92 --- /dev/null +++ b/boards/arm/nrf52dk_nrf52810/Kconfig.nrf52dk_nrf52810 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52DK_NRF52810 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52810_QFAA diff --git a/boards/arm/nrf52dk_nrf52810/nrf52dk_nrf52810_defconfig b/boards/arm/nrf52dk_nrf52810/nrf52dk_nrf52810_defconfig index 5873f1d2e9aa1..575368afd7c57 100644 --- a/boards/arm/nrf52dk_nrf52810/nrf52dk_nrf52810_defconfig +++ b/boards/arm/nrf52dk_nrf52810/nrf52dk_nrf52810_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52810_QFAA=y -CONFIG_BOARD_NRF52DK_NRF52810=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf52dk_nrf52832/Kconfig.board b/boards/arm/nrf52dk_nrf52832/Kconfig.board deleted file mode 100644 index b853f2023b8a9..0000000000000 --- a/boards/arm/nrf52dk_nrf52832/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# nRF52 DK NRF52832 board configuration - -# Copyright (c) 2016 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52DK_NRF52832 - bool "nRF52 DK NRF52832" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52dk_nrf52832/Kconfig.defconfig b/boards/arm/nrf52dk_nrf52832/Kconfig.defconfig index 648ea4de83d29..8cafc370ef220 100644 --- a/boards/arm/nrf52dk_nrf52832/Kconfig.defconfig +++ b/boards/arm/nrf52dk_nrf52832/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52DK_NRF52832 - -config BOARD - default "nrf52dk_nrf52832" - config BT_CTLR default BT - -endif # BOARD_NRF52DK_NRF52832 diff --git a/boards/arm/nrf52dk_nrf52832/Kconfig.nrf52dk_nrf52832 b/boards/arm/nrf52dk_nrf52832/Kconfig.nrf52dk_nrf52832 new file mode 100644 index 0000000000000..faec4a40acae6 --- /dev/null +++ b/boards/arm/nrf52dk_nrf52832/Kconfig.nrf52dk_nrf52832 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52DK_NRF52832 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832_defconfig b/boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832_defconfig index 547ff67c3488a..b407b31ef3ec0 100644 --- a/boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832_defconfig +++ b/boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_NRF52DK_NRF52832=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf5340dk_nrf5340/Kconfig.board b/boards/arm/nrf5340dk_nrf5340/Kconfig.board deleted file mode 100644 index e73cb122d80ff..0000000000000 --- a/boards/arm/nrf5340dk_nrf5340/Kconfig.board +++ /dev/null @@ -1,18 +0,0 @@ -# nRF5340 DK NRF5340 board configuration - -# Copyright (c) 2019-2020 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF5340_CPUAPP_QKAA - -config BOARD_NRF5340DK_NRF5340_CPUAPP - bool "nRF5340 DK nRF5340 Application MCU" - -config BOARD_NRF5340DK_NRF5340_CPUAPP_NS - bool "nRF5340 DK nRF5340 Application MCU non-secure" - -endif # SOC_NRF5340_CPUAPP_QKAA - -config BOARD_NRF5340DK_NRF5340_CPUNET - bool "nRF5340 DK NRF5340 Network MCU" - depends on SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig b/boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig index c1e88c018f0fe..5087d6461ea23 100644 --- a/boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig +++ b/boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig @@ -3,10 +3,7 @@ # Copyright (c) 2019-2020 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS - -config BOARD - default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS +if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS # By default, if we build for a Non-Secure version of the board, # enable building with TF-M as the Secure Execution Environment. @@ -73,9 +70,6 @@ endif # BOARD_NRF5340DK_NRF5340_CPUAPP_NS endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS -config BOARD - default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUNET - config IPM_NRFX default IPM diff --git a/boards/arm/nrf5340dk_nrf5340/Kconfig.nrf5340dk_nrf5340_cpuapp b/boards/arm/nrf5340dk_nrf5340/Kconfig.nrf5340dk_nrf5340_cpuapp new file mode 100644 index 0000000000000..68b33b50e1e3a --- /dev/null +++ b/boards/arm/nrf5340dk_nrf5340/Kconfig.nrf5340dk_nrf5340_cpuapp @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF5340DK_NRF5340_CPUAPP + bool + default y + select SOC_SERIES_NRF53X + select SOC_NRF5340_CPUAPP_QKAA diff --git a/boards/arm/nrf5340dk_nrf5340/Kconfig.nrf5340dk_nrf5340_cpuapp_ns b/boards/arm/nrf5340dk_nrf5340/Kconfig.nrf5340dk_nrf5340_cpuapp_ns new file mode 100644 index 0000000000000..771edad7a32fa --- /dev/null +++ b/boards/arm/nrf5340dk_nrf5340/Kconfig.nrf5340dk_nrf5340_cpuapp_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF5340DK_NRF5340_CPUAPP_NS + bool + default y + select SOC_SERIES_NRF53X + select SOC_NRF5340_CPUAPP_QKAA diff --git a/boards/arm/nrf5340dk_nrf5340/Kconfig.nrf5340dk_nrf5340_cpunet b/boards/arm/nrf5340dk_nrf5340/Kconfig.nrf5340dk_nrf5340_cpunet new file mode 100644 index 0000000000000..20d05fdbfeaf3 --- /dev/null +++ b/boards/arm/nrf5340dk_nrf5340/Kconfig.nrf5340dk_nrf5340_cpunet @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF5340DK_NRF5340_CPUNET + bool + default y + select SOC_SERIES_NRF53X + select SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp_defconfig b/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp_defconfig index 419a8001670d7..b930856fe4b44 100644 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp_defconfig +++ b/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp_ns_defconfig b/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp_ns_defconfig index 95172e7b2bf70..f6b4865a049b5 100644 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp_ns_defconfig +++ b/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp_ns_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpunet_defconfig b/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpunet_defconfig index 2edb56e45abad..aac9f38cedccf 100644 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpunet_defconfig +++ b/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpunet_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUNET_QKAA=y -CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf9160_innblue21/Kconfig.board b/boards/arm/nrf9160_innblue21/Kconfig.board deleted file mode 100644 index af6b5478f9e98..0000000000000 --- a/boards/arm/nrf9160_innblue21/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# nRF9160 innblue V2.1 board configuration - -# Copyright (c) 2020 InnBlue -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_NRF9160_INNBLUE21 - bool "nRF9160 innblue v2.1" - -config BOARD_NRF9160_INNBLUE21_NS - bool "nRF9160 innblue v2.1 non-secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/arm/nrf9160_innblue21/Kconfig.defconfig b/boards/arm/nrf9160_innblue21/Kconfig.defconfig index 08d0409c9af8d..934a661d69fa2 100644 --- a/boards/arm/nrf9160_innblue21/Kconfig.defconfig +++ b/boards/arm/nrf9160_innblue21/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2020 InnBlue # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF9160_INNBLUE21 || BOARD_NRF9160_INNBLUE21_NS - -config BOARD - default "nrf9160_innblue21" - # For the secure version of the board the firmware is linked at the beginning # of the flash, or into the code-partition defined in DT if it is intended to # be loaded by MCUboot. If the secure firmware is to be combined with a non- @@ -44,5 +39,3 @@ config BT_HCI_VS config REGULATOR default y if SENSOR - -endif # BOARD_NRF9160_INNBLUE21 || BOARD_NRF9160_INNBLUE21_NS diff --git a/boards/arm/nrf9160_innblue21/Kconfig.nrf9160_innblue21 b/boards/arm/nrf9160_innblue21/Kconfig.nrf9160_innblue21 new file mode 100644 index 0000000000000..66122b83e0ed8 --- /dev/null +++ b/boards/arm/nrf9160_innblue21/Kconfig.nrf9160_innblue21 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF9160_INNBLUE21 + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/nrf9160_innblue21/Kconfig.nrf9160_innblue21_ns b/boards/arm/nrf9160_innblue21/Kconfig.nrf9160_innblue21_ns new file mode 100644 index 0000000000000..f142be823b4b3 --- /dev/null +++ b/boards/arm/nrf9160_innblue21/Kconfig.nrf9160_innblue21_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF9160_INNBLUE21_NS + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/nrf9160_innblue21/nrf9160_innblue21_defconfig b/boards/arm/nrf9160_innblue21/nrf9160_innblue21_defconfig index 450db1d4d219f..c21b43f44afe4 100644 --- a/boards/arm/nrf9160_innblue21/nrf9160_innblue21_defconfig +++ b/boards/arm/nrf9160_innblue21/nrf9160_innblue21_defconfig @@ -2,9 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 # SOC / Board -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_NRF9160_INNBLUE21=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf9160_innblue21/nrf9160_innblue21_ns_defconfig b/boards/arm/nrf9160_innblue21/nrf9160_innblue21_ns_defconfig index ff57f4b7cdb39..331ff21917efa 100644 --- a/boards/arm/nrf9160_innblue21/nrf9160_innblue21_ns_defconfig +++ b/boards/arm/nrf9160_innblue21/nrf9160_innblue21_ns_defconfig @@ -2,9 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 # SOC / Board -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_NRF9160_INNBLUE21_NS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf9160_innblue22/Kconfig.board b/boards/arm/nrf9160_innblue22/Kconfig.board deleted file mode 100644 index e805798790a70..0000000000000 --- a/boards/arm/nrf9160_innblue22/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# nRF9160 innblue V2.2 board configuration - -# Copyright (c) 2020 InnBlue -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_NRF9160_INNBLUE22 - bool "nRF9160 innblue v2.2" - -config BOARD_NRF9160_INNBLUE22_NS - bool "nRF9160 innblue V2.2 non-secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/arm/nrf9160_innblue22/Kconfig.defconfig b/boards/arm/nrf9160_innblue22/Kconfig.defconfig index d50bdcc9d9757..581541062a5f1 100644 --- a/boards/arm/nrf9160_innblue22/Kconfig.defconfig +++ b/boards/arm/nrf9160_innblue22/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2020 InnBlue # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF9160_INNBLUE22 || BOARD_NRF9160_INNBLUE22_NS - -config BOARD - default "nrf9160_innblue22" - # For the secure version of the board the firmware is linked at the beginning # of the flash, or into the code-partition defined in DT if it is intended to # be loaded by MCUboot. If the secure firmware is to be combined with a non- @@ -44,5 +39,3 @@ config BT_HCI_VS config REGULATOR default y if SENSOR - -endif # BOARD_NRF9160_INNBLUE22 || BOARD_NRF9160_INNBLUE22_NS diff --git a/boards/arm/nrf9160_innblue22/Kconfig.nrf9160_innblue22 b/boards/arm/nrf9160_innblue22/Kconfig.nrf9160_innblue22 new file mode 100644 index 0000000000000..6f918dcb0b9c9 --- /dev/null +++ b/boards/arm/nrf9160_innblue22/Kconfig.nrf9160_innblue22 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF9160_INNBLUE22 + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/nrf9160_innblue22/Kconfig.nrf9160_innblue22_ns b/boards/arm/nrf9160_innblue22/Kconfig.nrf9160_innblue22_ns new file mode 100644 index 0000000000000..29df6294b7855 --- /dev/null +++ b/boards/arm/nrf9160_innblue22/Kconfig.nrf9160_innblue22_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF9160_INNBLUE22_NS + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/nrf9160_innblue22/nrf9160_innblue22_defconfig b/boards/arm/nrf9160_innblue22/nrf9160_innblue22_defconfig index 73d88346580dd..c21b43f44afe4 100644 --- a/boards/arm/nrf9160_innblue22/nrf9160_innblue22_defconfig +++ b/boards/arm/nrf9160_innblue22/nrf9160_innblue22_defconfig @@ -2,9 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 # SOC / Board -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_NRF9160_INNBLUE22=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf9160_innblue22/nrf9160_innblue22_ns_defconfig b/boards/arm/nrf9160_innblue22/nrf9160_innblue22_ns_defconfig index f75f894b1dd05..331ff21917efa 100644 --- a/boards/arm/nrf9160_innblue22/nrf9160_innblue22_ns_defconfig +++ b/boards/arm/nrf9160_innblue22/nrf9160_innblue22_ns_defconfig @@ -2,9 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 # SOC / Board -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_NRF9160_INNBLUE22_NS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf9160dk_nrf52840/Kconfig b/boards/arm/nrf9160dk_nrf52840/Kconfig index c126d2509cb9e..e11e880349804 100644 --- a/boards/arm/nrf9160dk_nrf52840/Kconfig +++ b/boards/arm/nrf9160dk_nrf52840/Kconfig @@ -3,8 +3,6 @@ # Copyright (c) 2018-2020 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF9160DK_NRF52840 - config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X @@ -13,5 +11,3 @@ config BOARD_ENABLE_DCDC module = BOARD_NRF9160DK module-str = Board Control source "subsys/logging/Kconfig.template.log_config" - -endif # BOARD_NRF52840_NRF9160DK diff --git a/boards/arm/nrf9160dk_nrf52840/Kconfig.board b/boards/arm/nrf9160dk_nrf52840/Kconfig.board deleted file mode 100644 index b4a46cc9eca6f..0000000000000 --- a/boards/arm/nrf9160dk_nrf52840/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# nRF9160 DK NRF52840 board configuration - -# Copyright (c) 2018-2020 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF9160DK_NRF52840 - bool "NRF9160 DK NRF52840" - depends on SOC_NRF52840_QIAA - # The GPIO driver is required by this board's initialization code - # (board.c), so it is forced here to be enabled always, not only - # enabled by default (in defconfig). - select GPIO diff --git a/boards/arm/nrf9160dk_nrf52840/Kconfig.defconfig b/boards/arm/nrf9160dk_nrf52840/Kconfig.defconfig index dc3c3c3caae35..09f2589eea353 100644 --- a/boards/arm/nrf9160dk_nrf52840/Kconfig.defconfig +++ b/boards/arm/nrf9160dk_nrf52840/Kconfig.defconfig @@ -3,15 +3,8 @@ # Copyright (c) 2018 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF9160DK_NRF52840 - -config BOARD - default "nrf9160dk_nrf52840" - config BT_CTLR default BT config BT_WAIT_NOP default BT && $(dt_nodelabel_enabled,reset_input) - -endif # BOARD_NRF9160DK_NRF52840 diff --git a/boards/arm/nrf9160dk_nrf52840/Kconfig.nrf9160dk_nrf52840 b/boards/arm/nrf9160dk_nrf52840/Kconfig.nrf9160dk_nrf52840 new file mode 100644 index 0000000000000..49df48632f29d --- /dev/null +++ b/boards/arm/nrf9160dk_nrf52840/Kconfig.nrf9160dk_nrf52840 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF9160DK_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA + select GPIO diff --git a/boards/arm/nrf9160dk_nrf52840/nrf9160dk_nrf52840_defconfig b/boards/arm/nrf9160dk_nrf52840/nrf9160dk_nrf52840_defconfig index c15e39669ea39..163a689c16c60 100644 --- a/boards/arm/nrf9160dk_nrf52840/nrf9160dk_nrf52840_defconfig +++ b/boards/arm/nrf9160dk_nrf52840/nrf9160dk_nrf52840_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_NRF9160DK_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf9160dk_nrf9160/Kconfig.board b/boards/arm/nrf9160dk_nrf9160/Kconfig.board deleted file mode 100644 index 180d60b18d8d5..0000000000000 --- a/boards/arm/nrf9160dk_nrf9160/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# nRF9160 DK NRF9160 board configuration - -# Copyright (c) 2018-2020 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_NRF9160DK_NRF9160 - bool "nRF9160 DK NRF9160" - -config BOARD_NRF9160DK_NRF9160_NS - bool "nRF9160 DK NRF9160 non-secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/arm/nrf9160dk_nrf9160/Kconfig.defconfig b/boards/arm/nrf9160dk_nrf9160/Kconfig.defconfig index 620799f3e674e..ae71ac769faaf 100644 --- a/boards/arm/nrf9160dk_nrf9160/Kconfig.defconfig +++ b/boards/arm/nrf9160dk_nrf9160/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018-2020 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF9160DK_NRF9160 || BOARD_NRF9160DK_NRF9160_NS - -config BOARD - default "nrf9160dk_nrf9160" - # By default, if we build for a Non-Secure version of the board, # enable building with TF-M as the Secure Execution Environment. config BUILD_WITH_TFM @@ -59,8 +54,6 @@ config BT_WAIT_NOP config I2C default $(dt_compat_on_bus,$(DT_COMPAT_NXP_PCAL6408A),i2c) -endif # BOARD_NRF9160DK_NRF9160 || BOARD_NRF9160DK_NRF9160_NS - config UART_NRF_DK_SERIAL_WORKAROUND default y if ZTEST diff --git a/boards/arm/nrf9160dk_nrf9160/Kconfig.nrf9160dk_nrf9160 b/boards/arm/nrf9160dk_nrf9160/Kconfig.nrf9160dk_nrf9160 new file mode 100644 index 0000000000000..2034fe257ae4a --- /dev/null +++ b/boards/arm/nrf9160dk_nrf9160/Kconfig.nrf9160dk_nrf9160 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF9160DK_NRF9160 + bool + default y + select SOC_NRF9160_SICA + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/nrf9160dk_nrf9160/Kconfig.nrf9160dk_nrf9160_ns b/boards/arm/nrf9160dk_nrf9160/Kconfig.nrf9160dk_nrf9160_ns new file mode 100644 index 0000000000000..519be0e762736 --- /dev/null +++ b/boards/arm/nrf9160dk_nrf9160/Kconfig.nrf9160dk_nrf9160_ns @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF9160DK_NRF9160_NS + bool + default y + select SOC_NRF9160_SICA + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_defconfig b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_defconfig index 7eadd01a2ab8f..7f9d97666eb4d 100644 --- a/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_defconfig +++ b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_NRF9160DK_NRF9160=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_ns_defconfig b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_ns_defconfig index 67f4522c30ed7..ba5f4810ab10d 100644 --- a/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_ns_defconfig +++ b/boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_ns_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_NRF9160DK_NRF9160_NS=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_f030r8/Kconfig.board b/boards/arm/nucleo_f030r8/Kconfig.board deleted file mode 100644 index 39bd7c786d8fc..0000000000000 --- a/boards/arm/nucleo_f030r8/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-64 development board with STM32F030R8 MCU configuration - -# Copyright (c) 2017 RnDity Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F030R8 - bool "NUCLEO-64 F030R8 Development Board" - depends on SOC_STM32F030X8 diff --git a/boards/arm/nucleo_f030r8/Kconfig.defconfig b/boards/arm/nucleo_f030r8/Kconfig.defconfig deleted file mode 100644 index 7b5331693fe78..0000000000000 --- a/boards/arm/nucleo_f030r8/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32 Nucleo-64 development board with STM32F030R8 MCU - -# Copyright (c) 2017 RnDity Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_F030R8 - -config BOARD - default "nucleo_f030r8" - -endif # BOARD_NUCLEO_F030R8 diff --git a/boards/arm/nucleo_f030r8/Kconfig.nucleo_f030r8 b/boards/arm/nucleo_f030r8/Kconfig.nucleo_f030r8 new file mode 100644 index 0000000000000..b176fd1e5a63c --- /dev/null +++ b/boards/arm/nucleo_f030r8/Kconfig.nucleo_f030r8 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F030R8 + bool + default y + select SOC_SERIES_STM32F0X + select SOC_STM32F030X8 diff --git a/boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig b/boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig index 1ba94fff95d8e..566868cd754f6 100644 --- a/boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig +++ b/boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration -CONFIG_SOC_STM32F030X8=y # Kernel Options due to Low Memory (8k) CONFIG_MAIN_STACK_SIZE=640 diff --git a/boards/arm/nucleo_f031k6/Kconfig.board b/boards/arm/nucleo_f031k6/Kconfig.board deleted file mode 100644 index d009553576516..0000000000000 --- a/boards/arm/nucleo_f031k6/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-32 development board with STM32F031K6 MCU configuration - -# Copyright (c) 2021 Sebastian Schwabe -# SPDX -License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F031K6 - bool "NUCLEO-32 F031K6 Development Board" - depends on SOC_STM32F031X6 diff --git a/boards/arm/nucleo_f031k6/Kconfig.defconfig b/boards/arm/nucleo_f031k6/Kconfig.defconfig deleted file mode 100644 index 6120548e9e2ca..0000000000000 --- a/boards/arm/nucleo_f031k6/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32 Nucleo-32 development board with STM32F031K6 MCU - -# Copyright (c) 2021 Sebastian Schwabe -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_F031K6 - -config BOARD - default "nucleo_f031k6" - -endif # BOARD_NUCLEO_F031K6 diff --git a/boards/arm/nucleo_f031k6/Kconfig.nucleo_f031k6 b/boards/arm/nucleo_f031k6/Kconfig.nucleo_f031k6 new file mode 100644 index 0000000000000..4d2e2595d3f74 --- /dev/null +++ b/boards/arm/nucleo_f031k6/Kconfig.nucleo_f031k6 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F031K6 + bool + default y + select SOC_SERIES_STM32F0X + select SOC_STM32F031X6 diff --git a/boards/arm/nucleo_f031k6/nucleo_f031k6_defconfig b/boards/arm/nucleo_f031k6/nucleo_f031k6_defconfig index c2c8d055a9044..b81ac55ff392c 100644 --- a/boards/arm/nucleo_f031k6/nucleo_f031k6_defconfig +++ b/boards/arm/nucleo_f031k6/nucleo_f031k6_defconfig @@ -1,8 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # Platform Configuration -CONFIG_SOC_SERIES_STM32F0X=y -CONFIG_SOC_STM32F031X6=y # Kernel Options due to Low Memory (4k) CONFIG_MAIN_STACK_SIZE=512 diff --git a/boards/arm/nucleo_f070rb/Kconfig.board b/boards/arm/nucleo_f070rb/Kconfig.board deleted file mode 100644 index 2745ba2a20c12..0000000000000 --- a/boards/arm/nucleo_f070rb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NUCLEO_F070RB board configuration - -# Copyright (c) 2018 qianfan Zhao -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F070RB - bool "NUCLEO-64 F070RB Development Board" - depends on SOC_STM32F070XB diff --git a/boards/arm/nucleo_f070rb/Kconfig.defconfig b/boards/arm/nucleo_f070rb/Kconfig.defconfig index 970df859b3611..8d627a84d46ce 100644 --- a/boards/arm/nucleo_f070rb/Kconfig.defconfig +++ b/boards/arm/nucleo_f070rb/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2018 qianfan Zhao # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F070RB - -config BOARD - default "nucleo_f070rb" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_F070RB diff --git a/boards/arm/nucleo_f070rb/Kconfig.nucleo_f070rb b/boards/arm/nucleo_f070rb/Kconfig.nucleo_f070rb new file mode 100644 index 0000000000000..e9a3a2c9982e6 --- /dev/null +++ b/boards/arm/nucleo_f070rb/Kconfig.nucleo_f070rb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F070RB + bool + default y + select SOC_SERIES_STM32F0X + select SOC_STM32F070XB diff --git a/boards/arm/nucleo_f070rb/nucleo_f070rb_defconfig b/boards/arm/nucleo_f070rb/nucleo_f070rb_defconfig index 088920775b4f6..57bb19aeb8efa 100644 --- a/boards/arm/nucleo_f070rb/nucleo_f070rb_defconfig +++ b/boards/arm/nucleo_f070rb/nucleo_f070rb_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration -CONFIG_SOC_STM32F070XB=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_f091rc/Kconfig.board b/boards/arm/nucleo_f091rc/Kconfig.board deleted file mode 100644 index d109e7c489832..0000000000000 --- a/boards/arm/nucleo_f091rc/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-64 development board with STM32F091RC MCU configuration - -# Copyright (c) 2017 Bobby Noelte -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F091RC - bool "NUCLEO-64 F091RC Development Board" - depends on SOC_STM32F091XC diff --git a/boards/arm/nucleo_f091rc/Kconfig.defconfig b/boards/arm/nucleo_f091rc/Kconfig.defconfig index bd4fedf1b5a94..b8ebf35dd2873 100644 --- a/boards/arm/nucleo_f091rc/Kconfig.defconfig +++ b/boards/arm/nucleo_f091rc/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2017 Bobby Noelte # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F091RC - -config BOARD - default "nucleo_f091rc" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_F091RC diff --git a/boards/arm/nucleo_f091rc/Kconfig.nucleo_f091rc b/boards/arm/nucleo_f091rc/Kconfig.nucleo_f091rc new file mode 100644 index 0000000000000..abbad16bbac61 --- /dev/null +++ b/boards/arm/nucleo_f091rc/Kconfig.nucleo_f091rc @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F091RC + bool + default y + select SOC_SERIES_STM32F0X + select SOC_STM32F091XC diff --git a/boards/arm/nucleo_f091rc/nucleo_f091rc_defconfig b/boards/arm/nucleo_f091rc/nucleo_f091rc_defconfig index c166772f8e33f..4a8ad49c50812 100644 --- a/boards/arm/nucleo_f091rc/nucleo_f091rc_defconfig +++ b/boards/arm/nucleo_f091rc/nucleo_f091rc_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration -CONFIG_SOC_STM32F091XC=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_f103rb/Kconfig.board b/boards/arm/nucleo_f103rb/Kconfig.board deleted file mode 100644 index e175a30e368fb..0000000000000 --- a/boards/arm/nucleo_f103rb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NUCLEO-64 F103RB board configuration - -# Copyright (c) 2016 Open-RnD Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F103RB - bool "NUCLEO-64 F103RB Development Board" - depends on SOC_STM32F103XB diff --git a/boards/arm/nucleo_f103rb/Kconfig.defconfig b/boards/arm/nucleo_f103rb/Kconfig.defconfig deleted file mode 100644 index 3d4c0581a96c2..0000000000000 --- a/boards/arm/nucleo_f103rb/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# NUCLEO-64 F103RB board configuration - -# Copyright (c) 2016 Open-RnD Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_F103RB - -config BOARD - default "nucleo_f103rb" - -endif # BOARD_NUCLEO_F103RB diff --git a/boards/arm/nucleo_f103rb/Kconfig.nucleo_f103rb b/boards/arm/nucleo_f103rb/Kconfig.nucleo_f103rb new file mode 100644 index 0000000000000..34af3f08d9636 --- /dev/null +++ b/boards/arm/nucleo_f103rb/Kconfig.nucleo_f103rb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F103RB + bool + default y + select SOC_SERIES_STM32F1X + select SOC_STM32F103XB diff --git a/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig b/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig index b3d7a802a8842..441a70bcffbf7 100644 --- a/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig +++ b/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F103XB=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_f207zg/Kconfig.board b/boards/arm/nucleo_f207zg/Kconfig.board deleted file mode 100644 index b3054d4ae341b..0000000000000 --- a/boards/arm/nucleo_f207zg/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NUCLEO-144 F207ZG board configuration - -# Copyright (c) 2018 qianfan Zhao -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F207ZG - bool "NUCLEO-144 F207ZG Development Board" - depends on SOC_STM32F207XX diff --git a/boards/arm/nucleo_f207zg/Kconfig.defconfig b/boards/arm/nucleo_f207zg/Kconfig.defconfig index b3b48232483ac..a1df874968422 100644 --- a/boards/arm/nucleo_f207zg/Kconfig.defconfig +++ b/boards/arm/nucleo_f207zg/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2018 qianfan Zhao # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F207ZG - -config BOARD - default "nucleo_f207zg" - if NETWORKING config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_NUCLEO_F207ZG diff --git a/boards/arm/nucleo_f207zg/Kconfig.nucleo_f207zg b/boards/arm/nucleo_f207zg/Kconfig.nucleo_f207zg new file mode 100644 index 0000000000000..f14c2b6e96fde --- /dev/null +++ b/boards/arm/nucleo_f207zg/Kconfig.nucleo_f207zg @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F207ZG + bool + default y + select SOC_SERIES_STM32F2X + select SOC_STM32F207XX diff --git a/boards/arm/nucleo_f207zg/nucleo_f207zg_defconfig b/boards/arm/nucleo_f207zg/nucleo_f207zg_defconfig index b501adaa7ca60..820ffcad5c41f 100644 --- a/boards/arm/nucleo_f207zg/nucleo_f207zg_defconfig +++ b/boards/arm/nucleo_f207zg/nucleo_f207zg_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F2X=y -CONFIG_SOC_STM32F207XX=y CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_f302r8/Kconfig.board b/boards/arm/nucleo_f302r8/Kconfig.board deleted file mode 100644 index cc238c11040df..0000000000000 --- a/boards/arm/nucleo_f302r8/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NUCLEO-64 F302R8 board configuration - -# Copyright (c) 2018 Seitz & Associates -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F302R8 - bool "NUCLEO-64 F302R8 Development Board" - depends on SOC_STM32F302X8 diff --git a/boards/arm/nucleo_f302r8/Kconfig.defconfig b/boards/arm/nucleo_f302r8/Kconfig.defconfig deleted file mode 100644 index abf1484c1b699..0000000000000 --- a/boards/arm/nucleo_f302r8/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# NUCLEO-64 F302R8 board configuration - -# Copyright (c) 2018 Seitz & Associates -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_F302R8 - -config BOARD - default "nucleo_f302r8" - -endif # BOARD_NUCLEO_F302R8 diff --git a/boards/arm/nucleo_f302r8/Kconfig.nucleo_f302r8 b/boards/arm/nucleo_f302r8/Kconfig.nucleo_f302r8 new file mode 100644 index 0000000000000..aa09f20a06f2c --- /dev/null +++ b/boards/arm/nucleo_f302r8/Kconfig.nucleo_f302r8 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F302R8 + bool + default y + select SOC_SERIES_STM32F3X + select SOC_STM32F302X8 diff --git a/boards/arm/nucleo_f302r8/nucleo_f302r8_defconfig b/boards/arm/nucleo_f302r8/nucleo_f302r8_defconfig index 8cb3b3a13adfa..0cb20e6672211 100644 --- a/boards/arm/nucleo_f302r8/nucleo_f302r8_defconfig +++ b/boards/arm/nucleo_f302r8/nucleo_f302r8_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F3X=y -CONFIG_SOC_STM32F302X8=y CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_f303k8/Kconfig.board b/boards/arm/nucleo_f303k8/Kconfig.board deleted file mode 100644 index 88b26aab9a38b..0000000000000 --- a/boards/arm/nucleo_f303k8/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# NUCLEO-32 F303k8 board configuration - -# Copyright (c) 2020 Sebastian Schwabe -# Fabian Paschke -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F303K8 - bool "NUCLEO-32 F303K8 Development Board" - depends on SOC_STM32F303X8 diff --git a/boards/arm/nucleo_f303k8/Kconfig.defconfig b/boards/arm/nucleo_f303k8/Kconfig.defconfig deleted file mode 100644 index c52e0887f31fc..0000000000000 --- a/boards/arm/nucleo_f303k8/Kconfig.defconfig +++ /dev/null @@ -1,12 +0,0 @@ -# NUCLEO-32 F303k8 board configuration - -# Copyright (c) 2020 Sebastian Schwabe -# Fabian Paschke -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_F303K8 - -config BOARD - default "nucleo_f303k8" - -endif # BOARD_NUCLEO_F303K8 diff --git a/boards/arm/nucleo_f303k8/Kconfig.nucleo_f303k8 b/boards/arm/nucleo_f303k8/Kconfig.nucleo_f303k8 new file mode 100644 index 0000000000000..791d10525e6e0 --- /dev/null +++ b/boards/arm/nucleo_f303k8/Kconfig.nucleo_f303k8 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F303K8 + bool + default y + select SOC_SERIES_STM32F3X + select SOC_STM32F303X8 diff --git a/boards/arm/nucleo_f303k8/nucleo_f303k8_defconfig b/boards/arm/nucleo_f303k8/nucleo_f303k8_defconfig index 67f7f844b42ca..0cb20e6672211 100644 --- a/boards/arm/nucleo_f303k8/nucleo_f303k8_defconfig +++ b/boards/arm/nucleo_f303k8/nucleo_f303k8_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F3X=y -CONFIG_SOC_STM32F303X8=y CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_f303re/Kconfig.board b/boards/arm/nucleo_f303re/Kconfig.board deleted file mode 100644 index 0b9bc11bf96fd..0000000000000 --- a/boards/arm/nucleo_f303re/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NUCLEO-64 F303RE board configuration - -# Copyright (c) 2020 Paul M. Bendixen -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F303RE - bool "NUCLEO-64 F303RE Development Board" - depends on SOC_STM32F303XE diff --git a/boards/arm/nucleo_f303re/Kconfig.defconfig b/boards/arm/nucleo_f303re/Kconfig.defconfig deleted file mode 100644 index 97aa8100d7216..0000000000000 --- a/boards/arm/nucleo_f303re/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# NUCLEO-64 F302R8 board configuration - -# Copyright (c) 2020 Paul M. Bendixen -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_F303RE - -config BOARD - default "nucleo_f303re" - -endif # BOARD_NUCLEO_F303RE diff --git a/boards/arm/nucleo_f303re/Kconfig.nucleo_f303re b/boards/arm/nucleo_f303re/Kconfig.nucleo_f303re new file mode 100644 index 0000000000000..e63d3c6489376 --- /dev/null +++ b/boards/arm/nucleo_f303re/Kconfig.nucleo_f303re @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F303RE + bool + default y + select SOC_SERIES_STM32F3X + select SOC_STM32F303XE diff --git a/boards/arm/nucleo_f303re/nucleo_f303re_defconfig b/boards/arm/nucleo_f303re/nucleo_f303re_defconfig index c73a485b23936..820ffcad5c41f 100644 --- a/boards/arm/nucleo_f303re/nucleo_f303re_defconfig +++ b/boards/arm/nucleo_f303re/nucleo_f303re_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F3X=y -CONFIG_SOC_STM32F303XE=y CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_f334r8/Kconfig.board b/boards/arm/nucleo_f334r8/Kconfig.board deleted file mode 100644 index 2c2e312c83738..0000000000000 --- a/boards/arm/nucleo_f334r8/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-64 development board with STM32F334R8 MCU configuration - -# Copyright (c) 2016 RnDity Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F334R8 - bool "NUCLEO-64 F334R8 Development Board" - depends on SOC_STM32F334X8 diff --git a/boards/arm/nucleo_f334r8/Kconfig.defconfig b/boards/arm/nucleo_f334r8/Kconfig.defconfig index ad4f0b8979f2e..c65f4d3fb4357 100644 --- a/boards/arm/nucleo_f334r8/Kconfig.defconfig +++ b/boards/arm/nucleo_f334r8/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2016 RnDity Sp. z o.o. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F334R8 - -config BOARD - default "nucleo_f334r8" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_F334R8 diff --git a/boards/arm/nucleo_f334r8/Kconfig.nucleo_f334r8 b/boards/arm/nucleo_f334r8/Kconfig.nucleo_f334r8 new file mode 100644 index 0000000000000..3e7791a901cfc --- /dev/null +++ b/boards/arm/nucleo_f334r8/Kconfig.nucleo_f334r8 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F334R8 + bool + default y + select SOC_SERIES_STM32F3X + select SOC_STM32F334X8 diff --git a/boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig b/boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig index a7a22c2096d11..4e0a5d55f8030 100644 --- a/boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig +++ b/boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F3X=y # Platform Configuration -CONFIG_SOC_STM32F334X8=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_f401re/Kconfig.board b/boards/arm/nucleo_f401re/Kconfig.board deleted file mode 100644 index 21b9b7451a3d3..0000000000000 --- a/boards/arm/nucleo_f401re/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NUCLEO-64 F401RE board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F401RE - bool "NUCLEO-64 F401RE Development Board" - depends on SOC_STM32F401XE diff --git a/boards/arm/nucleo_f401re/Kconfig.defconfig b/boards/arm/nucleo_f401re/Kconfig.defconfig index a634aca6a7354..2c38678d8f136 100644 --- a/boards/arm/nucleo_f401re/Kconfig.defconfig +++ b/boards/arm/nucleo_f401re/Kconfig.defconfig @@ -4,13 +4,6 @@ # Copyright (c) 2019 Centaur Analytics, Inc # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F401RE - -config BOARD - default "nucleo_f401re" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_F401RE diff --git a/boards/arm/nucleo_f401re/Kconfig.nucleo_f401re b/boards/arm/nucleo_f401re/Kconfig.nucleo_f401re new file mode 100644 index 0000000000000..df0013e59a040 --- /dev/null +++ b/boards/arm/nucleo_f401re/Kconfig.nucleo_f401re @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F401RE + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F401XE diff --git a/boards/arm/nucleo_f401re/nucleo_f401re_defconfig b/boards/arm/nucleo_f401re/nucleo_f401re_defconfig index 637108b6d833e..92b8f730d1382 100644 --- a/boards/arm/nucleo_f401re/nucleo_f401re_defconfig +++ b/boards/arm/nucleo_f401re/nucleo_f401re_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F401XE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_f410rb/Kconfig.board b/boards/arm/nucleo_f410rb/Kconfig.board deleted file mode 100644 index 8dcfa890169cf..0000000000000 --- a/boards/arm/nucleo_f410rb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F410RB Nucleo board configuration - -# Copyright (c) 2020 Hans Unzner -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F410RB - bool "Nucleo F410RB Development Board" - depends on SOC_STM32F410RX diff --git a/boards/arm/nucleo_f410rb/Kconfig.defconfig b/boards/arm/nucleo_f410rb/Kconfig.defconfig index df64f4ca9d33f..e2bc3b850318a 100644 --- a/boards/arm/nucleo_f410rb/Kconfig.defconfig +++ b/boards/arm/nucleo_f410rb/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2020 Hans Unzner # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F410RB - -config BOARD - default "nucleo_f410rb" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_F410RB diff --git a/boards/arm/nucleo_f410rb/Kconfig.nucleo_f410rb b/boards/arm/nucleo_f410rb/Kconfig.nucleo_f410rb new file mode 100644 index 0000000000000..dda31855939df --- /dev/null +++ b/boards/arm/nucleo_f410rb/Kconfig.nucleo_f410rb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F410RB + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F410RX diff --git a/boards/arm/nucleo_f410rb/nucleo_f410rb_defconfig b/boards/arm/nucleo_f410rb/nucleo_f410rb_defconfig index 4c7485eb6b36c..bc6020b2f192f 100644 --- a/boards/arm/nucleo_f410rb/nucleo_f410rb_defconfig +++ b/boards/arm/nucleo_f410rb/nucleo_f410rb_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F410RX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_f411re/Kconfig.board b/boards/arm/nucleo_f411re/Kconfig.board deleted file mode 100644 index 8d14124ab07a9..0000000000000 --- a/boards/arm/nucleo_f411re/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NUCLEO-64 F411RE board configuration - -# Copyright (c) 2016 Matthias Boesl -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F411RE - bool "NUCLEO-64 F411RE Development Board" - depends on SOC_STM32F411XE diff --git a/boards/arm/nucleo_f411re/Kconfig.defconfig b/boards/arm/nucleo_f411re/Kconfig.defconfig index ca331991f9421..65f03ea681bde 100644 --- a/boards/arm/nucleo_f411re/Kconfig.defconfig +++ b/boards/arm/nucleo_f411re/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2016 Matthias Boesl # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F411RE - -config BOARD - default "nucleo_f411re" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_F411RE diff --git a/boards/arm/nucleo_f411re/Kconfig.nucleo_f411re b/boards/arm/nucleo_f411re/Kconfig.nucleo_f411re new file mode 100644 index 0000000000000..8f927c3dd5d1b --- /dev/null +++ b/boards/arm/nucleo_f411re/Kconfig.nucleo_f411re @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F411RE + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F411XE diff --git a/boards/arm/nucleo_f411re/nucleo_f411re_defconfig b/boards/arm/nucleo_f411re/nucleo_f411re_defconfig index cc07fdb2d8fc3..92b8f730d1382 100644 --- a/boards/arm/nucleo_f411re/nucleo_f411re_defconfig +++ b/boards/arm/nucleo_f411re/nucleo_f411re_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F411XE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_f412zg/Kconfig.board b/boards/arm/nucleo_f412zg/Kconfig.board deleted file mode 100644 index 4df2769a2a13f..0000000000000 --- a/boards/arm/nucleo_f412zg/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NUCLEO-144 F412ZG board configuration - -# Copyright (c) 2017 Florian Vaussard, HEIG-VD -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F412ZG - bool "NUCLEO-144 F412ZG Development Board" - depends on SOC_STM32F412ZX diff --git a/boards/arm/nucleo_f412zg/Kconfig.defconfig b/boards/arm/nucleo_f412zg/Kconfig.defconfig index 428368d592796..a0169b376484f 100644 --- a/boards/arm/nucleo_f412zg/Kconfig.defconfig +++ b/boards/arm/nucleo_f412zg/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2017 Florian Vaussard, HEIG-VD # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F412ZG - -config BOARD - default "nucleo_f412zg" - if NETWORKING config USB_DEVICE_STACK @@ -17,5 +12,3 @@ config USB_DEVICE_NETWORK_ECM default y endif # NETWORKING - -endif # BOARD_NUCLEO_F412ZG diff --git a/boards/arm/nucleo_f412zg/Kconfig.nucleo_f412zg b/boards/arm/nucleo_f412zg/Kconfig.nucleo_f412zg new file mode 100644 index 0000000000000..adbad2a5634a1 --- /dev/null +++ b/boards/arm/nucleo_f412zg/Kconfig.nucleo_f412zg @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F412ZG + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F412ZX diff --git a/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig b/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig index d9ce153a46b81..bc6020b2f192f 100644 --- a/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig +++ b/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F412ZX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_f413zh/Kconfig.board b/boards/arm/nucleo_f413zh/Kconfig.board deleted file mode 100644 index ae28485aeb61e..0000000000000 --- a/boards/arm/nucleo_f413zh/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NUCLEO-144 F413ZH board configuration - -# Copyright (c) 2017 Florian Vaussard, HEIG-VD -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F413ZH - bool "NUCLEO-144 F413ZH Development Board" - depends on SOC_STM32F413XX diff --git a/boards/arm/nucleo_f413zh/Kconfig.defconfig b/boards/arm/nucleo_f413zh/Kconfig.defconfig index e340a26c99d5b..fe21ba29d40df 100644 --- a/boards/arm/nucleo_f413zh/Kconfig.defconfig +++ b/boards/arm/nucleo_f413zh/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2017 Florian Vaussard, HEIG-VD # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F413ZH - -config BOARD - default "nucleo_f413zh" - if NETWORKING config USB_DEVICE_STACK @@ -17,5 +12,3 @@ config USB_DEVICE_NETWORK_ECM default y endif # NETWORKING - -endif # BOARD_NUCLEO_F413ZH diff --git a/boards/arm/nucleo_f413zh/Kconfig.nucleo_f413zh b/boards/arm/nucleo_f413zh/Kconfig.nucleo_f413zh new file mode 100644 index 0000000000000..6d45fdc52d6a1 --- /dev/null +++ b/boards/arm/nucleo_f413zh/Kconfig.nucleo_f413zh @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F413ZH + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F413XX diff --git a/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig b/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig index 1b7b52cb5b75f..bc6020b2f192f 100644 --- a/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig +++ b/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F413XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_f429zi/Kconfig.board b/boards/arm/nucleo_f429zi/Kconfig.board deleted file mode 100644 index b9e033f86223b..0000000000000 --- a/boards/arm/nucleo_f429zi/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NUCLEO-144 F429ZI board configuration - -# Copyright (c) 2017 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F429ZI - bool "NUCLEO-144 F429ZI Development Board" - depends on SOC_STM32F429XX diff --git a/boards/arm/nucleo_f429zi/Kconfig.defconfig b/boards/arm/nucleo_f429zi/Kconfig.defconfig index 99fdd74ade116..32a9abdf51b53 100644 --- a/boards/arm/nucleo_f429zi/Kconfig.defconfig +++ b/boards/arm/nucleo_f429zi/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2017 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F429ZI - -config BOARD - default "nucleo_f429zi" - if NETWORKING config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_NUCLEO_F429ZI diff --git a/boards/arm/nucleo_f429zi/Kconfig.nucleo_f429zi b/boards/arm/nucleo_f429zi/Kconfig.nucleo_f429zi new file mode 100644 index 0000000000000..6847971a8b4e0 --- /dev/null +++ b/boards/arm/nucleo_f429zi/Kconfig.nucleo_f429zi @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F429ZI + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F429XX diff --git a/boards/arm/nucleo_f429zi/nucleo_f429zi_defconfig b/boards/arm/nucleo_f429zi/nucleo_f429zi_defconfig index 478a485246cbf..92b8f730d1382 100644 --- a/boards/arm/nucleo_f429zi/nucleo_f429zi_defconfig +++ b/boards/arm/nucleo_f429zi/nucleo_f429zi_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F429XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_f446re/Kconfig.board b/boards/arm/nucleo_f446re/Kconfig.board deleted file mode 100644 index 71f63f7b8e1e3..0000000000000 --- a/boards/arm/nucleo_f446re/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F446RE Nucleo board configuration - -# Copyright (c) 2018 Philémon Jaermann -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F446RE - bool "Nucleo F446RE Development Board" - depends on SOC_STM32F446XX diff --git a/boards/arm/nucleo_f446re/Kconfig.defconfig b/boards/arm/nucleo_f446re/Kconfig.defconfig index 409b8bd5d4768..96294d22dcb21 100644 --- a/boards/arm/nucleo_f446re/Kconfig.defconfig +++ b/boards/arm/nucleo_f446re/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2018 Philémon Jaermann # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F446RE - -config BOARD - default "nucleo_f446re" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_F446RE diff --git a/boards/arm/nucleo_f446re/Kconfig.nucleo_f446re b/boards/arm/nucleo_f446re/Kconfig.nucleo_f446re new file mode 100644 index 0000000000000..02f8a447620dc --- /dev/null +++ b/boards/arm/nucleo_f446re/Kconfig.nucleo_f446re @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F446RE + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F446XX diff --git a/boards/arm/nucleo_f446re/nucleo_f446re_defconfig b/boards/arm/nucleo_f446re/nucleo_f446re_defconfig index a9e0141c1258c..bc6020b2f192f 100644 --- a/boards/arm/nucleo_f446re/nucleo_f446re_defconfig +++ b/boards/arm/nucleo_f446re/nucleo_f446re_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F446XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_f446ze/Kconfig.board b/boards/arm/nucleo_f446ze/Kconfig.board deleted file mode 100644 index f926632c73c37..0000000000000 --- a/boards/arm/nucleo_f446ze/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F446ZE Nucleo board configuration - -# Copyright (c) 2021 Tom Owen -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F446ZE - bool "Nucleo F446ZE Development Board" - depends on SOC_STM32F446XX diff --git a/boards/arm/nucleo_f446ze/Kconfig.defconfig b/boards/arm/nucleo_f446ze/Kconfig.defconfig index a256cd1c42aec..451bd240b32bb 100644 --- a/boards/arm/nucleo_f446ze/Kconfig.defconfig +++ b/boards/arm/nucleo_f446ze/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2021 Tom Owen # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F446ZE - -config BOARD - default "nucleo_f446ze" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_F446ZE diff --git a/boards/arm/nucleo_f446ze/Kconfig.nucleo_f446ze b/boards/arm/nucleo_f446ze/Kconfig.nucleo_f446ze new file mode 100644 index 0000000000000..d0b6d714bb991 --- /dev/null +++ b/boards/arm/nucleo_f446ze/Kconfig.nucleo_f446ze @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F446ZE + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F446XX diff --git a/boards/arm/nucleo_f446ze/nucleo_f446ze_defconfig b/boards/arm/nucleo_f446ze/nucleo_f446ze_defconfig index a9e0141c1258c..bc6020b2f192f 100644 --- a/boards/arm/nucleo_f446ze/nucleo_f446ze_defconfig +++ b/boards/arm/nucleo_f446ze/nucleo_f446ze_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F446XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_f746zg/Kconfig.board b/boards/arm/nucleo_f746zg/Kconfig.board deleted file mode 100644 index 1b533d6b8ddad..0000000000000 --- a/boards/arm/nucleo_f746zg/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F746ZG Nucleo board configuration - -# Copyright (c) 2018 AJ Palmer -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F746ZG - bool "Nucleo F746ZG Development Board" - depends on SOC_STM32F746XX diff --git a/boards/arm/nucleo_f746zg/Kconfig.defconfig b/boards/arm/nucleo_f746zg/Kconfig.defconfig index 8e021fdf61af2..8644c698c3ba8 100644 --- a/boards/arm/nucleo_f746zg/Kconfig.defconfig +++ b/boards/arm/nucleo_f746zg/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2018 AJ Palmer # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F746ZG - -config BOARD - default "nucleo_f746zg" - if NETWORKING config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_NUCLEO_F746ZG diff --git a/boards/arm/nucleo_f746zg/Kconfig.nucleo_f746zg b/boards/arm/nucleo_f746zg/Kconfig.nucleo_f746zg new file mode 100644 index 0000000000000..2541c0a30a8ad --- /dev/null +++ b/boards/arm/nucleo_f746zg/Kconfig.nucleo_f746zg @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F746ZG + bool + default y + select SOC_SERIES_STM32F7X + select SOC_STM32F746XX diff --git a/boards/arm/nucleo_f746zg/nucleo_f746zg_defconfig b/boards/arm/nucleo_f746zg/nucleo_f746zg_defconfig index e1eb901f61c9c..1cb22ee6da804 100644 --- a/boards/arm/nucleo_f746zg/nucleo_f746zg_defconfig +++ b/boards/arm/nucleo_f746zg/nucleo_f746zg_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F7X=y -CONFIG_SOC_STM32F746XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_f756zg/Kconfig.board b/boards/arm/nucleo_f756zg/Kconfig.board deleted file mode 100644 index 46f61135b8670..0000000000000 --- a/boards/arm/nucleo_f756zg/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F756ZG Nucleo board configuration - -# Copyright (c) 2018 AJ Palmer -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F756ZG - bool "Nucleo F756ZG Development Board" - depends on SOC_STM32F756XX diff --git a/boards/arm/nucleo_f756zg/Kconfig.defconfig b/boards/arm/nucleo_f756zg/Kconfig.defconfig index d6b1759beb51d..ec58a50f75e84 100644 --- a/boards/arm/nucleo_f756zg/Kconfig.defconfig +++ b/boards/arm/nucleo_f756zg/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2018 AJ Palmer # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F756ZG - -config BOARD - default "nucleo_f756zg" - if NETWORKING config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_NUCLEO_F756ZG diff --git a/boards/arm/nucleo_f756zg/Kconfig.nucleo_f756zg b/boards/arm/nucleo_f756zg/Kconfig.nucleo_f756zg new file mode 100644 index 0000000000000..cd2d6dbc31791 --- /dev/null +++ b/boards/arm/nucleo_f756zg/Kconfig.nucleo_f756zg @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F756ZG + bool + default y + select SOC_SERIES_STM32F7X + select SOC_STM32F756XX diff --git a/boards/arm/nucleo_f756zg/nucleo_f756zg_defconfig b/boards/arm/nucleo_f756zg/nucleo_f756zg_defconfig index 6f89a9784b9ed..1cb22ee6da804 100644 --- a/boards/arm/nucleo_f756zg/nucleo_f756zg_defconfig +++ b/boards/arm/nucleo_f756zg/nucleo_f756zg_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F7X=y -CONFIG_SOC_STM32F756XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_f767zi/Kconfig.board b/boards/arm/nucleo_f767zi/Kconfig.board deleted file mode 100644 index d76625a7e5993..0000000000000 --- a/boards/arm/nucleo_f767zi/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F767ZI Nucleo board configuration - -# Copyright (c) 2019 Roland Ma -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_F767ZI - bool "Nucleo F767ZI Development Board" - depends on SOC_STM32F767XX diff --git a/boards/arm/nucleo_f767zi/Kconfig.defconfig b/boards/arm/nucleo_f767zi/Kconfig.defconfig index b53353b2b0660..e9d8410780a16 100644 --- a/boards/arm/nucleo_f767zi/Kconfig.defconfig +++ b/boards/arm/nucleo_f767zi/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2019 Roland Ma # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F767ZI - -config BOARD - default "nucleo_f767zi" - if NETWORKING config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_NUCLEO_F767ZI diff --git a/boards/arm/nucleo_f767zi/Kconfig.nucleo_f767zi b/boards/arm/nucleo_f767zi/Kconfig.nucleo_f767zi new file mode 100644 index 0000000000000..7d70c3020572f --- /dev/null +++ b/boards/arm/nucleo_f767zi/Kconfig.nucleo_f767zi @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_F767ZI + bool + default y + select SOC_SERIES_STM32F7X + select SOC_STM32F767XX diff --git a/boards/arm/nucleo_f767zi/nucleo_f767zi_defconfig b/boards/arm/nucleo_f767zi/nucleo_f767zi_defconfig index df549434139ac..1cb22ee6da804 100644 --- a/boards/arm/nucleo_f767zi/nucleo_f767zi_defconfig +++ b/boards/arm/nucleo_f767zi/nucleo_f767zi_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F7X=y -CONFIG_SOC_STM32F767XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_g031k8/Kconfig.board b/boards/arm/nucleo_g031k8/Kconfig.board deleted file mode 100644 index 02133d332572b..0000000000000 --- a/boards/arm/nucleo_g031k8/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-32 development board with STM32G031K8 MCU configuration - -# Copyright (c) 2022 Joylab AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_G031K8 - bool "NUCLEO-32 G031K8 Development Board" - depends on SOC_STM32G031XX diff --git a/boards/arm/nucleo_g031k8/Kconfig.defconfig b/boards/arm/nucleo_g031k8/Kconfig.defconfig index b448461f39ec2..97ad6aae15e0b 100644 --- a/boards/arm/nucleo_g031k8/Kconfig.defconfig +++ b/boards/arm/nucleo_g031k8/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2022 Joylab AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_G031K8 - -config BOARD - default "nucleo_g031k8" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_G031K8 diff --git a/boards/arm/nucleo_g031k8/Kconfig.nucleo_g031k8 b/boards/arm/nucleo_g031k8/Kconfig.nucleo_g031k8 new file mode 100644 index 0000000000000..7c775e5085910 --- /dev/null +++ b/boards/arm/nucleo_g031k8/Kconfig.nucleo_g031k8 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_G031K8 + bool + default y + select SOC_SERIES_STM32G0X + select SOC_STM32G031XX diff --git a/boards/arm/nucleo_g031k8/nucleo_g031k8_defconfig b/boards/arm/nucleo_g031k8/nucleo_g031k8_defconfig index e4a8706b596ea..547719259359c 100644 --- a/boards/arm/nucleo_g031k8/nucleo_g031k8_defconfig +++ b/boards/arm/nucleo_g031k8/nucleo_g031k8_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32G0X=y # Platform Configuration -CONFIG_SOC_STM32G031XX=y # Kernel Options due to Low Memory (8k) CONFIG_MAIN_STACK_SIZE=640 diff --git a/boards/arm/nucleo_g071rb/Kconfig.board b/boards/arm/nucleo_g071rb/Kconfig.board deleted file mode 100644 index 97a74c8dfc502..0000000000000 --- a/boards/arm/nucleo_g071rb/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# STM32 Nucleo-64 development board with STM32G071RB MCU configuration - -# Copyright (c) 2019 Philippe Retornaz -# Copyright (c) 2019 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_G071RB - bool "NUCLEO-64 G071RB Development Board" - depends on SOC_STM32G071XX diff --git a/boards/arm/nucleo_g071rb/Kconfig.defconfig b/boards/arm/nucleo_g071rb/Kconfig.defconfig deleted file mode 100644 index 9333f39211239..0000000000000 --- a/boards/arm/nucleo_g071rb/Kconfig.defconfig +++ /dev/null @@ -1,12 +0,0 @@ -# STM32 Nucleo-64 development board with STM32G071RB MCU - -# Copyright (c) 2019 Philippe Retornaz -# Copyright (c) 2019 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_G071RB - -config BOARD - default "nucleo_g071rb" - -endif # BOARD_NUCLEO_G071RB diff --git a/boards/arm/nucleo_g071rb/Kconfig.nucleo_g071rb b/boards/arm/nucleo_g071rb/Kconfig.nucleo_g071rb new file mode 100644 index 0000000000000..34af240c65a44 --- /dev/null +++ b/boards/arm/nucleo_g071rb/Kconfig.nucleo_g071rb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_G071RB + bool + default y + select SOC_SERIES_STM32G0X + select SOC_STM32G071XX diff --git a/boards/arm/nucleo_g071rb/nucleo_g071rb_defconfig b/boards/arm/nucleo_g071rb/nucleo_g071rb_defconfig index 71cc51e4ffcf8..15fb1ac450af1 100644 --- a/boards/arm/nucleo_g071rb/nucleo_g071rb_defconfig +++ b/boards/arm/nucleo_g071rb/nucleo_g071rb_defconfig @@ -1,6 +1,4 @@ # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G071XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_g0b1re/Kconfig.board b/boards/arm/nucleo_g0b1re/Kconfig.board deleted file mode 100644 index cce6734f45d65..0000000000000 --- a/boards/arm/nucleo_g0b1re/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-64 development board with STM32G0B1RE MCU configuration - -# Copyright (c) 2019 Thomas Stranger -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_G0B1RE - bool "NUCLEO-64 G0B1RE Development Board" - depends on SOC_STM32G0B1XX diff --git a/boards/arm/nucleo_g0b1re/Kconfig.defconfig b/boards/arm/nucleo_g0b1re/Kconfig.defconfig deleted file mode 100644 index 92a2c028d30ef..0000000000000 --- a/boards/arm/nucleo_g0b1re/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32 Nucleo-64 development board with STM32G0B1RE MCU - -# Copyright (c) 2020 Thomas Stranger -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_G0B1RE - -config BOARD - default "nucleo_g0b1re" - -endif # BOARD_NUCLEO_G0B1RE diff --git a/boards/arm/nucleo_g0b1re/Kconfig.nucleo_g0b1re b/boards/arm/nucleo_g0b1re/Kconfig.nucleo_g0b1re new file mode 100644 index 0000000000000..d260664b8087a --- /dev/null +++ b/boards/arm/nucleo_g0b1re/Kconfig.nucleo_g0b1re @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_G0B1RE + bool + default y + select SOC_SERIES_STM32G0X + select SOC_STM32G0B1XX diff --git a/boards/arm/nucleo_g0b1re/nucleo_g0b1re_defconfig b/boards/arm/nucleo_g0b1re/nucleo_g0b1re_defconfig index c57537f7c3107..00258997bf6b0 100644 --- a/boards/arm/nucleo_g0b1re/nucleo_g0b1re_defconfig +++ b/boards/arm/nucleo_g0b1re/nucleo_g0b1re_defconfig @@ -1,6 +1,4 @@ # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G0B1XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_g431rb/Kconfig.board b/boards/arm/nucleo_g431rb/Kconfig.board deleted file mode 100644 index 27de2edbdad41..0000000000000 --- a/boards/arm/nucleo_g431rb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32G431RB Nucleo board configuration - -# Copyright (c) 2019 Richard Osterloh -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_G431RB - bool "Nucleo G431RB Development Board" - depends on SOC_STM32G431XX diff --git a/boards/arm/nucleo_g431rb/Kconfig.defconfig b/boards/arm/nucleo_g431rb/Kconfig.defconfig index 62c8e061965f2..8871dd724c188 100644 --- a/boards/arm/nucleo_g431rb/Kconfig.defconfig +++ b/boards/arm/nucleo_g431rb/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2019 Richard Osterloh # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_G431RB - -config BOARD - default "nucleo_g431rb" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_G431RB diff --git a/boards/arm/nucleo_g431rb/Kconfig.nucleo_g431rb b/boards/arm/nucleo_g431rb/Kconfig.nucleo_g431rb new file mode 100644 index 0000000000000..ceb0d10837bf1 --- /dev/null +++ b/boards/arm/nucleo_g431rb/Kconfig.nucleo_g431rb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_G431RB + bool + default y + select SOC_SERIES_STM32G4X + select SOC_STM32G431XX diff --git a/boards/arm/nucleo_g431rb/nucleo_g431rb_defconfig b/boards/arm/nucleo_g431rb/nucleo_g431rb_defconfig index 92c2363d2d8ff..845da52b8dc9b 100644 --- a/boards/arm/nucleo_g431rb/nucleo_g431rb_defconfig +++ b/boards/arm/nucleo_g431rb/nucleo_g431rb_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32G4X=y -CONFIG_SOC_STM32G431XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_g474re/Kconfig.board b/boards/arm/nucleo_g474re/Kconfig.board deleted file mode 100644 index 157e93af1ec66..0000000000000 --- a/boards/arm/nucleo_g474re/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32G474RE Nucleo board configuration - -# Copyright (c) 2019 STMicroelectronics. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_G474RE - bool "Nucleo G474RE Development Board" - depends on SOC_STM32G474XX diff --git a/boards/arm/nucleo_g474re/Kconfig.defconfig b/boards/arm/nucleo_g474re/Kconfig.defconfig index 5af458d22620b..9b00b17f0cc1d 100644 --- a/boards/arm/nucleo_g474re/Kconfig.defconfig +++ b/boards/arm/nucleo_g474re/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2019 STMicroelectronics. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_G474RE - -config BOARD - default "nucleo_g474re" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_G431RB diff --git a/boards/arm/nucleo_g474re/Kconfig.nucleo_g474re b/boards/arm/nucleo_g474re/Kconfig.nucleo_g474re new file mode 100644 index 0000000000000..2035221590dc0 --- /dev/null +++ b/boards/arm/nucleo_g474re/Kconfig.nucleo_g474re @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_G474RE + bool + default y + select SOC_SERIES_STM32G4X + select SOC_STM32G474XX diff --git a/boards/arm/nucleo_g474re/nucleo_g474re_defconfig b/boards/arm/nucleo_g474re/nucleo_g474re_defconfig index 15b382fefaec0..59b99f00cc8bb 100644 --- a/boards/arm/nucleo_g474re/nucleo_g474re_defconfig +++ b/boards/arm/nucleo_g474re/nucleo_g474re_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32G4X=y -CONFIG_SOC_STM32G474XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_h723zg/Kconfig.board b/boards/arm/nucleo_h723zg/Kconfig.board deleted file mode 100644 index da658f90c6d06..0000000000000 --- a/boards/arm/nucleo_h723zg/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32H723ZG Nucleo board configuration - -# Copyright (c) 2020 Alexander Kozhinov -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_H723ZG - bool "NUCLEO-H723ZG Development Board" - depends on SOC_STM32H723XX diff --git a/boards/arm/nucleo_h723zg/Kconfig.defconfig b/boards/arm/nucleo_h723zg/Kconfig.defconfig index 7b5c327e97d83..9023568bbdcd5 100644 --- a/boards/arm/nucleo_h723zg/Kconfig.defconfig +++ b/boards/arm/nucleo_h723zg/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2020 Alexander Kozhinov # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_H723ZG - -config BOARD - default "nucleo_h723zg" - if NETWORKING config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_NUCLEO_H723ZG diff --git a/boards/arm/nucleo_h723zg/Kconfig.nucleo_h723zg b/boards/arm/nucleo_h723zg/Kconfig.nucleo_h723zg new file mode 100644 index 0000000000000..bf843e602dffb --- /dev/null +++ b/boards/arm/nucleo_h723zg/Kconfig.nucleo_h723zg @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_H723ZG + bool + default y + select SOC_SERIES_STM32H7X + select SOC_STM32H723XX diff --git a/boards/arm/nucleo_h723zg/nucleo_h723zg_defconfig b/boards/arm/nucleo_h723zg/nucleo_h723zg_defconfig index 676bfa4533f2a..805b43cb9fad6 100644 --- a/boards/arm/nucleo_h723zg/nucleo_h723zg_defconfig +++ b/boards/arm/nucleo_h723zg/nucleo_h723zg_defconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H723XX=y -CONFIG_BOARD_NUCLEO_H723ZG=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_h743zi/Kconfig.board b/boards/arm/nucleo_h743zi/Kconfig.board deleted file mode 100644 index 9417b98e6709b..0000000000000 --- a/boards/arm/nucleo_h743zi/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32H743ZI Nucleo board configuration - -# Copyright (c) 2020 Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_H743ZI - bool "Nucleo H743ZI Development Board" - depends on SOC_STM32H743XX diff --git a/boards/arm/nucleo_h743zi/Kconfig.defconfig b/boards/arm/nucleo_h743zi/Kconfig.defconfig index e426be48d7f11..1b5459f29e926 100644 --- a/boards/arm/nucleo_h743zi/Kconfig.defconfig +++ b/boards/arm/nucleo_h743zi/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2020 Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_H743ZI - -config BOARD - default "nucleo_h743zi" - if NETWORKING config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_NUCLEO_H743ZI diff --git a/boards/arm/nucleo_h743zi/Kconfig.nucleo_h743zi b/boards/arm/nucleo_h743zi/Kconfig.nucleo_h743zi new file mode 100644 index 0000000000000..66b78fc8ce1f4 --- /dev/null +++ b/boards/arm/nucleo_h743zi/Kconfig.nucleo_h743zi @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_H743ZI + bool + default y + select SOC_SERIES_STM32H7X + select SOC_STM32H743XX diff --git a/boards/arm/nucleo_h743zi/nucleo_h743zi_defconfig b/boards/arm/nucleo_h743zi/nucleo_h743zi_defconfig index c06c8d3440682..b17c33cfd32e1 100644 --- a/boards/arm/nucleo_h743zi/nucleo_h743zi_defconfig +++ b/boards/arm/nucleo_h743zi/nucleo_h743zi_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H743XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_h745zi_q/Kconfig.board b/boards/arm/nucleo_h745zi_q/Kconfig.board deleted file mode 100644 index 0b5c572861077..0000000000000 --- a/boards/arm/nucleo_h745zi_q/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# STM32H745ZI Nucleo board configuration - -# Copyright (c) 2020 Alexander Kozhinov -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_H745ZI_Q_M7 - bool "NUCLEO-H745ZI-Q Development Board" - depends on SOC_STM32H745XX - select CPU_CORTEX_M7 - -config BOARD_NUCLEO_H745ZI_Q_M4 - bool "NUCLEO-H745ZI-Q Development Board" - depends on SOC_STM32H745XX - select CPU_CORTEX_M4 diff --git a/boards/arm/nucleo_h745zi_q/Kconfig.defconfig b/boards/arm/nucleo_h745zi_q/Kconfig.defconfig index 0e572ba7d9dd6..73f740de8631b 100644 --- a/boards/arm/nucleo_h745zi_q/Kconfig.defconfig +++ b/boards/arm/nucleo_h745zi_q/Kconfig.defconfig @@ -3,12 +3,6 @@ # Copyright (c) 2020 Alexander Kozhinov # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_H745ZI_Q_M7 || BOARD_NUCLEO_H745ZI_Q_M4 - -config BOARD - default "nucleo_h745zi_q_m7" if BOARD_NUCLEO_H745ZI_Q_M7 - default "nucleo_h745zi_q_m4" if BOARD_NUCLEO_H745ZI_Q_M4 - config STM32H7_DUAL_CORE default y @@ -18,5 +12,3 @@ config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_NUCLEO_H745ZI_Q_M7 or BOARD_NUCLEO_H745ZI_Q_M4 diff --git a/boards/arm/nucleo_h745zi_q/Kconfig.nucleo_h745zi_q_m4 b/boards/arm/nucleo_h745zi_q/Kconfig.nucleo_h745zi_q_m4 new file mode 100644 index 0000000000000..b805e59baa1b9 --- /dev/null +++ b/boards/arm/nucleo_h745zi_q/Kconfig.nucleo_h745zi_q_m4 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_H745ZI_Q_M4 + bool + default y + select SOC_SERIES_STM32H7X + select SOC_STM32H745XX + select CPU_CORTEX_M4 diff --git a/boards/arm/nucleo_h745zi_q/Kconfig.nucleo_h745zi_q_m7 b/boards/arm/nucleo_h745zi_q/Kconfig.nucleo_h745zi_q_m7 new file mode 100644 index 0000000000000..bbca208eba3d8 --- /dev/null +++ b/boards/arm/nucleo_h745zi_q/Kconfig.nucleo_h745zi_q_m7 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_H745ZI_Q_M7 + bool + default y + select SOC_SERIES_STM32H7X + select SOC_STM32H745XX + select CPU_CORTEX_M7 diff --git a/boards/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4_defconfig b/boards/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4_defconfig index b6233762bbd97..d608d17501e1e 100644 --- a/boards/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4_defconfig +++ b/boards/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4_defconfig @@ -1,10 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H745XX=y # Board config should be specified since there are 2 possible targets -CONFIG_BOARD_NUCLEO_H745ZI_Q_M4=y # Enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7_defconfig b/boards/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7_defconfig index d57388f06ad5b..473105ca1ddf4 100644 --- a/boards/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7_defconfig +++ b/boards/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7_defconfig @@ -1,10 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H745XX=y # Board config should be specified since there are 2 possible targets -CONFIG_BOARD_NUCLEO_H745ZI_Q_M7=y # Enable the internal SMPS regulator CONFIG_POWER_SUPPLY_DIRECT_SMPS=y diff --git a/boards/arm/nucleo_h753zi/Kconfig.board b/boards/arm/nucleo_h753zi/Kconfig.board deleted file mode 100644 index 15d573da300b8..0000000000000 --- a/boards/arm/nucleo_h753zi/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32H753ZI Nucleo board configuration - -# Copyright (c) 2021 Blue Clover Devices -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_H753ZI - bool "Nucleo H753ZI Development Board" - depends on SOC_STM32H753XX diff --git a/boards/arm/nucleo_h753zi/Kconfig.defconfig b/boards/arm/nucleo_h753zi/Kconfig.defconfig index 60abed56e4233..5e2e8fd3831a9 100644 --- a/boards/arm/nucleo_h753zi/Kconfig.defconfig +++ b/boards/arm/nucleo_h753zi/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2021 Blue Clover Devices # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_H753ZI - -config BOARD - default "nucleo_h753zi" - if NETWORKING config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_NUCLEO_H753ZI diff --git a/boards/arm/nucleo_h753zi/Kconfig.nucleo_h753zi b/boards/arm/nucleo_h753zi/Kconfig.nucleo_h753zi new file mode 100644 index 0000000000000..6d35fdeaf78cb --- /dev/null +++ b/boards/arm/nucleo_h753zi/Kconfig.nucleo_h753zi @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_H753ZI + bool + default y + select SOC_SERIES_STM32H7X + select SOC_STM32H753XX diff --git a/boards/arm/nucleo_h753zi/nucleo_h753zi_defconfig b/boards/arm/nucleo_h753zi/nucleo_h753zi_defconfig index 42eb8fd0f1215..b17c33cfd32e1 100644 --- a/boards/arm/nucleo_h753zi/nucleo_h753zi_defconfig +++ b/boards/arm/nucleo_h753zi/nucleo_h753zi_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H753XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_h7a3zi_q/Kconfig.board b/boards/arm/nucleo_h7a3zi_q/Kconfig.board deleted file mode 100644 index 3d8317ac2864f..0000000000000 --- a/boards/arm/nucleo_h7a3zi_q/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32H7A3ZI-Q Nucleo board configuration - -# Copyright (c) 2021 Electrolance Solutions -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_H7A3ZI_Q - bool "Nucleo H75A3ZI-Q Development Board" - depends on SOC_STM32H7A3XXQ diff --git a/boards/arm/nucleo_h7a3zi_q/Kconfig.defconfig b/boards/arm/nucleo_h7a3zi_q/Kconfig.defconfig deleted file mode 100644 index 922423e3669ed..0000000000000 --- a/boards/arm/nucleo_h7a3zi_q/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32H7A3ZI-Q Nucleo board configuration - -# Copyright (c) 2021 Electrolance Solutions -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_H7A3ZI_Q - -config BOARD - default "nucleo_h7a3zi_q" - -endif # BOARD_NUCLEO_H7A3ZI_Q diff --git a/boards/arm/nucleo_h7a3zi_q/Kconfig.nucleo_h7a3zi_q b/boards/arm/nucleo_h7a3zi_q/Kconfig.nucleo_h7a3zi_q new file mode 100644 index 0000000000000..8af7a41e6ef53 --- /dev/null +++ b/boards/arm/nucleo_h7a3zi_q/Kconfig.nucleo_h7a3zi_q @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_H7A3ZI_Q + bool + default y + select SOC_SERIES_STM32H7X + select SOC_STM32H7A3XXQ diff --git a/boards/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig b/boards/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig index 86ed02f8045a1..74f3b2d1b4f44 100644 --- a/boards/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig +++ b/boards/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig @@ -1,8 +1,6 @@ # Copyright (c) 2021 Electrolance Solutions # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H7A3XXQ=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_l011k4/Kconfig.board b/boards/arm/nucleo_l011k4/Kconfig.board deleted file mode 100644 index aa6401045f7e4..0000000000000 --- a/boards/arm/nucleo_l011k4/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-32 development board with STM32L011K4 MCU configuration - -# Copyright (c) 2020 Steven Daglish -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L011K4 - bool "NUCLEO-32 L011K4 Development Board" - depends on SOC_STM32L011XX diff --git a/boards/arm/nucleo_l011k4/Kconfig.defconfig b/boards/arm/nucleo_l011k4/Kconfig.defconfig index 527a93140cb06..88b4c5b34f6c1 100644 --- a/boards/arm/nucleo_l011k4/Kconfig.defconfig +++ b/boards/arm/nucleo_l011k4/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2020 Steven Daglish # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L011K4 - -config BOARD - default "nucleo_l011k4" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_L011K4 diff --git a/boards/arm/nucleo_l011k4/Kconfig.nucleo_l011k4 b/boards/arm/nucleo_l011k4/Kconfig.nucleo_l011k4 new file mode 100644 index 0000000000000..7f401e7ac3b55 --- /dev/null +++ b/boards/arm/nucleo_l011k4/Kconfig.nucleo_l011k4 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L011K4 + bool + default y + select SOC_SERIES_STM32L0X + select SOC_STM32L011XX diff --git a/boards/arm/nucleo_l011k4/nucleo_l011k4_defconfig b/boards/arm/nucleo_l011k4/nucleo_l011k4_defconfig index 62de04f9b1a90..a6e2b9b1fa55f 100644 --- a/boards/arm/nucleo_l011k4/nucleo_l011k4_defconfig +++ b/boards/arm/nucleo_l011k4/nucleo_l011k4_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32L0X=y # Platform Configuration -CONFIG_SOC_STM32L011XX=y # Kernel Options due to Low Memory (2k) CONFIG_MAIN_STACK_SIZE=320 diff --git a/boards/arm/nucleo_l031k6/Kconfig.board b/boards/arm/nucleo_l031k6/Kconfig.board deleted file mode 100644 index 43b52d42020a0..0000000000000 --- a/boards/arm/nucleo_l031k6/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-32 development board with STM32L031K6 MCU configuration - -# Copyright (c) 2020 Steven Daglish -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L031K6 - bool "NUCLEO-32 L031K6 Development Board" - depends on SOC_STM32L031XX diff --git a/boards/arm/nucleo_l031k6/Kconfig.defconfig b/boards/arm/nucleo_l031k6/Kconfig.defconfig index 0c84a21c58795..de97a6231cfa9 100644 --- a/boards/arm/nucleo_l031k6/Kconfig.defconfig +++ b/boards/arm/nucleo_l031k6/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2020 Steven Daglish # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L031K6 - -config BOARD - default "nucleo_l031k6" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_L031K6 diff --git a/boards/arm/nucleo_l031k6/Kconfig.nucleo_l031k6 b/boards/arm/nucleo_l031k6/Kconfig.nucleo_l031k6 new file mode 100644 index 0000000000000..05444c14826a6 --- /dev/null +++ b/boards/arm/nucleo_l031k6/Kconfig.nucleo_l031k6 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L031K6 + bool + default y + select SOC_SERIES_STM32L0X + select SOC_STM32L031XX diff --git a/boards/arm/nucleo_l031k6/nucleo_l031k6_defconfig b/boards/arm/nucleo_l031k6/nucleo_l031k6_defconfig index 83745ca36aff0..547719259359c 100644 --- a/boards/arm/nucleo_l031k6/nucleo_l031k6_defconfig +++ b/boards/arm/nucleo_l031k6/nucleo_l031k6_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32L0X=y # Platform Configuration -CONFIG_SOC_STM32L031XX=y # Kernel Options due to Low Memory (8k) CONFIG_MAIN_STACK_SIZE=640 diff --git a/boards/arm/nucleo_l053r8/Kconfig.board b/boards/arm/nucleo_l053r8/Kconfig.board deleted file mode 100644 index 2500f89b00be4..0000000000000 --- a/boards/arm/nucleo_l053r8/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-64 development board with STM32L053R8 MCU configuration - -# Copyright (c) 2018 Anthony Kreft -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L053R8 - bool "NUCLEO-64 L053R8 Development Board" - depends on SOC_STM32L053XX diff --git a/boards/arm/nucleo_l053r8/Kconfig.defconfig b/boards/arm/nucleo_l053r8/Kconfig.defconfig index bcf55dcc95e68..ac61c6ebbab4a 100644 --- a/boards/arm/nucleo_l053r8/Kconfig.defconfig +++ b/boards/arm/nucleo_l053r8/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2018 Anthony Kreft # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L053R8 - -config BOARD - default "nucleo_l053r8" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_L053R8 diff --git a/boards/arm/nucleo_l053r8/Kconfig.nucleo_l053r8 b/boards/arm/nucleo_l053r8/Kconfig.nucleo_l053r8 new file mode 100644 index 0000000000000..ad045bfc920b3 --- /dev/null +++ b/boards/arm/nucleo_l053r8/Kconfig.nucleo_l053r8 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L053R8 + bool + default y + select SOC_SERIES_STM32L0X + select SOC_STM32L053XX diff --git a/boards/arm/nucleo_l053r8/nucleo_l053r8_defconfig b/boards/arm/nucleo_l053r8/nucleo_l053r8_defconfig index 154565653dafa..411af4c810ffb 100644 --- a/boards/arm/nucleo_l053r8/nucleo_l053r8_defconfig +++ b/boards/arm/nucleo_l053r8/nucleo_l053r8_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32L0X=y # Platform Configuration -CONFIG_SOC_STM32L053XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_l073rz/Kconfig.board b/boards/arm/nucleo_l073rz/Kconfig.board deleted file mode 100644 index 4354ccf843313..0000000000000 --- a/boards/arm/nucleo_l073rz/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-64 development board with STM32L073RZ MCU configuration - -# Copyright (c) 2018 Ilya Tagunov -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L073RZ - bool "NUCLEO-64 L073RZ Development Board" - depends on SOC_STM32L073XX diff --git a/boards/arm/nucleo_l073rz/Kconfig.defconfig b/boards/arm/nucleo_l073rz/Kconfig.defconfig index 66c2d366181bc..e79756f649eac 100644 --- a/boards/arm/nucleo_l073rz/Kconfig.defconfig +++ b/boards/arm/nucleo_l073rz/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018 Ilya Tagunov # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L073RZ - -config BOARD - default "nucleo_l073rz" - config SPI_STM32_INTERRUPT default y depends on SPI @@ -15,5 +10,3 @@ config SPI_STM32_INTERRUPT # LPTIM clocked by LSI, force tick freq to 4000 for tick accuracy config SYS_CLOCK_TICKS_PER_SEC default 4000 if STM32_LPTIM_TIMER - -endif # BOARD_NUCLEO_L073RZ diff --git a/boards/arm/nucleo_l073rz/Kconfig.nucleo_l073rz b/boards/arm/nucleo_l073rz/Kconfig.nucleo_l073rz new file mode 100644 index 0000000000000..2441ef58c94e6 --- /dev/null +++ b/boards/arm/nucleo_l073rz/Kconfig.nucleo_l073rz @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L073RZ + bool + default y + select SOC_SERIES_STM32L0X + select SOC_STM32L073XX diff --git a/boards/arm/nucleo_l073rz/nucleo_l073rz_defconfig b/boards/arm/nucleo_l073rz/nucleo_l073rz_defconfig index 06c6cdfe5daff..5f8eab71635fc 100644 --- a/boards/arm/nucleo_l073rz/nucleo_l073rz_defconfig +++ b/boards/arm/nucleo_l073rz/nucleo_l073rz_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32L0X=y # Platform Configuration -CONFIG_SOC_STM32L073XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_l152re/Kconfig.board b/boards/arm/nucleo_l152re/Kconfig.board deleted file mode 100644 index c87af1608017a..0000000000000 --- a/boards/arm/nucleo_l152re/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2019 Antony Pavlov -# -# SPDX-License-Identifier: Apache-2.0 -# - -config BOARD_NUCLEO_L152RE - bool "NUCLEO-64 L152RE Development Board" - depends on SOC_STM32L152XE diff --git a/boards/arm/nucleo_l152re/Kconfig.defconfig b/boards/arm/nucleo_l152re/Kconfig.defconfig deleted file mode 100644 index 70a209468fc81..0000000000000 --- a/boards/arm/nucleo_l152re/Kconfig.defconfig +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (c) 2019 Antony Pavlov -# -# SPDX-License-Identifier: Apache-2.0 -# - -if BOARD_NUCLEO_L152RE - -config BOARD - default "nucleo_l152re" - -endif # BOARD_NUCLEO_L152RE diff --git a/boards/arm/nucleo_l152re/Kconfig.nucleo_l152re b/boards/arm/nucleo_l152re/Kconfig.nucleo_l152re new file mode 100644 index 0000000000000..8bff7f8ce6a64 --- /dev/null +++ b/boards/arm/nucleo_l152re/Kconfig.nucleo_l152re @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L152RE + bool + default y + select SOC_SERIES_STM32L1X + select SOC_STM32L152XE diff --git a/boards/arm/nucleo_l152re/nucleo_l152re_defconfig b/boards/arm/nucleo_l152re/nucleo_l152re_defconfig index b8045bd70a5ea..f3fe5da3f7ec2 100644 --- a/boards/arm/nucleo_l152re/nucleo_l152re_defconfig +++ b/boards/arm/nucleo_l152re/nucleo_l152re_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L1X=y -CONFIG_SOC_STM32L152XE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_l412rb_p/Kconfig.board b/boards/arm/nucleo_l412rb_p/Kconfig.board deleted file mode 100644 index b81257b7eb7d1..0000000000000 --- a/boards/arm/nucleo_l412rb_p/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32L412RB Nucleo board configuration - -# Copyright (c) 2021 Guðni Már Gilbert -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L412RB_P - bool "Nucleo L412RB-P Development Board" - depends on SOC_STM32L412XX diff --git a/boards/arm/nucleo_l412rb_p/Kconfig.defconfig b/boards/arm/nucleo_l412rb_p/Kconfig.defconfig index 210607bd31d80..a6e955c854ae7 100644 --- a/boards/arm/nucleo_l412rb_p/Kconfig.defconfig +++ b/boards/arm/nucleo_l412rb_p/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2021 Guðni Már Gilbert # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L412RB_P - -config BOARD - default "nucleo_l412rb_p" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_L412RB_P diff --git a/boards/arm/nucleo_l412rb_p/Kconfig.nucleo_l412rb_p b/boards/arm/nucleo_l412rb_p/Kconfig.nucleo_l412rb_p new file mode 100644 index 0000000000000..77a48ed1d7e7d --- /dev/null +++ b/boards/arm/nucleo_l412rb_p/Kconfig.nucleo_l412rb_p @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L412RB_P + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L412XX diff --git a/boards/arm/nucleo_l412rb_p/nucleo_l412rb_p_defconfig b/boards/arm/nucleo_l412rb_p/nucleo_l412rb_p_defconfig index a3541daa6f6ab..e4e2e55ecdd35 100644 --- a/boards/arm/nucleo_l412rb_p/nucleo_l412rb_p_defconfig +++ b/boards/arm/nucleo_l412rb_p/nucleo_l412rb_p_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L412XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_l432kc/Kconfig.board b/boards/arm/nucleo_l432kc/Kconfig.board deleted file mode 100644 index 5340455df002a..0000000000000 --- a/boards/arm/nucleo_l432kc/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# STM32L432KC Nucleo board configuration - -# Copyright (c) 2016 Open-RnD Sp. z o.o. -# Copyright (c) 2016 BayLibre, SAS -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L432KC - bool "Nucleo L432KC Development Board" - depends on SOC_STM32L432XX diff --git a/boards/arm/nucleo_l432kc/Kconfig.defconfig b/boards/arm/nucleo_l432kc/Kconfig.defconfig index d76ef2633af2c..6e7d241a22c19 100644 --- a/boards/arm/nucleo_l432kc/Kconfig.defconfig +++ b/boards/arm/nucleo_l432kc/Kconfig.defconfig @@ -4,13 +4,6 @@ # Copyright (c) 2016 BayLibre, SAS # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L432KC - -config BOARD - default "nucleo_l432kc" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_L432KC diff --git a/boards/arm/nucleo_l432kc/Kconfig.nucleo_l432kc b/boards/arm/nucleo_l432kc/Kconfig.nucleo_l432kc new file mode 100644 index 0000000000000..f6b34c5738f72 --- /dev/null +++ b/boards/arm/nucleo_l432kc/Kconfig.nucleo_l432kc @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L432KC + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L432XX diff --git a/boards/arm/nucleo_l432kc/nucleo_l432kc_defconfig b/boards/arm/nucleo_l432kc/nucleo_l432kc_defconfig index d4bf42213f4b2..4b3bfc4541ae4 100644 --- a/boards/arm/nucleo_l432kc/nucleo_l432kc_defconfig +++ b/boards/arm/nucleo_l432kc/nucleo_l432kc_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L432XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_l433rc_p/Kconfig.board b/boards/arm/nucleo_l433rc_p/Kconfig.board deleted file mode 100644 index 3a53d91bc258a..0000000000000 --- a/boards/arm/nucleo_l433rc_p/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32L433RC Nucleo board configuration - -# Copyright (c) 2021 Matija Tudan -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L433RC_P - bool "Nucleo L433RC-P Development Board" - depends on SOC_STM32L433XX diff --git a/boards/arm/nucleo_l433rc_p/Kconfig.defconfig b/boards/arm/nucleo_l433rc_p/Kconfig.defconfig index 6213689503340..7b76d36a55d6a 100644 --- a/boards/arm/nucleo_l433rc_p/Kconfig.defconfig +++ b/boards/arm/nucleo_l433rc_p/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2021 Matija Tudan # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L433RC_P - -config BOARD - default "nucleo_l433rc_p" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_L433RC_P diff --git a/boards/arm/nucleo_l433rc_p/Kconfig.nucleo_l433rc_p b/boards/arm/nucleo_l433rc_p/Kconfig.nucleo_l433rc_p new file mode 100644 index 0000000000000..d0d3db4f1113a --- /dev/null +++ b/boards/arm/nucleo_l433rc_p/Kconfig.nucleo_l433rc_p @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L433RC_P + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L433XX diff --git a/boards/arm/nucleo_l433rc_p/nucleo_l433rc_p_defconfig b/boards/arm/nucleo_l433rc_p/nucleo_l433rc_p_defconfig index 72a116e3fec1e..4b3bfc4541ae4 100644 --- a/boards/arm/nucleo_l433rc_p/nucleo_l433rc_p_defconfig +++ b/boards/arm/nucleo_l433rc_p/nucleo_l433rc_p_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L433XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_l452re/Kconfig.board b/boards/arm/nucleo_l452re/Kconfig.board deleted file mode 100644 index ba69b24e6e6ed..0000000000000 --- a/boards/arm/nucleo_l452re/Kconfig.board +++ /dev/null @@ -1,13 +0,0 @@ -# STM32L452RE Nucleo board configuration -# -# Copyright (c) 2019 Libre Solar Technologies GmbH -# -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L452RE - bool "Nucleo L452RE Development Board" - depends on SOC_STM32L452XX - -config BOARD_NUCLEO_L452RE_P - bool "Nucleo L452RE-P Development Board" - depends on SOC_STM32L452XX diff --git a/boards/arm/nucleo_l452re/Kconfig.defconfig b/boards/arm/nucleo_l452re/Kconfig.defconfig index 3da8b18ec7423..7740e135d38fb 100644 --- a/boards/arm/nucleo_l452re/Kconfig.defconfig +++ b/boards/arm/nucleo_l452re/Kconfig.defconfig @@ -4,14 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L452RE || BOARD_NUCLEO_L452RE_P - -config BOARD - default "nucleo_l452re" if BOARD_NUCLEO_L452RE - default "nucleo_l452re_p" if BOARD_NUCLEO_L452RE_P - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_L452RE || BOARD_NUCLEO_L452RE_P diff --git a/boards/arm/nucleo_l452re/Kconfig.nucleo_l452re b/boards/arm/nucleo_l452re/Kconfig.nucleo_l452re new file mode 100644 index 0000000000000..157ab62be7601 --- /dev/null +++ b/boards/arm/nucleo_l452re/Kconfig.nucleo_l452re @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L452RE + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L452XX diff --git a/boards/arm/nucleo_l452re/Kconfig.nucleo_l452re_p b/boards/arm/nucleo_l452re/Kconfig.nucleo_l452re_p new file mode 100644 index 0000000000000..59c411e079684 --- /dev/null +++ b/boards/arm/nucleo_l452re/Kconfig.nucleo_l452re_p @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L452RE_P + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L452XX diff --git a/boards/arm/nucleo_l452re/nucleo_l452re_defconfig b/boards/arm/nucleo_l452re/nucleo_l452re_defconfig index 14b7ffdd20928..f3897010c8fb1 100644 --- a/boards/arm/nucleo_l452re/nucleo_l452re_defconfig +++ b/boards/arm/nucleo_l452re/nucleo_l452re_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L452XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_l452re/nucleo_l452re_p_defconfig b/boards/arm/nucleo_l452re/nucleo_l452re_p_defconfig index 14b7ffdd20928..f3897010c8fb1 100644 --- a/boards/arm/nucleo_l452re/nucleo_l452re_p_defconfig +++ b/boards/arm/nucleo_l452re/nucleo_l452re_p_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L452XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_l476rg/Kconfig.board b/boards/arm/nucleo_l476rg/Kconfig.board deleted file mode 100644 index b83025518a28a..0000000000000 --- a/boards/arm/nucleo_l476rg/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# STM32L476RG Nucleo board configuration - -# Copyright (c) 2016 Open-RnD Sp. z o.o. -# Copyright (c) 2016 BayLibre, SAS -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L476RG - bool "Nucleo L476RG Development Board" - depends on SOC_STM32L476XX diff --git a/boards/arm/nucleo_l476rg/Kconfig.defconfig b/boards/arm/nucleo_l476rg/Kconfig.defconfig index cbbef016161a4..9b8277e683006 100644 --- a/boards/arm/nucleo_l476rg/Kconfig.defconfig +++ b/boards/arm/nucleo_l476rg/Kconfig.defconfig @@ -4,13 +4,6 @@ # Copyright (c) 2016 BayLibre, SAS # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L476RG - -config BOARD - default "nucleo_l476rg" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_L476RG diff --git a/boards/arm/nucleo_l476rg/Kconfig.nucleo_l476rg b/boards/arm/nucleo_l476rg/Kconfig.nucleo_l476rg new file mode 100644 index 0000000000000..085cbc974e212 --- /dev/null +++ b/boards/arm/nucleo_l476rg/Kconfig.nucleo_l476rg @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L476RG + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L476XX diff --git a/boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig b/boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig index 0ba22d7b6c432..1713838eb5cd1 100644 --- a/boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig +++ b/boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L476XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_l496zg/Kconfig.board b/boards/arm/nucleo_l496zg/Kconfig.board deleted file mode 100644 index 908385c5f53ba..0000000000000 --- a/boards/arm/nucleo_l496zg/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32L496ZG Nucleo board configuration - -# Copyright (c) 2018-2019 Centaur Analytics, Inc -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L496ZG - bool "Nucleo L496ZG Development Board" - depends on SOC_STM32L496XX diff --git a/boards/arm/nucleo_l496zg/Kconfig.defconfig b/boards/arm/nucleo_l496zg/Kconfig.defconfig index 34fcc96575a22..bc25e8b68a8f4 100644 --- a/boards/arm/nucleo_l496zg/Kconfig.defconfig +++ b/boards/arm/nucleo_l496zg/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2018 Centaur Analytics, Inc # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L496ZG - -config BOARD - default "nucleo_l496zg" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_NUCLEO_L496ZG diff --git a/boards/arm/nucleo_l496zg/Kconfig.nucleo_l496zg b/boards/arm/nucleo_l496zg/Kconfig.nucleo_l496zg new file mode 100644 index 0000000000000..6bbc9e7831a72 --- /dev/null +++ b/boards/arm/nucleo_l496zg/Kconfig.nucleo_l496zg @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L496ZG + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L496XX diff --git a/boards/arm/nucleo_l496zg/nucleo_l496zg_defconfig b/boards/arm/nucleo_l496zg/nucleo_l496zg_defconfig index e195230eb2082..6ca66b09ade9c 100644 --- a/boards/arm/nucleo_l496zg/nucleo_l496zg_defconfig +++ b/boards/arm/nucleo_l496zg/nucleo_l496zg_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L496XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_l4r5zi/Kconfig.board b/boards/arm/nucleo_l4r5zi/Kconfig.board deleted file mode 100644 index aebd712289bfa..0000000000000 --- a/boards/arm/nucleo_l4r5zi/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32L4R5ZI Nucleo board configuration - -# Copyright (c) 2018 Pushpal Sidhu -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L4R5ZI - bool "Nucleo L4R5ZI Development Board" - depends on SOC_STM32L4R5XX diff --git a/boards/arm/nucleo_l4r5zi/Kconfig.defconfig b/boards/arm/nucleo_l4r5zi/Kconfig.defconfig index 5b3db7604cbd9..872c5026f90fe 100644 --- a/boards/arm/nucleo_l4r5zi/Kconfig.defconfig +++ b/boards/arm/nucleo_l4r5zi/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018 Pushpal Sidhu # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L4R5ZI - -config BOARD - default "nucleo_l4r5zi" - config SPI_STM32_INTERRUPT default y depends on SPI @@ -21,5 +16,3 @@ config USB_DEVICE_NETWORK_EEM default y endif # NETWORKING - -endif # BOARD_NUCLEO_L4R5ZI diff --git a/boards/arm/nucleo_l4r5zi/Kconfig.nucleo_l4r5zi b/boards/arm/nucleo_l4r5zi/Kconfig.nucleo_l4r5zi new file mode 100644 index 0000000000000..2ba5dc9875850 --- /dev/null +++ b/boards/arm/nucleo_l4r5zi/Kconfig.nucleo_l4r5zi @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L4R5ZI + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L4R5XX diff --git a/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig b/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig index 0efb42f55a9f6..85e8b269821be 100644 --- a/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig +++ b/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L4R5XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_l552ze_q/Kconfig.board b/boards/arm/nucleo_l552ze_q/Kconfig.board deleted file mode 100644 index a79e9274d0bf8..0000000000000 --- a/boards/arm/nucleo_l552ze_q/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32L552ZE Q Nucleo board configuration - -# Copyright (c) 2020 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_L552ZE_Q - bool "Nucleo L552ZE Q Development Board" - depends on SOC_STM32L552XX diff --git a/boards/arm/nucleo_l552ze_q/Kconfig.defconfig b/boards/arm/nucleo_l552ze_q/Kconfig.defconfig index 3d832d3390446..3e7a41e0ff0db 100644 --- a/boards/arm/nucleo_l552ze_q/Kconfig.defconfig +++ b/boards/arm/nucleo_l552ze_q/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2020 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_L552ZE_Q - -config BOARD - default "nucleo_l552ze_q" - if TRUSTED_EXECUTION_NONSECURE # Get flash configuration for NS image from dts flash partition @@ -15,5 +10,3 @@ config USE_DT_CODE_PARTITION default y endif # TRUSTED_EXECUTION_NONSECURE - -endif # BOARD_NUCLEO_L552ZE_Q diff --git a/boards/arm/nucleo_l552ze_q/Kconfig.nucleo_l552ze_q b/boards/arm/nucleo_l552ze_q/Kconfig.nucleo_l552ze_q new file mode 100644 index 0000000000000..12ea36466af19 --- /dev/null +++ b/boards/arm/nucleo_l552ze_q/Kconfig.nucleo_l552ze_q @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L552ZE_Q + bool + default y + select SOC_SERIES_STM32L5X + select SOC_STM32L552XX diff --git a/boards/arm/nucleo_l552ze_q/Kconfig.nucleo_l552ze_q_ns b/boards/arm/nucleo_l552ze_q/Kconfig.nucleo_l552ze_q_ns new file mode 100644 index 0000000000000..df0733222e1ef --- /dev/null +++ b/boards/arm/nucleo_l552ze_q/Kconfig.nucleo_l552ze_q_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_L552ZE_Q_NS + bool + default y + select SOC_SERIES_STM32L5X + select SOC_STM32L552XX diff --git a/boards/arm/nucleo_l552ze_q/nucleo_l552ze_q_defconfig b/boards/arm/nucleo_l552ze_q/nucleo_l552ze_q_defconfig index aa132c44b32af..9bb53b7a4b150 100644 --- a/boards/arm/nucleo_l552ze_q/nucleo_l552ze_q_defconfig +++ b/boards/arm/nucleo_l552ze_q/nucleo_l552ze_q_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L5X=y -CONFIG_SOC_STM32L552XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_l552ze_q/nucleo_l552ze_q_ns_defconfig b/boards/arm/nucleo_l552ze_q/nucleo_l552ze_q_ns_defconfig index 93f551efc34b6..b310fc976a0ee 100644 --- a/boards/arm/nucleo_l552ze_q/nucleo_l552ze_q_ns_defconfig +++ b/boards/arm/nucleo_l552ze_q/nucleo_l552ze_q_ns_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L5X=y -CONFIG_SOC_STM32L552XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_u575zi_q/Kconfig.board b/boards/arm/nucleo_u575zi_q/Kconfig.board deleted file mode 100644 index 1f08c09447e41..0000000000000 --- a/boards/arm/nucleo_u575zi_q/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32U575ZI Q Nucleo board configuration - -# Copyright (c) 2021 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_U575ZI_Q - bool "Nucleo U575ZI Q Development Board" - depends on SOC_STM32U575XX diff --git a/boards/arm/nucleo_u575zi_q/Kconfig.defconfig b/boards/arm/nucleo_u575zi_q/Kconfig.defconfig deleted file mode 100644 index 901d86a255155..0000000000000 --- a/boards/arm/nucleo_u575zi_q/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32U575ZI Q Nucleo board configuration - -# Copyright (c) 2021 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_U575ZI_Q - -config BOARD - default "nucleo_u575zi_q" - -endif # BOARD_NUCLEO_U575ZI_Q diff --git a/boards/arm/nucleo_u575zi_q/Kconfig.nucleo_u575zi_q b/boards/arm/nucleo_u575zi_q/Kconfig.nucleo_u575zi_q new file mode 100644 index 0000000000000..974637b891d61 --- /dev/null +++ b/boards/arm/nucleo_u575zi_q/Kconfig.nucleo_u575zi_q @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_U575ZI_Q + bool + default y + select SOC_SERIES_STM32U5X + select SOC_STM32U575XX diff --git a/boards/arm/nucleo_u575zi_q/nucleo_u575zi_q_defconfig b/boards/arm/nucleo_u575zi_q/nucleo_u575zi_q_defconfig index 23eebae7ef079..9bb53b7a4b150 100644 --- a/boards/arm/nucleo_u575zi_q/nucleo_u575zi_q_defconfig +++ b/boards/arm/nucleo_u575zi_q/nucleo_u575zi_q_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32U5X=y -CONFIG_SOC_STM32U575XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_wb55rg/Kconfig.board b/boards/arm/nucleo_wb55rg/Kconfig.board deleted file mode 100644 index a81009c125962..0000000000000 --- a/boards/arm/nucleo_wb55rg/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32WB55RG Nucleo board configuration - -# Copyright (c) 2019 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_WB55RG - bool "Nucleo WB55RG Development Board" - depends on SOC_STM32WB55XX diff --git a/boards/arm/nucleo_wb55rg/Kconfig.defconfig b/boards/arm/nucleo_wb55rg/Kconfig.defconfig index 1a7ffcff0efc3..bd272f854e87c 100644 --- a/boards/arm/nucleo_wb55rg/Kconfig.defconfig +++ b/boards/arm/nucleo_wb55rg/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2019 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_WB55RG - -config BOARD - default "nucleo_wb55rg" - choice BT_HCI_BUS_TYPE default BT_STM32_IPM depends on BT @@ -16,5 +11,3 @@ endchoice # LPTIM clocked by LSE, force tick freq to 4096 for tick accuracy config SYS_CLOCK_TICKS_PER_SEC default 4096 if STM32_LPTIM_TIMER - -endif # BOARD_NUCLEO_WB55RG diff --git a/boards/arm/nucleo_wb55rg/Kconfig.nucleo_wb55rg b/boards/arm/nucleo_wb55rg/Kconfig.nucleo_wb55rg new file mode 100644 index 0000000000000..a0b5785c9cec5 --- /dev/null +++ b/boards/arm/nucleo_wb55rg/Kconfig.nucleo_wb55rg @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_WB55RG + bool + default y + select SOC_SERIES_STM32WBX + select SOC_STM32WB55XX diff --git a/boards/arm/nucleo_wb55rg/nucleo_wb55rg_defconfig b/boards/arm/nucleo_wb55rg/nucleo_wb55rg_defconfig index 9fdd732848efc..75373aa997cfc 100644 --- a/boards/arm/nucleo_wb55rg/nucleo_wb55rg_defconfig +++ b/boards/arm/nucleo_wb55rg/nucleo_wb55rg_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_STM32WBX=y -CONFIG_SOC_STM32WB55XX=y - # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nucleo_wl55jc/Kconfig.board b/boards/arm/nucleo_wl55jc/Kconfig.board deleted file mode 100644 index ece57d57da035..0000000000000 --- a/boards/arm/nucleo_wl55jc/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32WL55JC Nucleo board configuration - -# Copyright (c) 2020 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_WL55JC - bool "Nucleo WL55JC Development Board" - depends on SOC_STM32WL55XX diff --git a/boards/arm/nucleo_wl55jc/Kconfig.defconfig b/boards/arm/nucleo_wl55jc/Kconfig.defconfig index 197453cc03e37..b1fed1e4a2c13 100644 --- a/boards/arm/nucleo_wl55jc/Kconfig.defconfig +++ b/boards/arm/nucleo_wl55jc/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2020 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_WL55JC - -config BOARD - default "nucleo_wl55jc" - config SYS_CLOCK_TICKS_PER_SEC default 4000 if STM32_LPTIM_TIMER - -endif # BOARD_NUCLEO_WL55JC diff --git a/boards/arm/nucleo_wl55jc/Kconfig.nucleo_wl55jc b/boards/arm/nucleo_wl55jc/Kconfig.nucleo_wl55jc new file mode 100644 index 0000000000000..342d737b7f5a9 --- /dev/null +++ b/boards/arm/nucleo_wl55jc/Kconfig.nucleo_wl55jc @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_WL55JC + bool + default y + select SOC_SERIES_STM32WLX + select SOC_STM32WL55XX diff --git a/boards/arm/nucleo_wl55jc/nucleo_wl55jc_defconfig b/boards/arm/nucleo_wl55jc/nucleo_wl55jc_defconfig index 813ba6643ccc8..0d6dc9f80d3dd 100644 --- a/boards/arm/nucleo_wl55jc/nucleo_wl55jc_defconfig +++ b/boards/arm/nucleo_wl55jc/nucleo_wl55jc_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_STM32WLX=y -CONFIG_SOC_STM32WL55XX=y - # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/nuvoton_pfm_m487/Kconfig.board b/boards/arm/nuvoton_pfm_m487/Kconfig.board deleted file mode 100644 index ab31e205a3a6d..0000000000000 --- a/boards/arm/nuvoton_pfm_m487/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Nuvoton PFM M487 board configuration -# -# Copyright (c) 2020 Linumiz -# Author: Saravanan Sekar - -config BOARD_NUVOTON_PFM_M487 - bool "NUVOTON PFM MP487 Development Board" - depends on SOC_M487 diff --git a/boards/arm/nuvoton_pfm_m487/Kconfig.defconfig b/boards/arm/nuvoton_pfm_m487/Kconfig.defconfig deleted file mode 100644 index d9657b64fa429..0000000000000 --- a/boards/arm/nuvoton_pfm_m487/Kconfig.defconfig +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Nuvoton PFM M487 board configuration -# -# Copyright (c) 2020 Linumiz -# Author: Saravanan Sekar - -if BOARD_NUVOTON_PFM_M487 - -config BOARD - default "nuvoton_pfm_m487" - -endif # BOARD_NUVOTON_PFM_M487 diff --git a/boards/arm/nuvoton_pfm_m487/Kconfig.nuvoton_pfm_m487 b/boards/arm/nuvoton_pfm_m487/Kconfig.nuvoton_pfm_m487 new file mode 100644 index 0000000000000..1a14a851701df --- /dev/null +++ b/boards/arm/nuvoton_pfm_m487/Kconfig.nuvoton_pfm_m487 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUVOTON_PFM_M487 + bool + default y + select SOC_SERIES_M48X + select SOC_M487 diff --git a/boards/arm/nuvoton_pfm_m487/nuvoton_pfm_m487_defconfig b/boards/arm/nuvoton_pfm_m487/nuvoton_pfm_m487_defconfig index 47be5d1ae4550..517b121c3ab9b 100644 --- a/boards/arm/nuvoton_pfm_m487/nuvoton_pfm_m487_defconfig +++ b/boards/arm/nuvoton_pfm_m487/nuvoton_pfm_m487_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_M48X=y -CONFIG_SOC_M487=y -CONFIG_BOARD_NUVOTON_PFM_M487=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/olimex_lora_stm32wl_devkit/Kconfig.board b/boards/arm/olimex_lora_stm32wl_devkit/Kconfig.board deleted file mode 100644 index ce50e16b3fb30..0000000000000 --- a/boards/arm/olimex_lora_stm32wl_devkit/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Olimex LoRa STM32WL DevKit configuration - -# Copyright (c) 2022 Martin Jäger -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_OLIMEX_LORA_STM32WL_DEVKIT - bool "Olimex LoRa STM32WL DevKit" - depends on SOC_STM32WLE5XX diff --git a/boards/arm/olimex_lora_stm32wl_devkit/Kconfig.defconfig b/boards/arm/olimex_lora_stm32wl_devkit/Kconfig.defconfig deleted file mode 100644 index 21efeea2fc71b..0000000000000 --- a/boards/arm/olimex_lora_stm32wl_devkit/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Olimex LoRa STM32WL DevKit configuration - -# Copyright (c) 2022 Martin Jäger -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_OLIMEX_LORA_STM32WL_DEVKIT - -config BOARD - default "olimex_lora_stm32wl_devkit" - -endif # BOARD_OLIMEX_LORA_STM32WL_DEVKIT diff --git a/boards/arm/olimex_lora_stm32wl_devkit/Kconfig.olimex_lora_stm32wl_devkit b/boards/arm/olimex_lora_stm32wl_devkit/Kconfig.olimex_lora_stm32wl_devkit new file mode 100644 index 0000000000000..033b5c75717fc --- /dev/null +++ b/boards/arm/olimex_lora_stm32wl_devkit/Kconfig.olimex_lora_stm32wl_devkit @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_OLIMEX_LORA_STM32WL_DEVKIT + bool + default y + select SOC_SERIES_STM32WLX + select SOC_STM32WLE5XX diff --git a/boards/arm/olimex_lora_stm32wl_devkit/olimex_lora_stm32wl_devkit_defconfig b/boards/arm/olimex_lora_stm32wl_devkit/olimex_lora_stm32wl_devkit_defconfig index 892b32c4d1785..a615b818942b9 100644 --- a/boards/arm/olimex_lora_stm32wl_devkit/olimex_lora_stm32wl_devkit_defconfig +++ b/boards/arm/olimex_lora_stm32wl_devkit/olimex_lora_stm32wl_devkit_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_STM32WLX=y -CONFIG_SOC_STM32WLE5XX=y - # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/olimex_stm32_e407/Kconfig.board b/boards/arm/olimex_stm32_e407/Kconfig.board deleted file mode 100644 index ff09270835838..0000000000000 --- a/boards/arm/olimex_stm32_e407/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# OLIMEX-STM32-E407 board configuration - -# Copyright (c) 2017, Erwin Rol -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_OLIMEX_STM32_E407 - bool "OLIMEX-STM32-E407 Development Board" - depends on SOC_STM32F407XG diff --git a/boards/arm/olimex_stm32_e407/Kconfig.defconfig b/boards/arm/olimex_stm32_e407/Kconfig.defconfig deleted file mode 100644 index 28fb1c3f76e93..0000000000000 --- a/boards/arm/olimex_stm32_e407/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# OLIMEX-STM32-E407 board configuration - -# Copyright (c) 2017, Erwin Rol -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_OLIMEX_STM32_E407 - -config BOARD - default "olimex_stm32_e407" - -endif # BOARD_OLIMEX_STM32_E407 diff --git a/boards/arm/olimex_stm32_e407/Kconfig.olimex_stm32_e407 b/boards/arm/olimex_stm32_e407/Kconfig.olimex_stm32_e407 new file mode 100644 index 0000000000000..09fde11054814 --- /dev/null +++ b/boards/arm/olimex_stm32_e407/Kconfig.olimex_stm32_e407 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_OLIMEX_STM32_E407 + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F407XG diff --git a/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig b/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig index ad325266c72c9..bc6020b2f192f 100644 --- a/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig +++ b/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F407XG=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/olimex_stm32_h103/Kconfig.board b/boards/arm/olimex_stm32_h103/Kconfig.board deleted file mode 100644 index d2f9e76ae4a5c..0000000000000 --- a/boards/arm/olimex_stm32_h103/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# OLIMEX-STM32-H103 board configuration - -# Copyright (c) 2020, Josep Puigdemont -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_OLIMEX_STM32_H103 - bool "OLIMEX-STM32-H103 Development Board" - depends on SOC_STM32F103XB diff --git a/boards/arm/olimex_stm32_h103/Kconfig.defconfig b/boards/arm/olimex_stm32_h103/Kconfig.defconfig deleted file mode 100644 index 5dd2426b5f628..0000000000000 --- a/boards/arm/olimex_stm32_h103/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# OLIMEX-STM32-H103 board configuration - -# Copyright (c) 2020, Josep Puigdemont -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_OLIMEX_STM32_H103 - -config BOARD - default "olimex_stm32_h103" - -endif # BOARD_OLIMEX_STM32_H103 diff --git a/boards/arm/olimex_stm32_h103/Kconfig.olimex_stm32_h103 b/boards/arm/olimex_stm32_h103/Kconfig.olimex_stm32_h103 new file mode 100644 index 0000000000000..6cf8f54862594 --- /dev/null +++ b/boards/arm/olimex_stm32_h103/Kconfig.olimex_stm32_h103 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_OLIMEX_STM32_H103 + bool + default y + select SOC_SERIES_STM32F1X + select SOC_STM32F103XB diff --git a/boards/arm/olimex_stm32_h103/olimex_stm32_h103_defconfig b/boards/arm/olimex_stm32_h103/olimex_stm32_h103_defconfig index 7dc8d8f3b6fc0..b5ca2afbd5f90 100644 --- a/boards/arm/olimex_stm32_h103/olimex_stm32_h103_defconfig +++ b/boards/arm/olimex_stm32_h103/olimex_stm32_h103_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F103XB=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/olimex_stm32_h405/Kconfig.board b/boards/arm/olimex_stm32_h405/Kconfig.board deleted file mode 100644 index 6559afd8b3594..0000000000000 --- a/boards/arm/olimex_stm32_h405/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# OLIMEX-STM32-H405 board configuration - -# Copyright (c) 2020, 2021 Antony Pavlov -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_OLIMEX_STM32_H405 - bool "OLIMEX STM32-H405 Development Board" - depends on SOC_STM32F405XG diff --git a/boards/arm/olimex_stm32_h405/Kconfig.defconfig b/boards/arm/olimex_stm32_h405/Kconfig.defconfig deleted file mode 100644 index bd334c78807a7..0000000000000 --- a/boards/arm/olimex_stm32_h405/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# OLIMEX-STM32-H405 board configuration - -# Copyright (c) 2020, Antony Pavlov -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_OLIMEX_STM32_H405 - -config BOARD - default "olimex_stm32_h405" - -endif # BOARD_OLIMEX_STM32_H405 diff --git a/boards/arm/olimex_stm32_h405/Kconfig.olimex_stm32_h405 b/boards/arm/olimex_stm32_h405/Kconfig.olimex_stm32_h405 new file mode 100644 index 0000000000000..a8bf2961cf57e --- /dev/null +++ b/boards/arm/olimex_stm32_h405/Kconfig.olimex_stm32_h405 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_OLIMEX_STM32_H405 + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F405XG diff --git a/boards/arm/olimex_stm32_h405/olimex_stm32_h405_defconfig b/boards/arm/olimex_stm32_h405/olimex_stm32_h405_defconfig index ca015a21976c5..bc6020b2f192f 100644 --- a/boards/arm/olimex_stm32_h405/olimex_stm32_h405_defconfig +++ b/boards/arm/olimex_stm32_h405/olimex_stm32_h405_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F405XG=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/olimex_stm32_h407/Kconfig.board b/boards/arm/olimex_stm32_h407/Kconfig.board deleted file mode 100644 index c08552cd65b5c..0000000000000 --- a/boards/arm/olimex_stm32_h407/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# OLIMEX-STM32-H407 board configuration - -# Copyright (c) 2018, Reto Schneider -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_OLIMEX_STM32_H407 - bool "OLIMEX-STM32-H407 Development Board" - depends on SOC_STM32F407XG diff --git a/boards/arm/olimex_stm32_h407/Kconfig.defconfig b/boards/arm/olimex_stm32_h407/Kconfig.defconfig deleted file mode 100644 index 01a8e749d59d2..0000000000000 --- a/boards/arm/olimex_stm32_h407/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# OLIMEX-STM32-H407 board configuration - -# Copyright (c) 2018, Reto Schneider -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_OLIMEX_STM32_H407 - -config BOARD - default "olimex_stm32_h407" - -endif # BOARD_OLIMEX_STM32_H407 diff --git a/boards/arm/olimex_stm32_h407/Kconfig.olimex_stm32_h407 b/boards/arm/olimex_stm32_h407/Kconfig.olimex_stm32_h407 new file mode 100644 index 0000000000000..d27c93cc9d219 --- /dev/null +++ b/boards/arm/olimex_stm32_h407/Kconfig.olimex_stm32_h407 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_OLIMEX_STM32_H407 + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F407XG diff --git a/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig b/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig index ad325266c72c9..bc6020b2f192f 100644 --- a/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig +++ b/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F407XG=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/olimex_stm32_p405/Kconfig.board b/boards/arm/olimex_stm32_p405/Kconfig.board deleted file mode 100644 index fdc33309849ee..0000000000000 --- a/boards/arm/olimex_stm32_p405/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# OLIMEX-STM32-P405 board configuration - -# Copyright (c) 2017, Erwin Rol -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_OLIMEX_STM32_P405 - bool "OLIMEX-STM32-P405 Development Board" - depends on SOC_STM32F405XG diff --git a/boards/arm/olimex_stm32_p405/Kconfig.defconfig b/boards/arm/olimex_stm32_p405/Kconfig.defconfig deleted file mode 100644 index 8dc0211bd7f1c..0000000000000 --- a/boards/arm/olimex_stm32_p405/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# OLIMEX-STM32-P405 board configuration - -# Copyright (c) 2017, Erwin Rol -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_OLIMEX_STM32_P405 - -config BOARD - default "olimex_stm32_p405" - -endif # BOARD_OLIMEX_STM32_P405 diff --git a/boards/arm/olimex_stm32_p405/Kconfig.olimex_stm32_p405 b/boards/arm/olimex_stm32_p405/Kconfig.olimex_stm32_p405 new file mode 100644 index 0000000000000..3be14b318e648 --- /dev/null +++ b/boards/arm/olimex_stm32_p405/Kconfig.olimex_stm32_p405 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_OLIMEX_STM32_P405 + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F405XG diff --git a/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig b/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig index 18d48f08e1a5c..076f92c41c628 100644 --- a/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig +++ b/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F405XG=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/olimexino_stm32/Kconfig.board b/boards/arm/olimexino_stm32/Kconfig.board deleted file mode 100644 index 902efe68813c0..0000000000000 --- a/boards/arm/olimexino_stm32/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# OLIMEXINO-STM32 board configuration - -# Copyright (c) 2016, I-SENSE group of ICCS -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_OLIMEXINO_STM32 - bool "OLIMEXINO-STM32 Development Board" - depends on SOC_STM32F103XB diff --git a/boards/arm/olimexino_stm32/Kconfig.defconfig b/boards/arm/olimexino_stm32/Kconfig.defconfig index 1c90ddc74e290..c39b81cc96565 100644 --- a/boards/arm/olimexino_stm32/Kconfig.defconfig +++ b/boards/arm/olimexino_stm32/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2016, I-SENSE group of ICCS # SPDX-License-Identifier: Apache-2.0 -if BOARD_OLIMEXINO_STM32 - -config BOARD - default "olimexino_stm32" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_OLIMEXINO_STM32 diff --git a/boards/arm/olimexino_stm32/Kconfig.olimexino_stm32 b/boards/arm/olimexino_stm32/Kconfig.olimexino_stm32 new file mode 100644 index 0000000000000..1322df246a2b0 --- /dev/null +++ b/boards/arm/olimexino_stm32/Kconfig.olimexino_stm32 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_OLIMEXINO_STM32 + bool + default y + select SOC_SERIES_STM32F1X + select SOC_STM32F103XB diff --git a/boards/arm/olimexino_stm32/olimexino_stm32_defconfig b/boards/arm/olimexino_stm32/olimexino_stm32_defconfig index f8edab4b9803f..e3f2fde6d0ba7 100644 --- a/boards/arm/olimexino_stm32/olimexino_stm32_defconfig +++ b/boards/arm/olimexino_stm32/olimexino_stm32_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F103XB=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/pan1770_evb/Kconfig b/boards/arm/pan1770_evb/Kconfig index 305b35abf99ef..a40a1b3188543 100644 --- a/boards/arm/pan1770_evb/Kconfig +++ b/boards/arm/pan1770_evb/Kconfig @@ -3,8 +3,6 @@ # Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_PAN1770_EVB - config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X @@ -14,5 +12,3 @@ config BOARD_ENABLE_DCDC_HV bool "High Voltage DCDC converter" select SOC_DCDC_NRF52X_HV default y - -endif # BOARD_PAN1770_EVB diff --git a/boards/arm/pan1770_evb/Kconfig.board b/boards/arm/pan1770_evb/Kconfig.board deleted file mode 100644 index af61b03670145..0000000000000 --- a/boards/arm/pan1770_evb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# PAN1770 EVB configuration - -# Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PAN1770_EVB - bool "pan1770-evb" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/pan1770_evb/Kconfig.defconfig b/boards/arm/pan1770_evb/Kconfig.defconfig index e4f718cfb040a..ac6665004b0dd 100644 --- a/boards/arm/pan1770_evb/Kconfig.defconfig +++ b/boards/arm/pan1770_evb/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_PAN1770_EVB - -config BOARD - default "pan1770_evb" - config BT_CTLR default BT - -endif # BOARD_PAN1770_EVB diff --git a/boards/arm/pan1770_evb/Kconfig.pan1770_evb b/boards/arm/pan1770_evb/Kconfig.pan1770_evb new file mode 100644 index 0000000000000..9018731b4e663 --- /dev/null +++ b/boards/arm/pan1770_evb/Kconfig.pan1770_evb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PAN1770_EVB + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/pan1770_evb/pan1770_evb_defconfig b/boards/arm/pan1770_evb/pan1770_evb_defconfig index 1192aca064ec7..f90b19ece7396 100644 --- a/boards/arm/pan1770_evb/pan1770_evb_defconfig +++ b/boards/arm/pan1770_evb/pan1770_evb_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_PAN1770_EVB=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/pan1780_evb/Kconfig b/boards/arm/pan1780_evb/Kconfig index 2ac3fc5cef57f..1ef97c6550b2b 100644 --- a/boards/arm/pan1780_evb/Kconfig +++ b/boards/arm/pan1780_evb/Kconfig @@ -3,8 +3,6 @@ # Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_PAN1780_EVB - config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X @@ -14,5 +12,3 @@ config BOARD_ENABLE_DCDC_HV bool "High Voltage DCDC converter" select SOC_DCDC_NRF52X_HV default y - -endif # BOARD_PAN1780_EVB diff --git a/boards/arm/pan1780_evb/Kconfig.board b/boards/arm/pan1780_evb/Kconfig.board deleted file mode 100644 index 54e8be6cfc3d6..0000000000000 --- a/boards/arm/pan1780_evb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# PAN1780 EVB configuration - -# Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PAN1780_EVB - bool "pan1780-evb" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/pan1780_evb/Kconfig.defconfig b/boards/arm/pan1780_evb/Kconfig.defconfig index 4ce48bcab5996..3d70ef87780a1 100644 --- a/boards/arm/pan1780_evb/Kconfig.defconfig +++ b/boards/arm/pan1780_evb/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_PAN1780_EVB - -config BOARD - default "pan1780_evb" - config BT_CTLR default BT - -endif # BOARD_PAN1780_EVB diff --git a/boards/arm/pan1780_evb/Kconfig.pan1780_evb b/boards/arm/pan1780_evb/Kconfig.pan1780_evb new file mode 100644 index 0000000000000..c7c43cb00ac13 --- /dev/null +++ b/boards/arm/pan1780_evb/Kconfig.pan1780_evb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PAN1780_EVB + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/pan1780_evb/pan1780_evb_defconfig b/boards/arm/pan1780_evb/pan1780_evb_defconfig index 0c459f39aacf8..e42a306584cae 100644 --- a/boards/arm/pan1780_evb/pan1780_evb_defconfig +++ b/boards/arm/pan1780_evb/pan1780_evb_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_PAN1780_EVB=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/pan1781_evb/Kconfig.board b/boards/arm/pan1781_evb/Kconfig.board deleted file mode 100644 index 04c8680dba84c..0000000000000 --- a/boards/arm/pan1781_evb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# PAN1781 EVB configuration - -# Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PAN1781_EVB - bool "pan1781-evb" - depends on SOC_NRF52820_QDAA diff --git a/boards/arm/pan1781_evb/Kconfig.defconfig b/boards/arm/pan1781_evb/Kconfig.defconfig index 551d01ddd3178..ad94421176176 100644 --- a/boards/arm/pan1781_evb/Kconfig.defconfig +++ b/boards/arm/pan1781_evb/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_PAN1781_EVB - -config BOARD - default "pan1781_evb" - config BT_CTLR default BT - -endif # BOARD_PAN1781_EVB diff --git a/boards/arm/pan1781_evb/Kconfig.pan1781_evb b/boards/arm/pan1781_evb/Kconfig.pan1781_evb new file mode 100644 index 0000000000000..2f86c3ff1ff1e --- /dev/null +++ b/boards/arm/pan1781_evb/Kconfig.pan1781_evb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PAN1781_EVB + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52820_QDAA diff --git a/boards/arm/pan1781_evb/pan1781_evb_defconfig b/boards/arm/pan1781_evb/pan1781_evb_defconfig index 76436dd2ccde0..2c557c541eb34 100644 --- a/boards/arm/pan1781_evb/pan1781_evb_defconfig +++ b/boards/arm/pan1781_evb/pan1781_evb_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52820_QDAA=y -CONFIG_BOARD_PAN1781_EVB=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/pan1782_evb/Kconfig.board b/boards/arm/pan1782_evb/Kconfig.board deleted file mode 100644 index 734f1f5dfee6e..0000000000000 --- a/boards/arm/pan1782_evb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# PAN1782 EVB configuration - -# Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PAN1782_EVB - bool "pan1782-evb" - depends on SOC_NRF52833_QIAA diff --git a/boards/arm/pan1782_evb/Kconfig.defconfig b/boards/arm/pan1782_evb/Kconfig.defconfig index 465794a8b21e4..8011a21007d1f 100644 --- a/boards/arm/pan1782_evb/Kconfig.defconfig +++ b/boards/arm/pan1782_evb/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_PAN1782_EVB - -config BOARD - default "pan1782_evb" - config BT_CTLR default BT - -endif # BOARD_PAN1782_EVB diff --git a/boards/arm/pan1782_evb/Kconfig.pan1782_evb b/boards/arm/pan1782_evb/Kconfig.pan1782_evb new file mode 100644 index 0000000000000..f62858cf330cf --- /dev/null +++ b/boards/arm/pan1782_evb/Kconfig.pan1782_evb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PAN1782_EVB + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52833_QIAA diff --git a/boards/arm/pan1782_evb/pan1782_evb_defconfig b/boards/arm/pan1782_evb/pan1782_evb_defconfig index 0bdeb9d912717..232887028236a 100644 --- a/boards/arm/pan1782_evb/pan1782_evb_defconfig +++ b/boards/arm/pan1782_evb/pan1782_evb_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2022 Panasonic Industrial Devices Europe GmbH # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52833_QIAA=y -CONFIG_BOARD_PAN1782_EVB=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/particle_argon/Kconfig.board b/boards/arm/particle_argon/Kconfig.board deleted file mode 100644 index 8b8aa29e3bc42..0000000000000 --- a/boards/arm/particle_argon/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Particle Argon configuration - -# Copyright (c) 2018 Matthias Boesl -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PARTICLE_ARGON - bool "Particle Argon Board" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/particle_argon/Kconfig.defconfig b/boards/arm/particle_argon/Kconfig.defconfig index df988c09cd80a..eae633dd56431 100644 --- a/boards/arm/particle_argon/Kconfig.defconfig +++ b/boards/arm/particle_argon/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2018 Matthias Boesl # SPDX-License-Identifier: Apache-2.0 -if BOARD_PARTICLE_ARGON - -config BOARD - default "particle_argon" - config BT_CTLR default BT - -endif # BOARD_PARTICLE_ARGON diff --git a/boards/arm/particle_argon/Kconfig.particle_argon b/boards/arm/particle_argon/Kconfig.particle_argon new file mode 100644 index 0000000000000..7b7a3dea56cfd --- /dev/null +++ b/boards/arm/particle_argon/Kconfig.particle_argon @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PARTICLE_ARGON + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/particle_argon/particle_argon_defconfig b/boards/arm/particle_argon/particle_argon_defconfig index 784364e9edcf1..f81efed939989 100644 --- a/boards/arm/particle_argon/particle_argon_defconfig +++ b/boards/arm/particle_argon/particle_argon_defconfig @@ -4,9 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_PARTICLE_ARGON=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/particle_boron/Kconfig.board b/boards/arm/particle_boron/Kconfig.board deleted file mode 100644 index 17273fbf7617a..0000000000000 --- a/boards/arm/particle_boron/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Particle Boron configuration - -# Copyright (c) 2018 Peter Bigot Consulting, LLC -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PARTICLE_BORON - bool "Particle Boron Board" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/particle_boron/Kconfig.defconfig b/boards/arm/particle_boron/Kconfig.defconfig index 9352289086c62..120b926c54365 100644 --- a/boards/arm/particle_boron/Kconfig.defconfig +++ b/boards/arm/particle_boron/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018 Peter Bigot Consulting, LLC # SPDX-License-Identifier: Apache-2.0 -if BOARD_PARTICLE_BORON - -config BOARD - default "particle_boron" - config BT_CTLR default BT @@ -24,5 +19,3 @@ config UART_INTERRUPT_DRIVEN default y endif # MODEM - -endif # BOARD_PARTICLE_BORON diff --git a/boards/arm/particle_boron/Kconfig.particle_boron b/boards/arm/particle_boron/Kconfig.particle_boron new file mode 100644 index 0000000000000..f591a860bbc1f --- /dev/null +++ b/boards/arm/particle_boron/Kconfig.particle_boron @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PARTICLE_BORON + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/particle_boron/particle_boron_defconfig b/boards/arm/particle_boron/particle_boron_defconfig index 1e6e784b09702..14823768416c4 100644 --- a/boards/arm/particle_boron/particle_boron_defconfig +++ b/boards/arm/particle_boron/particle_boron_defconfig @@ -3,9 +3,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_PARTICLE_BORON=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/particle_xenon/Kconfig.board b/boards/arm/particle_xenon/Kconfig.board deleted file mode 100644 index 918ad23e8cd64..0000000000000 --- a/boards/arm/particle_xenon/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Particle Xenon configuration - -# Copyright (c) 2018 Endre Karlson -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PARTICLE_XENON - bool "Particle Xenon Board" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/particle_xenon/Kconfig.defconfig b/boards/arm/particle_xenon/Kconfig.defconfig index 858a1230726d7..bda2dee76db3a 100644 --- a/boards/arm/particle_xenon/Kconfig.defconfig +++ b/boards/arm/particle_xenon/Kconfig.defconfig @@ -4,12 +4,5 @@ # Copyright (c) 2018 Peter Bigot Consulting, LLC # SPDX-License-Identifier: Apache-2.0 -if BOARD_PARTICLE_XENON - -config BOARD - default "particle_xenon" - config BT_CTLR default BT - -endif # BOARD_PARTICLE_XENON diff --git a/boards/arm/particle_xenon/Kconfig.particle_xenon b/boards/arm/particle_xenon/Kconfig.particle_xenon new file mode 100644 index 0000000000000..ac2c01519ab50 --- /dev/null +++ b/boards/arm/particle_xenon/Kconfig.particle_xenon @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PARTICLE_XENON + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/particle_xenon/particle_xenon_defconfig b/boards/arm/particle_xenon/particle_xenon_defconfig index 5f90beabba001..81b00ac448dc8 100644 --- a/boards/arm/particle_xenon/particle_xenon_defconfig +++ b/boards/arm/particle_xenon/particle_xenon_defconfig @@ -3,9 +3,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_PARTICLE_XENON=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/pico_pi_m4/Kconfig.board b/boards/arm/pico_pi_m4/Kconfig.board deleted file mode 100644 index e980c3d1ec996..0000000000000 --- a/boards/arm/pico_pi_m4/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Pico-Pi iMX7D M4 board - -# Copyright (c) 2019, Joris Offouga -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PICO_PI_M4 - bool "Pico-PI iMX7D Dual" - depends on SOC_SERIES_IMX7_M4 diff --git a/boards/arm/pico_pi_m4/Kconfig.defconfig b/boards/arm/pico_pi_m4/Kconfig.defconfig index fb3f7cd2f894c..b6377d84e5c72 100644 --- a/boards/arm/pico_pi_m4/Kconfig.defconfig +++ b/boards/arm/pico_pi_m4/Kconfig.defconfig @@ -3,16 +3,12 @@ # Copyright (c) 2019, Joris Offouga # SPDX-License-Identifier: Apache-2.0 -if BOARD_PICO_PI_M4 - -config BOARD - default "pico_pi_m4" - if !XIP + config FLASH_SIZE default 0 + config FLASH_BASE_ADDRESS default 0 -endif -endif # BOARD_PICO_PI_M4 +endif diff --git a/boards/arm/pico_pi_m4/Kconfig.pico_pi_m4 b/boards/arm/pico_pi_m4/Kconfig.pico_pi_m4 new file mode 100644 index 0000000000000..5587bfca876cf --- /dev/null +++ b/boards/arm/pico_pi_m4/Kconfig.pico_pi_m4 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PICO_PI_M4 + bool + default y + select SOC_SERIES_IMX7_M4 + select SOC_MCIMX7_M4 diff --git a/boards/arm/pico_pi_m4/pico_pi_m4_defconfig b/boards/arm/pico_pi_m4/pico_pi_m4_defconfig index d2e77138089ea..a9f1db5c8a767 100644 --- a/boards/arm/pico_pi_m4/pico_pi_m4_defconfig +++ b/boards/arm/pico_pi_m4/pico_pi_m4_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_IMX7_M4=y -CONFIG_SOC_MCIMX7_M4=y -CONFIG_BOARD_PICO_PI_M4=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/boards/arm/pinetime_devkit0/Kconfig.board b/boards/arm/pinetime_devkit0/Kconfig.board deleted file mode 100644 index 7b4cd93e7181b..0000000000000 --- a/boards/arm/pinetime_devkit0/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# PineTime DevKit0 board configuration - -# Copyright (c) 2020 Stephane Dorre -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PINETIME_DEVKIT0 - bool "PineTime DevKit0" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/pinetime_devkit0/Kconfig.defconfig b/boards/arm/pinetime_devkit0/Kconfig.defconfig index 5fe143913b2d8..c6338f7ef08ae 100644 --- a/boards/arm/pinetime_devkit0/Kconfig.defconfig +++ b/boards/arm/pinetime_devkit0/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2020 Stephane Dorre # SPDX-License-Identifier: Apache-2.0 -if BOARD_PINETIME_DEVKIT0 - -config BOARD - default "pinetime_devkit0" - config BT_CTLR default BT @@ -23,5 +18,3 @@ config SPI_NOR_FLASH_LAYOUT_PAGE_SIZE default 4096 endif # FLASH - -endif # BOARD_PINETIME_DEVKIT0 diff --git a/boards/arm/pinetime_devkit0/Kconfig.pinetime_devkit0 b/boards/arm/pinetime_devkit0/Kconfig.pinetime_devkit0 new file mode 100644 index 0000000000000..96d55724ae0e6 --- /dev/null +++ b/boards/arm/pinetime_devkit0/Kconfig.pinetime_devkit0 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PINETIME_DEVKIT0 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/pinetime_devkit0/pinetime_devkit0_defconfig b/boards/arm/pinetime_devkit0/pinetime_devkit0_defconfig index 4e48c259730bb..0ca9fc7c25671 100644 --- a/boards/arm/pinetime_devkit0/pinetime_devkit0_defconfig +++ b/boards/arm/pinetime_devkit0/pinetime_devkit0_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_PINETIME_DEVKIT0=y CONFIG_ARM_MPU=y diff --git a/boards/arm/pinnacle_100_dvk/Kconfig.board b/boards/arm/pinnacle_100_dvk/Kconfig.board deleted file mode 100644 index adbb23e41d868..0000000000000 --- a/boards/arm/pinnacle_100_dvk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Pinnacle(TM) 100 DVK board configuration -# -# Copyright (c) 2020 Laird Connectivity -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PINNACLE_100_DVK - bool "Pinnacle 100 DVK" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/pinnacle_100_dvk/Kconfig.defconfig b/boards/arm/pinnacle_100_dvk/Kconfig.defconfig index e249601699732..7fb57311b2dc9 100644 --- a/boards/arm/pinnacle_100_dvk/Kconfig.defconfig +++ b/boards/arm/pinnacle_100_dvk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2019 Laird Connectivity # SPDX-License-Identifier: Apache-2.0 -if BOARD_PINNACLE_100_DVK - -config BOARD - default "pinnacle_100_dvk" - config MODEM default NETWORKING @@ -22,5 +17,3 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE config BT_CTLR default BT - -endif # BOARD_PINNACLE_100_DVK diff --git a/boards/arm/pinnacle_100_dvk/Kconfig.pinnacle_100_dvk b/boards/arm/pinnacle_100_dvk/Kconfig.pinnacle_100_dvk new file mode 100644 index 0000000000000..0581efdfe444f --- /dev/null +++ b/boards/arm/pinnacle_100_dvk/Kconfig.pinnacle_100_dvk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PINNACLE_100_DVK + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/pinnacle_100_dvk/pinnacle_100_dvk_defconfig b/boards/arm/pinnacle_100_dvk/pinnacle_100_dvk_defconfig index 7f11757ab5d71..aac5680e168aa 100644 --- a/boards/arm/pinnacle_100_dvk/pinnacle_100_dvk_defconfig +++ b/boards/arm/pinnacle_100_dvk/pinnacle_100_dvk_defconfig @@ -2,9 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_PINNACLE_100_DVK=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/qemu_cortex_a9/Kconfig.board b/boards/arm/qemu_cortex_a9/Kconfig.board deleted file mode 100644 index c8fcdf1ccdb38..0000000000000 --- a/boards/arm/qemu_cortex_a9/Kconfig.board +++ /dev/null @@ -1,11 +0,0 @@ -# -# Kconfig - Cortex-A9 QEMU Emulation -# -# Copyright (c) 2021, Weidmueller Interface GmbH & Co. KG -# SPDX-License-Identifier: Apache-2.0 -# - -config BOARD_QEMU_CORTEX_A9 - bool "Cortex-A9 Emulation (QEMU)" - depends on SOC_XILINX_XC7Z007S - select QEMU_TARGET diff --git a/boards/arm/qemu_cortex_a9/Kconfig.defconfig b/boards/arm/qemu_cortex_a9/Kconfig.defconfig index 09c6afaae64cf..566d988329405 100644 --- a/boards/arm/qemu_cortex_a9/Kconfig.defconfig +++ b/boards/arm/qemu_cortex_a9/Kconfig.defconfig @@ -5,14 +5,9 @@ # SPDX-License-Identifier: Apache-2.0 # -if BOARD_QEMU_CORTEX_A9 - config BUILD_OUTPUT_BIN default n -config BOARD - default "qemu_cortex_a9" - config SYS_CLOCK_HW_CYCLES_PER_SEC int default 111111111 @@ -76,5 +71,3 @@ if SHELL default 8192 endif # SHELL - -endif # BOARD_QEMU_CORTEX_A9 diff --git a/boards/arm/qemu_cortex_a9/Kconfig.qemu_cortex_a9 b/boards/arm/qemu_cortex_a9/Kconfig.qemu_cortex_a9 new file mode 100644 index 0000000000000..28f1b64a9b87e --- /dev/null +++ b/boards/arm/qemu_cortex_a9/Kconfig.qemu_cortex_a9 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_CORTEX_A9 + bool + default y + select SOC_SERIES_XILINX_XC7ZXXXS + select SOC_XILINX_XC7Z007S + select QEMU_TARGET diff --git a/boards/arm/qemu_cortex_a9/qemu_cortex_a9_defconfig b/boards/arm/qemu_cortex_a9/qemu_cortex_a9_defconfig index 01c7b5191b8a2..eb66bcfeaf1e9 100644 --- a/boards/arm/qemu_cortex_a9/qemu_cortex_a9_defconfig +++ b/boards/arm/qemu_cortex_a9/qemu_cortex_a9_defconfig @@ -4,10 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_BOARD_QEMU_CORTEX_A9=y -CONFIG_SOC_SERIES_XILINX_XC7ZXXXS=y -CONFIG_SOC_XILINX_XC7Z007S=y CONFIG_ARM_ARCH_TIMER=y diff --git a/boards/arm/qemu_cortex_m0/Kconfig.board b/boards/arm/qemu_cortex_m0/Kconfig.board deleted file mode 100644 index 8a6473d852164..0000000000000 --- a/boards/arm/qemu_cortex_m0/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# QEMU Cortex-M0 board configuration - -# Copyright (c) 2019 Nordic Semiconductor ASA. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_CORTEX_M0 - bool "Cortex-M0 Emulation (QEMU)" - depends on SOC_NRF51822_QFAA - select QEMU_TARGET diff --git a/boards/arm/qemu_cortex_m0/Kconfig.defconfig b/boards/arm/qemu_cortex_m0/Kconfig.defconfig index 8aa63a89a5756..dffcff82aaadd 100644 --- a/boards/arm/qemu_cortex_m0/Kconfig.defconfig +++ b/boards/arm/qemu_cortex_m0/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2019 Nordic Semiconductor ASA. # SPDX-License-Identifier: Apache-2.0 -if BOARD_QEMU_CORTEX_M0 - -config BOARD - default "qemu_cortex_m0" - config NRF_RTC_TIMER default n if SYS_CLOCK_EXISTS @@ -19,5 +14,3 @@ config SYS_CLOCK_TICKS_PER_SEC config LOG_BUFFER_SIZE default 128 if LOG - -endif # BOARD_QEMU_CORTEX_M0 diff --git a/boards/arm/qemu_cortex_m0/Kconfig.qemu_cortex_m0 b/boards/arm/qemu_cortex_m0/Kconfig.qemu_cortex_m0 new file mode 100644 index 0000000000000..2dd6ca88c4b02 --- /dev/null +++ b/boards/arm/qemu_cortex_m0/Kconfig.qemu_cortex_m0 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_CORTEX_M0 + bool + default y + select SOC_SERIES_NRF51X + select SOC_NRF51822_QFAA + select QEMU_TARGET diff --git a/boards/arm/qemu_cortex_m0/qemu_cortex_m0_defconfig b/boards/arm/qemu_cortex_m0/qemu_cortex_m0_defconfig index 447f6028a6a71..aa8c5a73c2e46 100644 --- a/boards/arm/qemu_cortex_m0/qemu_cortex_m0_defconfig +++ b/boards/arm/qemu_cortex_m0/qemu_cortex_m0_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF51X=y -CONFIG_SOC_NRF51822_QFAA=y -CONFIG_BOARD_QEMU_CORTEX_M0=y CONFIG_QEMU_ICOUNT_SHIFT=6 # enable GPIO diff --git a/boards/arm/qemu_cortex_m3/Kconfig.board b/boards/arm/qemu_cortex_m3/Kconfig.board deleted file mode 100644 index 6322724df8928..0000000000000 --- a/boards/arm/qemu_cortex_m3/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_CORTEX_M3 - bool "Cortex-M3 Emulation (QEMU)" - depends on SOC_TI_LM3S6965 - select QEMU_TARGET diff --git a/boards/arm/qemu_cortex_m3/Kconfig.defconfig b/boards/arm/qemu_cortex_m3/Kconfig.defconfig index bfbda98cb73ec..732144e4f339c 100644 --- a/boards/arm/qemu_cortex_m3/Kconfig.defconfig +++ b/boards/arm/qemu_cortex_m3/Kconfig.defconfig @@ -1,17 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_QEMU_CORTEX_M3 - config BUILD_OUTPUT_BIN default n -config BOARD - default "qemu_cortex_m3" - # DWT is not properly emulated in QEMU choice NULL_POINTER_EXCEPTION_DETECTION bool default NULL_POINTER_EXCEPTION_DETECTION_NONE endchoice - -endif # BOARD_QEMU_CORTEX_M3 diff --git a/boards/arm/qemu_cortex_m3/Kconfig.qemu_cortex_m3 b/boards/arm/qemu_cortex_m3/Kconfig.qemu_cortex_m3 new file mode 100644 index 0000000000000..53f5bcafc7887 --- /dev/null +++ b/boards/arm/qemu_cortex_m3/Kconfig.qemu_cortex_m3 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_CORTEX_M3 + bool + default y + select SOC_TI_LM3S6965 + select QEMU_TARGET diff --git a/boards/arm/qemu_cortex_m3/qemu_cortex_m3_defconfig b/boards/arm/qemu_cortex_m3/qemu_cortex_m3_defconfig index 7abc1e1d58a5f..01ddd76df644a 100644 --- a/boards/arm/qemu_cortex_m3/qemu_cortex_m3_defconfig +++ b/boards/arm/qemu_cortex_m3/qemu_cortex_m3_defconfig @@ -1,8 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000 -CONFIG_SOC_TI_LM3S6965=y -CONFIG_BOARD_QEMU_CORTEX_M3=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/qemu_cortex_r5/Kconfig.board b/boards/arm/qemu_cortex_r5/Kconfig.board deleted file mode 100644 index 9824aeb5bc1e1..0000000000000 --- a/boards/arm/qemu_cortex_r5/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2019 Lexmark International, Inc. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_CORTEX_R5 - bool "Cortex-R5 Emulation (QEMU)" - depends on SOC_XILINX_ZYNQMP_RPU - select QEMU_TARGET diff --git a/boards/arm/qemu_cortex_r5/Kconfig.defconfig b/boards/arm/qemu_cortex_r5/Kconfig.defconfig index 9cac36e1ee6b9..e32669fd92305 100644 --- a/boards/arm/qemu_cortex_r5/Kconfig.defconfig +++ b/boards/arm/qemu_cortex_r5/Kconfig.defconfig @@ -1,19 +1,12 @@ # Copyright (c) 2019 Lexmark International, Inc. # SPDX-License-Identifier: Apache-2.0 -if BOARD_QEMU_CORTEX_R5 - config BUILD_OUTPUT_BIN default n -config BOARD - default "qemu_cortex_r5" - if USERSPACE config COMPILER_ISA_THUMB2 default n endif - -endif # BOARD_QEMU_CORTEX_R5 diff --git a/boards/arm/qemu_cortex_r5/Kconfig.qemu_cortex_r5 b/boards/arm/qemu_cortex_r5/Kconfig.qemu_cortex_r5 new file mode 100644 index 0000000000000..b2894613ce2ec --- /dev/null +++ b/boards/arm/qemu_cortex_r5/Kconfig.qemu_cortex_r5 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_CORTEX_R5 + bool + default y + select SOC_XILINX_ZYNQMP_RPU + select QEMU_TARGET diff --git a/boards/arm/qemu_cortex_r5/qemu_cortex_r5_defconfig b/boards/arm/qemu_cortex_r5/qemu_cortex_r5_defconfig index ac7ff922ed76f..40e22978ec0b9 100644 --- a/boards/arm/qemu_cortex_r5/qemu_cortex_r5_defconfig +++ b/boards/arm/qemu_cortex_r5/qemu_cortex_r5_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_XILINX_ZYNQMP_RPU=y -CONFIG_BOARD_QEMU_CORTEX_R5=y CONFIG_XIP=n CONFIG_QEMU_ICOUNT_SHIFT=3 diff --git a/boards/arm/quick_feather/Kconfig.board b/boards/arm/quick_feather/Kconfig.board deleted file mode 100644 index e85b49bc4e48a..0000000000000 --- a/boards/arm/quick_feather/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Quick Feather board - -# Copyright (c) 2020 Antmicro -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QUICK_FEATHER - bool "QuickLogic Quick Feather target" - depends on SOC_EOS_S3 diff --git a/boards/arm/quick_feather/Kconfig.defconfig b/boards/arm/quick_feather/Kconfig.defconfig deleted file mode 100644 index cf328e50b1b3e..0000000000000 --- a/boards/arm/quick_feather/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# QuickLogic Quick Feather board - -# Copyright (c) 2020 Antmicro -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_QUICK_FEATHER - -config BOARD - default "quick_feather" - -endif # BOARD_QUICK_FEATHER diff --git a/boards/arm/quick_feather/Kconfig.quick_feather b/boards/arm/quick_feather/Kconfig.quick_feather new file mode 100644 index 0000000000000..790dc30b431a9 --- /dev/null +++ b/boards/arm/quick_feather/Kconfig.quick_feather @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QUICK_FEATHER + bool + default y + select SOC_EOS_S3 diff --git a/boards/arm/quick_feather/quick_feather_defconfig b/boards/arm/quick_feather/quick_feather_defconfig index 6f88908e44c52..2e774d2660335 100644 --- a/boards/arm/quick_feather/quick_feather_defconfig +++ b/boards/arm/quick_feather/quick_feather_defconfig @@ -2,8 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM_MPU=n -CONFIG_SOC_EOS_S3=y -CONFIG_BOARD_QUICK_FEATHER=y # system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=61440000 diff --git a/boards/arm/rak4631_nrf52840/Kconfig.board b/boards/arm/rak4631_nrf52840/Kconfig.board deleted file mode 100644 index f5db017218979..0000000000000 --- a/boards/arm/rak4631_nrf52840/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# RAKWIRELESS RAK4631 selection - -# Copyright (c) 2021 Guillaume Paquet -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_RAK4631_NRF52840 - bool "RAK4631 DK NRF52840" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/rak4631_nrf52840/Kconfig.defconfig b/boards/arm/rak4631_nrf52840/Kconfig.defconfig index 10a6070f95b68..16e77558d9934 100644 --- a/boards/arm/rak4631_nrf52840/Kconfig.defconfig +++ b/boards/arm/rak4631_nrf52840/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2021 Guillaume Paquet # SPDX-License-Identifier: Apache-2.0 -if BOARD_RAK4631_NRF52840 - -config BOARD - default "rak4631_nrf52840" - config BT_CTLR default BT - -endif # BOARD_RAK4631_NRF52840 diff --git a/boards/arm/rak4631_nrf52840/Kconfig.rak4631_nrf52840 b/boards/arm/rak4631_nrf52840/Kconfig.rak4631_nrf52840 new file mode 100644 index 0000000000000..a3d22bcb5fb3c --- /dev/null +++ b/boards/arm/rak4631_nrf52840/Kconfig.rak4631_nrf52840 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RAK4631_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/rak4631_nrf52840/rak4631_nrf52840_defconfig b/boards/arm/rak4631_nrf52840/rak4631_nrf52840_defconfig index 80da4e0504148..f4129c730a9d8 100644 --- a/boards/arm/rak4631_nrf52840/rak4631_nrf52840_defconfig +++ b/boards/arm/rak4631_nrf52840/rak4631_nrf52840_defconfig @@ -1,7 +1,4 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_RAK4631_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/rak5010_nrf52840/Kconfig.board b/boards/arm/rak5010_nrf52840/Kconfig.board deleted file mode 100644 index c5a5ab2d3a1e3..0000000000000 --- a/boards/arm/rak5010_nrf52840/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# RAKWIRELESS RAK5010 selection - -# Copyright (c) 2020 Guillaume Paquet -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_RAK5010_NRF52840 - bool "RAK5010 DK NRF52840" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/rak5010_nrf52840/Kconfig.defconfig b/boards/arm/rak5010_nrf52840/Kconfig.defconfig index 502e1d8b7f692..1ce0b89e56522 100644 --- a/boards/arm/rak5010_nrf52840/Kconfig.defconfig +++ b/boards/arm/rak5010_nrf52840/Kconfig.defconfig @@ -3,15 +3,8 @@ # Copyright (c) 2020 Guillaume Paquet # SPDX-License-Identifier: Apache-2.0 -if BOARD_RAK5010_NRF52840 - -config BOARD - default "rak5010_nrf52840" - config MODEM_QUECTEL_BG9X default y config BT_CTLR default BT - -endif # BOARD_RAK5010_NRF52840 diff --git a/boards/arm/rak5010_nrf52840/Kconfig.rak5010_nrf52840 b/boards/arm/rak5010_nrf52840/Kconfig.rak5010_nrf52840 new file mode 100644 index 0000000000000..4805c1e4fc84d --- /dev/null +++ b/boards/arm/rak5010_nrf52840/Kconfig.rak5010_nrf52840 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RAK5010_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/rak5010_nrf52840/rak5010_nrf52840_defconfig b/boards/arm/rak5010_nrf52840/rak5010_nrf52840_defconfig index b908cb5debdec..93833530738ea 100644 --- a/boards/arm/rak5010_nrf52840/rak5010_nrf52840_defconfig +++ b/boards/arm/rak5010_nrf52840/rak5010_nrf52840_defconfig @@ -1,7 +1,4 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_RAK5010_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/rcar_h3_salvatorx/Kconfig.board b/boards/arm/rcar_h3_salvatorx/Kconfig.board deleted file mode 100644 index f0236267f0800..0000000000000 --- a/boards/arm/rcar_h3_salvatorx/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 BayLibre, SAS -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_RCAR_H3_SALVATORX_CR7 - bool "Cortex-R7 for Renesas H3 Salvator-X" - depends on SOC_R8A77951 diff --git a/boards/arm/rcar_h3_salvatorx/Kconfig.defconfig b/boards/arm/rcar_h3_salvatorx/Kconfig.defconfig deleted file mode 100644 index ccc3ffa89a553..0000000000000 --- a/boards/arm/rcar_h3_salvatorx/Kconfig.defconfig +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2022 BayLibre, SAS -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_RCAR_H3_SALVATORX_CR7 -config BOARD - default "rcar_h3_salvatorx_cr7" -endif # BOARD_RCAR_H3_SALVATORX_CR7 diff --git a/boards/arm/rcar_h3_salvatorx/Kconfig.rcar_h3_salvatorx_cr7 b/boards/arm/rcar_h3_salvatorx/Kconfig.rcar_h3_salvatorx_cr7 new file mode 100644 index 0000000000000..bd36c64db444c --- /dev/null +++ b/boards/arm/rcar_h3_salvatorx/Kconfig.rcar_h3_salvatorx_cr7 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RCAR_H3_SALVATORX_CR7 + bool + default y + select SOC_R8A77951 + select SOC_SERIES_RCAR_GEN3 diff --git a/boards/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7_defconfig b/boards/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7_defconfig index 3cf6bbaa0f26f..b70c8f29e22ec 100644 --- a/boards/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7_defconfig +++ b/boards/arm/rcar_h3_salvatorx/rcar_h3_salvatorx_cr7_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_R8A77951=y -CONFIG_SOC_SERIES_RCAR_GEN3=y -CONFIG_BOARD_RCAR_H3_SALVATORX_CR7=y CONFIG_CLOCK_CONTROL=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000 CONFIG_CONSOLE=y diff --git a/boards/arm/rcar_h3ulcb/Kconfig.board b/boards/arm/rcar_h3ulcb/Kconfig.board deleted file mode 100644 index eec48844f2a11..0000000000000 --- a/boards/arm/rcar_h3ulcb/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 IoT.bzh -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_RCAR_H3ULCB_CR7 - bool "Cortex-R7 for Renesas H3ULCB" - depends on SOC_R8A77951 diff --git a/boards/arm/rcar_h3ulcb/Kconfig.defconfig b/boards/arm/rcar_h3ulcb/Kconfig.defconfig deleted file mode 100644 index 61504744fa19f..0000000000000 --- a/boards/arm/rcar_h3ulcb/Kconfig.defconfig +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2021 IoT.bzh -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_RCAR_H3ULCB_CR7 -config BOARD - default "rcar_h3ulcb_cr7" -endif # BOARD_RCAR_H3ULCB_CR7 diff --git a/boards/arm/rcar_h3ulcb/Kconfig.rcar_h3ulcb_cr7 b/boards/arm/rcar_h3ulcb/Kconfig.rcar_h3ulcb_cr7 new file mode 100644 index 0000000000000..626867a6c2c2d --- /dev/null +++ b/boards/arm/rcar_h3ulcb/Kconfig.rcar_h3ulcb_cr7 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RCAR_H3ULCB_CR7 + bool + default y + select SOC_R8A77951 + select SOC_SERIES_RCAR_GEN3 diff --git a/boards/arm/rcar_h3ulcb/rcar_h3ulcb_cr7_defconfig b/boards/arm/rcar_h3ulcb/rcar_h3ulcb_cr7_defconfig index e4fb3c34a35df..b70c8f29e22ec 100644 --- a/boards/arm/rcar_h3ulcb/rcar_h3ulcb_cr7_defconfig +++ b/boards/arm/rcar_h3ulcb/rcar_h3ulcb_cr7_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_R8A77951=y -CONFIG_SOC_SERIES_RCAR_GEN3=y -CONFIG_BOARD_RCAR_H3ULCB_CR7=y CONFIG_CLOCK_CONTROL=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000 CONFIG_CONSOLE=y diff --git a/boards/arm/rddrone_fmuk66/Kconfig.board b/boards/arm/rddrone_fmuk66/Kconfig.board deleted file mode 100644 index b6a2829208e0d..0000000000000 --- a/boards/arm/rddrone_fmuk66/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2021, Electromaticus LLC, 2021 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_RDDRONE_FMUK66 - bool "NXP RDDRONE-FMUK66" - depends on SOC_SERIES_KINETIS_K6X - select SOC_PART_NUMBER_MK66FN2M0VLQ18 diff --git a/boards/arm/rddrone_fmuk66/Kconfig.defconfig b/boards/arm/rddrone_fmuk66/Kconfig.defconfig index 0e70ab80ea0a7..43afad4325b0d 100644 --- a/boards/arm/rddrone_fmuk66/Kconfig.defconfig +++ b/boards/arm/rddrone_fmuk66/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2021, Electromaticus LLC, 2021 NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_RDDRONE_FMUK66 - -config BOARD - default "rddrone_fmuk66" - config OSC_XTAL0_FREQ default 16000000 @@ -26,5 +21,3 @@ config NET_L2_ETHERNET default y if !MODEM endif # NETWORKING - -endif # BOARD_RDDRONE_FMUK66 diff --git a/boards/arm/rddrone_fmuk66/Kconfig.rddrone_fmuk66 b/boards/arm/rddrone_fmuk66/Kconfig.rddrone_fmuk66 new file mode 100644 index 0000000000000..47c7b91220f72 --- /dev/null +++ b/boards/arm/rddrone_fmuk66/Kconfig.rddrone_fmuk66 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RDDRONE_FMUK66 + bool + default y + select SOC_MK66F18 + select SOC_SERIES_KINETIS_K6X + select SOC_PART_NUMBER_MK66FN2M0VLQ18 diff --git a/boards/arm/rddrone_fmuk66/rddrone_fmuk66_defconfig b/boards/arm/rddrone_fmuk66/rddrone_fmuk66_defconfig index 15069fbdd35e5..d5c5f2bd29906 100644 --- a/boards/arm/rddrone_fmuk66/rddrone_fmuk66_defconfig +++ b/boards/arm/rddrone_fmuk66/rddrone_fmuk66_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_MK66F18=y -CONFIG_SOC_SERIES_KINETIS_K6X=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/reel_board/Kconfig.board b/boards/arm/reel_board/Kconfig.board deleted file mode 100644 index 552aa3f9b52b1..0000000000000 --- a/boards/arm/reel_board/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# reel board configuration - -# Copyright (c) 2018-2019 PHYTEC Messtechnik GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_REEL_BOARD - bool "reel board equipped with GDEH0213B1 display" - depends on SOC_NRF52840_QIAA - -config BOARD_REEL_BOARD_V2 - bool "reel board equipped with GDEH0213B72 display" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/reel_board/Kconfig.defconfig b/boards/arm/reel_board/Kconfig.defconfig index b9eefd5d6df96..b002ba066f621 100644 --- a/boards/arm/reel_board/Kconfig.defconfig +++ b/boards/arm/reel_board/Kconfig.defconfig @@ -3,12 +3,6 @@ # Copyright (c) 2018-2019 PHYTEC Messtechnik GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_REEL_BOARD || BOARD_REEL_BOARD_V2 - -config BOARD - default "reel_board" if BOARD_REEL_BOARD - default "reel_board_v2" if BOARD_REEL_BOARD_V2 - config I2C default y @@ -40,5 +34,3 @@ config LV_Z_VDB_SIZE default 16 endif # LVGL - -endif # BOARD_REEL_BOARD || BOARD_REEL_BOARD_V2 diff --git a/boards/arm/reel_board/Kconfig.reel_board b/boards/arm/reel_board/Kconfig.reel_board new file mode 100644 index 0000000000000..091eeebf8c6be --- /dev/null +++ b/boards/arm/reel_board/Kconfig.reel_board @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_REEL_BOARD + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/reel_board/Kconfig.reel_board_v2 b/boards/arm/reel_board/Kconfig.reel_board_v2 new file mode 100644 index 0000000000000..a52427b669712 --- /dev/null +++ b/boards/arm/reel_board/Kconfig.reel_board_v2 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_REEL_BOARD_V2 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/reel_board/reel_board_defconfig b/boards/arm/reel_board/reel_board_defconfig index 7ec7b36871bc9..4781339a59ec8 100644 --- a/boards/arm/reel_board/reel_board_defconfig +++ b/boards/arm/reel_board/reel_board_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_REEL_BOARD=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/reel_board/reel_board_v2_defconfig b/boards/arm/reel_board/reel_board_v2_defconfig index a7f80f970e804..4781339a59ec8 100644 --- a/boards/arm/reel_board/reel_board_v2_defconfig +++ b/boards/arm/reel_board/reel_board_v2_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_REEL_BOARD_V2=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/rm1xx_dvk/Kconfig.board b/boards/arm/rm1xx_dvk/Kconfig.board deleted file mode 100644 index f5c1f23b932a7..0000000000000 --- a/boards/arm/rm1xx_dvk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# rm1xx_dvk board configuration - -# Copyright (c) 2021 Laird Connectivity -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_RM1XX_DVK - bool "RM1XX_DVK" - depends on SOC_NRF51822_QFAC diff --git a/boards/arm/rm1xx_dvk/Kconfig.defconfig b/boards/arm/rm1xx_dvk/Kconfig.defconfig index 22a717477d21d..50cc969a708d5 100644 --- a/boards/arm/rm1xx_dvk/Kconfig.defconfig +++ b/boards/arm/rm1xx_dvk/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2021 Laird Connectivity # SPDX-License-Identifier: Apache-2.0 -if BOARD_RM1XX_DVK - -config BOARD - default "rm1xx_dvk" - config BT_CTLR default BT - -endif # BOARD_RM1XX_DVK diff --git a/boards/arm/rm1xx_dvk/Kconfig.rm1xx_dvk b/boards/arm/rm1xx_dvk/Kconfig.rm1xx_dvk new file mode 100644 index 0000000000000..80b0531f63788 --- /dev/null +++ b/boards/arm/rm1xx_dvk/Kconfig.rm1xx_dvk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RM1XX_DVK + bool + default y + select SOC_SERIES_NRF51X + select SOC_NRF51822_QFAC diff --git a/boards/arm/rm1xx_dvk/rm1xx_dvk_defconfig b/boards/arm/rm1xx_dvk/rm1xx_dvk_defconfig index cee5bb0b4a01f..e4da7d34197b5 100644 --- a/boards/arm/rm1xx_dvk/rm1xx_dvk_defconfig +++ b/boards/arm/rm1xx_dvk/rm1xx_dvk_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF51X=y -CONFIG_SOC_NRF51822_QFAC=y -CONFIG_BOARD_RM1XX_DVK=y # enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/ronoth_lodev/Kconfig.board b/boards/arm/ronoth_lodev/Kconfig.board deleted file mode 100644 index c0135583575c4..0000000000000 --- a/boards/arm/ronoth_lodev/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Ronoth LoDev board configuration -# Copyright (c) 2020/2021 Dean Weiten -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_RONOTH_LODEV - bool "Ronoth LoDev" - depends on SOC_STM32L073XX diff --git a/boards/arm/ronoth_lodev/Kconfig.defconfig b/boards/arm/ronoth_lodev/Kconfig.defconfig index 5e3a44a811e8a..2abe42ffd77cd 100644 --- a/boards/arm/ronoth_lodev/Kconfig.defconfig +++ b/boards/arm/ronoth_lodev/Kconfig.defconfig @@ -2,13 +2,6 @@ # Copyright (c) 2020/2021 Dean Weiten # SPDX-License-Identifier: Apache-2.0 -if BOARD_RONOTH_LODEV - -config BOARD - default "ronoth_lodev" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_RONOTH_LODEV diff --git a/boards/arm/ronoth_lodev/Kconfig.ronoth_lodev b/boards/arm/ronoth_lodev/Kconfig.ronoth_lodev new file mode 100644 index 0000000000000..4603bf8d3c94c --- /dev/null +++ b/boards/arm/ronoth_lodev/Kconfig.ronoth_lodev @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RONOTH_LODEV + bool + default y + select SOC_SERIES_STM32L0X + select SOC_STM32L073XX diff --git a/boards/arm/ronoth_lodev/ronoth_lodev_defconfig b/boards/arm/ronoth_lodev/ronoth_lodev_defconfig index 1e4ef45671f86..00deef61f70b9 100644 --- a/boards/arm/ronoth_lodev/ronoth_lodev_defconfig +++ b/boards/arm/ronoth_lodev/ronoth_lodev_defconfig @@ -3,10 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32L0X=y # Platform Configuration -CONFIG_SOC_STM32L073XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/rpi_pico/Kconfig.board b/boards/arm/rpi_pico/Kconfig.board deleted file mode 100644 index ac9d9661bbfe4..0000000000000 --- a/boards/arm/rpi_pico/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Yonatan Schachter -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_RPI_PICO - bool "Raspberry Pi Pico Board" - depends on SOC_RP2040 diff --git a/boards/arm/rpi_pico/Kconfig.defconfig b/boards/arm/rpi_pico/Kconfig.defconfig index 4a7dd9f7f98ec..948e57bf265ab 100644 --- a/boards/arm/rpi_pico/Kconfig.defconfig +++ b/boards/arm/rpi_pico/Kconfig.defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2021 Yonatan Schachter # SPDX-License-Identifier: Apache-2.0 -if BOARD_RPI_PICO - -config BOARD - default "rpi_pico" - config RP2_FLASH_W25Q080 default y @@ -14,6 +9,4 @@ if I2C_DW config I2C_DW_CLOCK_SPEED default 100 -endif #I2C_DW - -endif # BOARD_RPI_PICO +endif # I2C_DW diff --git a/boards/arm/rpi_pico/Kconfig.rpi_pico b/boards/arm/rpi_pico/Kconfig.rpi_pico new file mode 100644 index 0000000000000..120fcc473a11f --- /dev/null +++ b/boards/arm/rpi_pico/Kconfig.rpi_pico @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RPI_PICO + bool + default y + select SOC_SERIES_RP2XXX + select SOC_RP2040 diff --git a/boards/arm/rpi_pico/rpi_pico_defconfig b/boards/arm/rpi_pico/rpi_pico_defconfig index 939e92d10efed..3e7cac68ab8ef 100644 --- a/boards/arm/rpi_pico/rpi_pico_defconfig +++ b/boards/arm/rpi_pico/rpi_pico_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_SERIES_RP2XXX=y -CONFIG_SOC_RP2040=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000 CONFIG_SERIAL=y CONFIG_CONSOLE=y diff --git a/boards/arm/ruuvi_ruuvitag/Kconfig.board b/boards/arm/ruuvi_ruuvitag/Kconfig.board deleted file mode 100644 index 39a7af5dee944..0000000000000 --- a/boards/arm/ruuvi_ruuvitag/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2020 Ruuvi Innovations Ltd (Oy) -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_RUUVI_RUUVITAG - bool "Ruuvi-RuuviTag" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/ruuvi_ruuvitag/Kconfig.defconfig b/boards/arm/ruuvi_ruuvitag/Kconfig.defconfig index fb5618995ff24..a19395e3efb45 100644 --- a/boards/arm/ruuvi_ruuvitag/Kconfig.defconfig +++ b/boards/arm/ruuvi_ruuvitag/Kconfig.defconfig @@ -3,15 +3,8 @@ # Copyright (c) 2020 Ruuvi Innovations Ltd (Oy) # SPDX-License-Identifier: Apache-2.0 -if BOARD_RUUVI_RUUVITAG - -config BOARD - default "ruuvi_ruuvitag" - config SPI default y config BT_CTLR default BT - -endif # BOARD_RUUVI_RUUVITAG diff --git a/boards/arm/ruuvi_ruuvitag/Kconfig.ruuvi_ruuvitag b/boards/arm/ruuvi_ruuvitag/Kconfig.ruuvi_ruuvitag new file mode 100644 index 0000000000000..54256fdc54877 --- /dev/null +++ b/boards/arm/ruuvi_ruuvitag/Kconfig.ruuvi_ruuvitag @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RUUVI_RUUVITAG + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/ruuvi_ruuvitag/ruuvi_ruuvitag_defconfig b/boards/arm/ruuvi_ruuvitag/ruuvi_ruuvitag_defconfig index bd24778845874..26b84f308fec1 100644 --- a/boards/arm/ruuvi_ruuvitag/ruuvi_ruuvitag_defconfig +++ b/boards/arm/ruuvi_ruuvitag/ruuvi_ruuvitag_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2020 Ruuvi Innovations Ltd (Oy) # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_RUUVI_RUUVITAG=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/sam4e_xpro/Kconfig.board b/boards/arm/sam4e_xpro/Kconfig.board deleted file mode 100644 index e0e214469923f..0000000000000 --- a/boards/arm/sam4e_xpro/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Atmel SAM4E Xplained Pro Board selection - -# Copyright (c) 2019 Gerson Fernando Budke -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SAM4E_XPRO - bool "Atmel SAM4E Xplained Pro" - depends on SOC_PART_NUMBER_SAM4E16E diff --git a/boards/arm/sam4e_xpro/Kconfig.defconfig b/boards/arm/sam4e_xpro/Kconfig.defconfig deleted file mode 100644 index e11bd8b37eeea..0000000000000 --- a/boards/arm/sam4e_xpro/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Atmel SAM4E Xplained Pro Board configuration - -# Copyright (c) 2019 Gerson Fernando Budke -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_SAM4E_XPRO - -config BOARD - default "sam4e_xpro" - -endif # BOARD_SAM4E_XPRO diff --git a/boards/arm/sam4e_xpro/Kconfig.sam4e_xpro b/boards/arm/sam4e_xpro/Kconfig.sam4e_xpro new file mode 100644 index 0000000000000..a8b1f95ea370c --- /dev/null +++ b/boards/arm/sam4e_xpro/Kconfig.sam4e_xpro @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SAM4E_XPRO + bool + default y + select SOC_SERIES_SAM4E + select SOC_PART_NUMBER_SAM4E16E diff --git a/boards/arm/sam4e_xpro/sam4e_xpro_defconfig b/boards/arm/sam4e_xpro/sam4e_xpro_defconfig index 3a24aeaf5cd0a..e83b46097e752 100644 --- a/boards/arm/sam4e_xpro/sam4e_xpro_defconfig +++ b/boards/arm/sam4e_xpro/sam4e_xpro_defconfig @@ -1,12 +1,9 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAM4E=y -CONFIG_SOC_PART_NUMBER_SAM4E16E=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y -CONFIG_BOARD_SAM4E_XPRO=y CONFIG_BUILD_OUTPUT_HEX=y CONFIG_SOC_ATMEL_SAM4E_EXT_MAINCK=y CONFIG_GPIO=y diff --git a/boards/arm/sam4l_ek/Kconfig.board b/boards/arm/sam4l_ek/Kconfig.board deleted file mode 100644 index 1c0987a045f80..0000000000000 --- a/boards/arm/sam4l_ek/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Atmel SAM4L-EK selection - -# Copyright (c) 2020 Gerson Fernando Budke -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SAM4L_EK - bool "Atmel SAM4L-EK" - depends on SOC_PART_NUMBER_SAM4LC4C diff --git a/boards/arm/sam4l_ek/Kconfig.defconfig b/boards/arm/sam4l_ek/Kconfig.defconfig deleted file mode 100644 index 315afa1b31261..0000000000000 --- a/boards/arm/sam4l_ek/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Atmel SAM4L-EK Board configuration - -# Copyright (c) 2020 Gerson Fernando Budke -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_SAM4L_EK - -config BOARD - default "sam4l_ek" - -endif # BOARD_SAM4L_EK diff --git a/boards/arm/sam4l_ek/Kconfig.sam4l_ek b/boards/arm/sam4l_ek/Kconfig.sam4l_ek new file mode 100644 index 0000000000000..c237595c541e9 --- /dev/null +++ b/boards/arm/sam4l_ek/Kconfig.sam4l_ek @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SAM4L_EK + bool + default y + select SOC_SERIES_SAM4L + select SOC_PART_NUMBER_SAM4LC4C diff --git a/boards/arm/sam4l_ek/sam4l_ek_defconfig b/boards/arm/sam4l_ek/sam4l_ek_defconfig index b27d88cedfc24..f7386e995dd1a 100644 --- a/boards/arm/sam4l_ek/sam4l_ek_defconfig +++ b/boards/arm/sam4l_ek/sam4l_ek_defconfig @@ -1,12 +1,9 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAM4L=y -CONFIG_SOC_PART_NUMBER_SAM4LC4C=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y -CONFIG_BOARD_SAM4L_EK=y CONFIG_GPIO=y # Enable HW stack protection diff --git a/boards/arm/sam4s_xplained/Kconfig.board b/boards/arm/sam4s_xplained/Kconfig.board deleted file mode 100644 index 65ec186370b32..0000000000000 --- a/boards/arm/sam4s_xplained/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Atmel SAM4S Xplained Board selection - -# Copyright (c) 2017 Justin Watson -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SAM4S_XPLAINED - bool "Atmel SAM4S Xplained" - depends on SOC_PART_NUMBER_SAM4S16C diff --git a/boards/arm/sam4s_xplained/Kconfig.defconfig b/boards/arm/sam4s_xplained/Kconfig.defconfig deleted file mode 100644 index d201fa44209e6..0000000000000 --- a/boards/arm/sam4s_xplained/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Atmel SAM4S Xplained Board configuration - -# Copyright (c) 2017 Justin Watson -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_SAM4S_XPLAINED - -config BOARD - default "sam4s_xplained" - -endif # BOARD_SAM4S_XPLAINED diff --git a/boards/arm/sam4s_xplained/Kconfig.sam4s_xplained b/boards/arm/sam4s_xplained/Kconfig.sam4s_xplained new file mode 100644 index 0000000000000..f5f7f49061ec9 --- /dev/null +++ b/boards/arm/sam4s_xplained/Kconfig.sam4s_xplained @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SAM4S_XPLAINED + bool + default y + select SOC_SERIES_SAM4S + select SOC_PART_NUMBER_SAM4S16C diff --git a/boards/arm/sam4s_xplained/sam4s_xplained_defconfig b/boards/arm/sam4s_xplained/sam4s_xplained_defconfig index 20400c9b9c346..ac8d72f38ab0b 100644 --- a/boards/arm/sam4s_xplained/sam4s_xplained_defconfig +++ b/boards/arm/sam4s_xplained/sam4s_xplained_defconfig @@ -1,12 +1,9 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAM4S=y -CONFIG_SOC_PART_NUMBER_SAM4S16C=y CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y -CONFIG_BOARD_SAM4S_XPLAINED=y CONFIG_SOC_ATMEL_SAM4S_EXT_MAINCK=y CONFIG_GPIO=y CONFIG_WDT_DISABLE_AT_BOOT=y diff --git a/boards/arm/sam_e70_xplained/Kconfig.board b/boards/arm/sam_e70_xplained/Kconfig.board deleted file mode 100644 index f7ff0b7c37d6a..0000000000000 --- a/boards/arm/sam_e70_xplained/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Atmel SMART SAM E70 Xplained Board selection - -# Copyright (c) 2016 Piotr Mienkowski -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SAM_E70_XPLAINED - bool "Atmel SMART SAM E70 Xplained Board" - depends on SOC_PART_NUMBER_SAME70Q21 || SOC_PART_NUMBER_SAME70Q21B diff --git a/boards/arm/sam_e70_xplained/Kconfig.defconfig b/boards/arm/sam_e70_xplained/Kconfig.defconfig index ab33a8333f7d4..59f0676d06b57 100644 --- a/boards/arm/sam_e70_xplained/Kconfig.defconfig +++ b/boards/arm/sam_e70_xplained/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2016 Piotr Mienkowski # SPDX-License-Identifier: Apache-2.0 -if BOARD_SAM_E70_XPLAINED - -config BOARD - default "sam_e70_xplained" - if ETH_SAM_GMAC # Read MAC address from AT24MAC402 EEPROM @@ -30,5 +25,3 @@ config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_SAM_E70_XPLAINED diff --git a/boards/arm/sam_e70_xplained/Kconfig.sam_e70_xplained b/boards/arm/sam_e70_xplained/Kconfig.sam_e70_xplained new file mode 100644 index 0000000000000..450d2ceb457a3 --- /dev/null +++ b/boards/arm/sam_e70_xplained/Kconfig.sam_e70_xplained @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SAM_E70_XPLAINED + bool + default y + select SOC_SERIES_SAME70 + select SOC_PART_NUMBER_SAME70Q21 diff --git a/boards/arm/sam_e70_xplained/Kconfig.sam_e70b_xplained b/boards/arm/sam_e70_xplained/Kconfig.sam_e70b_xplained new file mode 100644 index 0000000000000..69c7463402fed --- /dev/null +++ b/boards/arm/sam_e70_xplained/Kconfig.sam_e70b_xplained @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SAM_E70B_XPLAINED + bool + default y + select SOC_SERIES_SAME70 + select SOC_PART_NUMBER_SAME70Q21B diff --git a/boards/arm/sam_e70_xplained/sam_e70_xplained_defconfig b/boards/arm/sam_e70_xplained/sam_e70_xplained_defconfig index 46f17d3f4a0f9..9f78135ab7230 100644 --- a/boards/arm/sam_e70_xplained/sam_e70_xplained_defconfig +++ b/boards/arm/sam_e70_xplained/sam_e70_xplained_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAME70=y -CONFIG_SOC_PART_NUMBER_SAME70Q21=y CONFIG_SOC_ATMEL_SAME70_EXT_MAINCK=y CONFIG_SOC_ATMEL_SAME70_PLLA_MULA=24 CONFIG_SOC_ATMEL_SAME70_PLLA_DIVA=1 @@ -11,7 +9,6 @@ CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_USART_SAM=y CONFIG_GPIO=y -CONFIG_BOARD_SAM_E70_XPLAINED=y CONFIG_WDT_DISABLE_AT_BOOT=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/arm/sam_e70_xplained/sam_e70b_xplained_defconfig b/boards/arm/sam_e70_xplained/sam_e70b_xplained_defconfig index dfaf73ef51789..fd78f9ac37d88 100644 --- a/boards/arm/sam_e70_xplained/sam_e70b_xplained_defconfig +++ b/boards/arm/sam_e70_xplained/sam_e70b_xplained_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAME70=y -CONFIG_SOC_PART_NUMBER_SAME70Q21B=y CONFIG_SOC_ATMEL_SAME70_EXT_MAINCK=y CONFIG_SOC_ATMEL_SAME70_PLLA_MULA=24 CONFIG_SOC_ATMEL_SAME70_PLLA_DIVA=1 @@ -10,6 +8,5 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_USART_SAM=y -CONFIG_BOARD_SAM_E70_XPLAINED=y CONFIG_WDT_DISABLE_AT_BOOT=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/arm/sam_v71_xult/Kconfig.board b/boards/arm/sam_v71_xult/Kconfig.board deleted file mode 100644 index 9ca0469360e4c..0000000000000 --- a/boards/arm/sam_v71_xult/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Atmel SMART SAM V71 Xplained Board selection - -# Copyright (c) 2019 Gerson Fernando Budke -# Copyright (c) 2016 Piotr Mienkowski -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SAM_V71_XULT - bool "Atmel SMART SAM V71 Xplained Ultra Board" - depends on SOC_PART_NUMBER_SAMV71Q21 || SOC_PART_NUMBER_SAMV71Q21B diff --git a/boards/arm/sam_v71_xult/Kconfig.defconfig b/boards/arm/sam_v71_xult/Kconfig.defconfig index dca80a82289f7..5c860149dc8b9 100644 --- a/boards/arm/sam_v71_xult/Kconfig.defconfig +++ b/boards/arm/sam_v71_xult/Kconfig.defconfig @@ -4,11 +4,6 @@ # Copyright (c) 2016 Piotr Mienkowski # SPDX-License-Identifier: Apache-2.0 -if BOARD_SAM_V71_XULT - -config BOARD - default "sam_v71_xult" - if ETH_SAM_GMAC # Read MAC address from AT24MAC402 EEPROM @@ -31,5 +26,3 @@ config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_SAM_V71_XULT diff --git a/boards/arm/sam_v71_xult/Kconfig.sam_v71_xult b/boards/arm/sam_v71_xult/Kconfig.sam_v71_xult new file mode 100644 index 0000000000000..8d9ab4b4e2129 --- /dev/null +++ b/boards/arm/sam_v71_xult/Kconfig.sam_v71_xult @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SAM_V71_XULT + bool + default y + select SOC_SERIES_SAMV71 + select SOC_PART_NUMBER_SAMV71Q21 diff --git a/boards/arm/sam_v71_xult/Kconfig.sam_v71b_xult b/boards/arm/sam_v71_xult/Kconfig.sam_v71b_xult new file mode 100644 index 0000000000000..26389aa3b7bd9 --- /dev/null +++ b/boards/arm/sam_v71_xult/Kconfig.sam_v71b_xult @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SAM_V71B_XULT + bool + default y + select SOC_SERIES_SAMV71 + select SOC_PART_NUMBER_SAMV71Q21B diff --git a/boards/arm/sam_v71_xult/sam_v71_xult_defconfig b/boards/arm/sam_v71_xult/sam_v71_xult_defconfig index f59bb4a15cc42..66893d0d1259c 100644 --- a/boards/arm/sam_v71_xult/sam_v71_xult_defconfig +++ b/boards/arm/sam_v71_xult/sam_v71_xult_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMV71=y -CONFIG_SOC_PART_NUMBER_SAMV71Q21=y CONFIG_SOC_ATMEL_SAMV71_EXT_MAINCK=y CONFIG_SOC_ATMEL_SAMV71_PLLA_MULA=24 CONFIG_SOC_ATMEL_SAMV71_PLLA_DIVA=1 @@ -10,7 +8,6 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_USART_SAM=y -CONFIG_BOARD_SAM_V71_XULT=y CONFIG_WDT_DISABLE_AT_BOOT=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/arm/sam_v71_xult/sam_v71b_xult_defconfig b/boards/arm/sam_v71_xult/sam_v71b_xult_defconfig index 7b6e9756520c4..0ce5857c89886 100644 --- a/boards/arm/sam_v71_xult/sam_v71b_xult_defconfig +++ b/boards/arm/sam_v71_xult/sam_v71b_xult_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMV71=y -CONFIG_SOC_PART_NUMBER_SAMV71Q21B=y CONFIG_SOC_ATMEL_SAMV71_EXT_MAINCK=y CONFIG_SOC_ATMEL_SAMV71_PLLA_MULA=24 CONFIG_SOC_ATMEL_SAMV71_PLLA_DIVA=1 @@ -10,6 +8,5 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_USART_SAM=y -CONFIG_BOARD_SAM_V71_XULT=y CONFIG_WDT_DISABLE_AT_BOOT=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/arm/scobc_module1/Kconfig.board b/boards/arm/scobc_module1/Kconfig.board deleted file mode 100644 index 4a74754fb186a..0000000000000 --- a/boards/arm/scobc_module1/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Space Cubics OBC module 1 configuration - -# Copyright (c) 2021 Space Cubics, LLC. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SCOBC_MODULE1 - bool "Space Cubics OBC Module 1" - depends on SOC_SERIES_ARM_DESIGNSTART diff --git a/boards/arm/scobc_module1/Kconfig.defconfig b/boards/arm/scobc_module1/Kconfig.defconfig index e80eb2226c83f..ed0fc9e999947 100644 --- a/boards/arm/scobc_module1/Kconfig.defconfig +++ b/boards/arm/scobc_module1/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2021 Space Cubics # SPDX-License-Identifier: Apache-2.0 -if BOARD_SCOBC_MODULE1 - -config BOARD - default "scobc_module1" - config CPU_CORTEX_M_HAS_SYSTICK default y @@ -16,5 +11,3 @@ config CPU_HAS_ARM_MPU config NUM_IRQS default 7 - -endif # BOARD_SCOBC_MODULE1 diff --git a/boards/arm/scobc_module1/Kconfig.scobc_module1 b/boards/arm/scobc_module1/Kconfig.scobc_module1 new file mode 100644 index 0000000000000..4a2e5f61437c0 --- /dev/null +++ b/boards/arm/scobc_module1/Kconfig.scobc_module1 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SCOBC_MODULE1 + bool + default y + select SOC_SERIES_ARM_DESIGNSTART + select SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3 diff --git a/boards/arm/scobc_module1/scobc_module1_defconfig b/boards/arm/scobc_module1/scobc_module1_defconfig index 8ec2b6795577b..f74c97f4d4a64 100644 --- a/boards/arm/scobc_module1/scobc_module1_defconfig +++ b/boards/arm/scobc_module1/scobc_module1_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_ARM_DESIGNSTART=y -CONFIG_SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3=y -CONFIG_BOARD_SCOBC_MODULE1=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 CONFIG_ARM_MPU=n diff --git a/boards/arm/seeeduino_xiao/Kconfig.board b/boards/arm/seeeduino_xiao/Kconfig.board deleted file mode 100644 index fb5a3d971b5ad..0000000000000 --- a/boards/arm/seeeduino_xiao/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Seeeduino XIAO board configuration - -# Copyright (c) 2020 Google LLC. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SEEEDUINO_XIAO - bool "Seeeduino XIAO" - depends on SOC_PART_NUMBER_SAMD21G18A diff --git a/boards/arm/seeeduino_xiao/Kconfig.defconfig b/boards/arm/seeeduino_xiao/Kconfig.defconfig deleted file mode 100644 index fb8f07b2e9da5..0000000000000 --- a/boards/arm/seeeduino_xiao/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# Seeedunio XIAO board configuration - -# Copyright (c) 2020 Google LLC. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "seeeduino_xiao" - depends on BOARD_SEEEDUINO_XIAO diff --git a/boards/arm/seeeduino_xiao/Kconfig.seeeduino_xiao b/boards/arm/seeeduino_xiao/Kconfig.seeeduino_xiao new file mode 100644 index 0000000000000..29d07d3ba927e --- /dev/null +++ b/boards/arm/seeeduino_xiao/Kconfig.seeeduino_xiao @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SEEEDUINO_XIAO + bool + default y + select SOC_SERIES_SAMD21 + select SOC_PART_NUMBER_SAMD21G18A diff --git a/boards/arm/seeeduino_xiao/seeeduino_xiao_defconfig b/boards/arm/seeeduino_xiao/seeeduino_xiao_defconfig index 01123f55b5af3..398c2520554c9 100644 --- a/boards/arm/seeeduino_xiao/seeeduino_xiao_defconfig +++ b/boards/arm/seeeduino_xiao/seeeduino_xiao_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMD21=y -CONFIG_SOC_PART_NUMBER_SAMD21G18A=y -CONFIG_BOARD_SEEEDUINO_XIAO=y CONFIG_SOC_ATMEL_SAMD_XOSC32K=y CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y CONFIG_CONSOLE=y diff --git a/boards/arm/segger_trb_stm32f407/Kconfig.board b/boards/arm/segger_trb_stm32f407/Kconfig.board deleted file mode 100644 index 2c1251e0bd6ad..0000000000000 --- a/boards/arm/segger_trb_stm32f407/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# SEGGER-TRB-STM32F407 board configuration - -# Copyright (c) 2020, Erwin Rol -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SEGGER_TRB_STM32F407 - bool "SEGGER STM32F407 Trace Reference Board" - depends on SOC_STM32F407XE diff --git a/boards/arm/segger_trb_stm32f407/Kconfig.defconfig b/boards/arm/segger_trb_stm32f407/Kconfig.defconfig deleted file mode 100644 index a519fbf853f40..0000000000000 --- a/boards/arm/segger_trb_stm32f407/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# SEGGER-TRB-STM32F407 board configuration - -# Copyright (c) 2020, Erwin Rol -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_SEGGER_TRB_STM32F407 - -config BOARD - default "segger_trb_stm32f407" - -endif # BOARD_SEGGER_TRB_STM32F407 diff --git a/boards/arm/segger_trb_stm32f407/Kconfig.segger_trb_stm32f407 b/boards/arm/segger_trb_stm32f407/Kconfig.segger_trb_stm32f407 new file mode 100644 index 0000000000000..946732aa3fa7b --- /dev/null +++ b/boards/arm/segger_trb_stm32f407/Kconfig.segger_trb_stm32f407 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SEGGER_TRB_STM32F407 + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F407XE diff --git a/boards/arm/segger_trb_stm32f407/segger_trb_stm32f407_defconfig b/boards/arm/segger_trb_stm32f407/segger_trb_stm32f407_defconfig index 0ae4151a7d217..02bf4734248fb 100644 --- a/boards/arm/segger_trb_stm32f407/segger_trb_stm32f407_defconfig +++ b/boards/arm/segger_trb_stm32f407/segger_trb_stm32f407_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F407XE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/sensortile_box/Kconfig.board b/boards/arm/sensortile_box/Kconfig.board deleted file mode 100644 index 5341a09871afd..0000000000000 --- a/boards/arm/sensortile_box/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# SensorTile.box board configuration - -# Copyright (c) 2019 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SENSORTILE_BOX - bool "SensorTile.box Development Board" - depends on SOC_STM32L4R9XX diff --git a/boards/arm/sensortile_box/Kconfig.defconfig b/boards/arm/sensortile_box/Kconfig.defconfig index 4287849bf315e..18d141c1b32b2 100644 --- a/boards/arm/sensortile_box/Kconfig.defconfig +++ b/boards/arm/sensortile_box/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2019 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 -if BOARD_SENSORTILE_BOX - -config BOARD - default "sensortile_box" - if SPI config SPI_STM32_INTERRUPT default y endif # SPI - -endif # BOARD_SENSORTILE_BOX diff --git a/boards/arm/sensortile_box/Kconfig.sensortile_box b/boards/arm/sensortile_box/Kconfig.sensortile_box new file mode 100644 index 0000000000000..a0716c264147c --- /dev/null +++ b/boards/arm/sensortile_box/Kconfig.sensortile_box @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SENSORTILE_BOX + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L4R9XX diff --git a/boards/arm/sensortile_box/sensortile_box_defconfig b/boards/arm/sensortile_box/sensortile_box_defconfig index 2970c68d6c9e7..85e8b269821be 100644 --- a/boards/arm/sensortile_box/sensortile_box_defconfig +++ b/boards/arm/sensortile_box/sensortile_box_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L4R9XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/serpente/Kconfig.board b/boards/arm/serpente/Kconfig.board deleted file mode 100644 index 5c2cb6dc83ef0..0000000000000 --- a/boards/arm/serpente/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Serpente board configuration -# Copyright (c) 2020 Alexander Falb -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SERPENTE - bool "Serpente" - depends on SOC_PART_NUMBER_SAMD21E18A diff --git a/boards/arm/serpente/Kconfig.defconfig b/boards/arm/serpente/Kconfig.defconfig deleted file mode 100644 index 911f7021ff7cc..0000000000000 --- a/boards/arm/serpente/Kconfig.defconfig +++ /dev/null @@ -1,7 +0,0 @@ -# Serpente board configuration -# Copyright (c) 2020 Alexander Falb -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "serpente" - depends on BOARD_SERPENTE diff --git a/boards/arm/serpente/Kconfig.serpente b/boards/arm/serpente/Kconfig.serpente new file mode 100644 index 0000000000000..9583efcd4de24 --- /dev/null +++ b/boards/arm/serpente/Kconfig.serpente @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SERPENTE + bool + default y + select SOC_SERIES_SAMD21 + select SOC_PART_NUMBER_SAMD21E18A diff --git a/boards/arm/serpente/serpente_defconfig b/boards/arm/serpente/serpente_defconfig index a2c3ac7def250..3eb4a2ab5e79a 100644 --- a/boards/arm/serpente/serpente_defconfig +++ b/boards/arm/serpente/serpente_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAMD21=y -CONFIG_SOC_PART_NUMBER_SAMD21E18A=y -CONFIG_BOARD_SERPENTE=y CONFIG_CONSOLE=y CONFIG_GPIO=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.board b/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.board deleted file mode 100644 index 923c1cd36f377..0000000000000 --- a/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.board +++ /dev/null @@ -1,15 +0,0 @@ -# Sparkfun nRF9160 Thing Plus configuration - -# Copyright (c) 2018-2020 Nordic Semiconductor ASA -# Copyright (c) 2020 Circuit Dojo LLC -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF9160_SICA - -config BOARD_SPARKFUN_THING_PLUS_NRF9160 - bool "Sparkfun nRF9160 Thing Plus" - -config BOARD_SPARKFUN_THING_PLUS_NRF9160_NS - bool "Sparkfun nRF9160 Thing Plus non-secure" - -endif # SOC_NRF9160_SICA diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.defconfig b/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.defconfig index 8ae5b832d8951..387d755179457 100644 --- a/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.defconfig +++ b/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.defconfig @@ -4,11 +4,6 @@ # Copyright (c) 2020 Circuit Dojo LLC # SPDX-License-Identifier: Apache-2.0 -if BOARD_SPARKFUN_THING_PLUS_NRF9160 || BOARD_SPARKFUN_THING_PLUS_NRF9160_NS - -config BOARD - default "sparkfun_thing_plus_nrf9160" - # For the secure version of the board the firmware is linked at the beginning # of the flash, or into the code-partition defined in DT if it is intended to # be loaded by MCUboot. If the secure firmware is to be combined with a non- @@ -35,5 +30,3 @@ config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) endif # BOARD_SPARKFUN_THING_PLUS_NRF9160_NS - -endif # BOARD_SPARKFUN_THING_PLUS_NRF9160 || BOARD_SPARKFUN_THING_PLUS_NRF9160_NS diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.sparkfun_thing_plus_nrf9160 b/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.sparkfun_thing_plus_nrf9160 new file mode 100644 index 0000000000000..2e473ddc4236c --- /dev/null +++ b/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.sparkfun_thing_plus_nrf9160 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SPARKFUN_THING_PLUS_NRF9160 + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.sparkfun_thing_plus_nrf9160_ns b/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.sparkfun_thing_plus_nrf9160_ns new file mode 100644 index 0000000000000..e9a36dc2c1714 --- /dev/null +++ b/boards/arm/sparkfun_thing_plus_nrf9160/Kconfig.sparkfun_thing_plus_nrf9160_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SPARKFUN_THING_PLUS_NRF9160_NS + bool + default y + select SOC_SERIES_NRF91X + select SOC_NRF9160_SICA diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_defconfig b/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_defconfig index b3bfc6a11ee07..da1512cd09284 100644 --- a/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_defconfig +++ b/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_SPARKFUN_THING_PLUS_NRF9160=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_ns_defconfig b/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_ns_defconfig index 4384ea780d3c5..afe7e49ec274d 100644 --- a/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_ns_defconfig +++ b/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_ns_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9160_SICA=y -CONFIG_BOARD_SPARKFUN_THING_PLUS_NRF9160_NS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/steval_fcu001v1/Kconfig.board b/boards/arm/steval_fcu001v1/Kconfig.board deleted file mode 100644 index dc0b41e59e401..0000000000000 --- a/boards/arm/steval_fcu001v1/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Flight Controller Unit board configuration - -# Copyright (c) 2019 Linumiz -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STEVAL_FCU001V1 - bool "STM32 Flight Controller Unit" - depends on SOC_STM32F401XC diff --git a/boards/arm/steval_fcu001v1/Kconfig.defconfig b/boards/arm/steval_fcu001v1/Kconfig.defconfig deleted file mode 100644 index 6c4e715a67683..0000000000000 --- a/boards/arm/steval_fcu001v1/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32 Flight Controller Unit board configuration - -# Copyright (c) 2019 Linumiz -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STEVAL_FCU001V1 - -config BOARD - default "steval_fcu001v1" - -endif # BOARD_STEVAL_FCU001V1 diff --git a/boards/arm/steval_fcu001v1/Kconfig.steval_fcu001v1 b/boards/arm/steval_fcu001v1/Kconfig.steval_fcu001v1 new file mode 100644 index 0000000000000..1b65ee5efec73 --- /dev/null +++ b/boards/arm/steval_fcu001v1/Kconfig.steval_fcu001v1 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STEVAL_FCU001V1 + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F401XC diff --git a/boards/arm/steval_fcu001v1/steval_fcu001v1_defconfig b/boards/arm/steval_fcu001v1/steval_fcu001v1_defconfig index 53be30e3c52d0..27a33ed45c86f 100644 --- a/boards/arm/steval_fcu001v1/steval_fcu001v1_defconfig +++ b/boards/arm/steval_fcu001v1/steval_fcu001v1_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F401XC=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm3210c_eval/Kconfig.board b/boards/arm/stm3210c_eval/Kconfig.board deleted file mode 100644 index 8e55fc27f860e..0000000000000 --- a/boards/arm/stm3210c_eval/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM3210C-EVAL board configuration - -# Copyright (c) 2016 RnDity Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM3210C_EVAL - bool "STM3210C-EVAL Evaluation Board" - depends on SOC_STM32F107XC diff --git a/boards/arm/stm3210c_eval/Kconfig.defconfig b/boards/arm/stm3210c_eval/Kconfig.defconfig deleted file mode 100644 index 2f60b5842744b..0000000000000 --- a/boards/arm/stm3210c_eval/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM3210C-EVAL board configuration - -# Copyright (c) 2016 RnDity Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM3210C_EVAL - -config BOARD - default "stm3210c_eval" - -endif # BOARD_STM3210C_EVAL diff --git a/boards/arm/stm3210c_eval/Kconfig.stm3210c_eval b/boards/arm/stm3210c_eval/Kconfig.stm3210c_eval new file mode 100644 index 0000000000000..763cbb9a88ccd --- /dev/null +++ b/boards/arm/stm3210c_eval/Kconfig.stm3210c_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM3210C_EVAL + bool + default y + select SOC_SERIES_STM32F1X + select SOC_STM32F107XC diff --git a/boards/arm/stm3210c_eval/stm3210c_eval_defconfig b/boards/arm/stm3210c_eval/stm3210c_eval_defconfig index c282e80fd587c..9633986ea6d99 100644 --- a/boards/arm/stm3210c_eval/stm3210c_eval_defconfig +++ b/boards/arm/stm3210c_eval/stm3210c_eval_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F1X=y # Platform Configuration -CONFIG_SOC_STM32F107XC=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/stm32373c_eval/Kconfig.board b/boards/arm/stm32373c_eval/Kconfig.board deleted file mode 100644 index 5348461a9d387..0000000000000 --- a/boards/arm/stm32373c_eval/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32373C-EVAL evaluation board configuration - -# Copyright (c) 2016 Open-RnD Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32373C_EVAL - bool "STM32373C_EVAL Evaluation Board" - depends on SOC_STM32F373XC diff --git a/boards/arm/stm32373c_eval/Kconfig.defconfig b/boards/arm/stm32373c_eval/Kconfig.defconfig deleted file mode 100644 index aa615e68bdb78..0000000000000 --- a/boards/arm/stm32373c_eval/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32373C-EVAL evaluation board configuration - -# Copyright (c) 2016 Open-RnD Sp. z o.o. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32373C_EVAL - -config BOARD - default "stm32373c_eval" - -endif # BOARD_STM32373C_EVAL diff --git a/boards/arm/stm32373c_eval/Kconfig.stm32373c_eval b/boards/arm/stm32373c_eval/Kconfig.stm32373c_eval new file mode 100644 index 0000000000000..3e85f1c6d4007 --- /dev/null +++ b/boards/arm/stm32373c_eval/Kconfig.stm32373c_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32373C_EVAL + bool + default y + select SOC_SERIES_STM32F3X + select SOC_STM32F373XC diff --git a/boards/arm/stm32373c_eval/stm32373c_eval_defconfig b/boards/arm/stm32373c_eval/stm32373c_eval_defconfig index 0ec3b1c5fcad9..d11d0fc8c99b3 100644 --- a/boards/arm/stm32373c_eval/stm32373c_eval_defconfig +++ b/boards/arm/stm32373c_eval/stm32373c_eval_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F3X=y # Platform Configuration -CONFIG_SOC_STM32F373XC=y # Floating Point Options CONFIG_FPU=y diff --git a/boards/arm/stm32_min_dev/Kconfig.board b/boards/arm/stm32_min_dev/Kconfig.board deleted file mode 100644 index 3b648714ddbd3..0000000000000 --- a/boards/arm/stm32_min_dev/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# STM32 Minimum Development Board Configuration - -# Copyright (c) 2017, embedjournal.com -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32_MIN_DEV_BLUE - bool "STM32 Minimum Development Board (Blue)" - depends on SOC_STM32F103X8 - -config BOARD_STM32_MIN_DEV_BLACK - bool "STM32 Minimum Development Board (Black)" - depends on SOC_STM32F103X8 diff --git a/boards/arm/stm32_min_dev/Kconfig.defconfig b/boards/arm/stm32_min_dev/Kconfig.defconfig deleted file mode 100644 index 6e38ec4db1233..0000000000000 --- a/boards/arm/stm32_min_dev/Kconfig.defconfig +++ /dev/null @@ -1,12 +0,0 @@ -# STM32 Minimum Development Board Configuration - -# Copyright (c) 2017, embedjournal.com -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32_MIN_DEV_BLUE || BOARD_STM32_MIN_DEV_BLACK - -config BOARD - default "stm32_min_dev_blue" if BOARD_STM32_MIN_DEV_BLUE - default "stm32_min_dev_black" if BOARD_STM32_MIN_DEV_BLACK - -endif # BOARD_STM32_MIN_DEV_BLUE || BOARD_STM32_MIN_DEV_BLACK diff --git a/boards/arm/stm32_min_dev/Kconfig.stm32_min_dev_black b/boards/arm/stm32_min_dev/Kconfig.stm32_min_dev_black new file mode 100644 index 0000000000000..f587e44bc51a5 --- /dev/null +++ b/boards/arm/stm32_min_dev/Kconfig.stm32_min_dev_black @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32_MIN_DEV_BLACK + bool + default y + select SOC_SERIES_STM32F1X + select SOC_STM32F103X8 diff --git a/boards/arm/stm32_min_dev/Kconfig.stm32_min_dev_blue b/boards/arm/stm32_min_dev/Kconfig.stm32_min_dev_blue new file mode 100644 index 0000000000000..434164991c92d --- /dev/null +++ b/boards/arm/stm32_min_dev/Kconfig.stm32_min_dev_blue @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32_MIN_DEV_BLUE + bool + default y + select SOC_SERIES_STM32F1X + select SOC_STM32F103X8 diff --git a/boards/arm/stm32_min_dev/stm32_min_dev_black_defconfig b/boards/arm/stm32_min_dev/stm32_min_dev_black_defconfig index 53876bb7d4b4b..86575ac412c90 100644 --- a/boards/arm/stm32_min_dev/stm32_min_dev_black_defconfig +++ b/boards/arm/stm32_min_dev/stm32_min_dev_black_defconfig @@ -5,8 +5,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F103X8=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/stm32_min_dev/stm32_min_dev_blue_defconfig b/boards/arm/stm32_min_dev/stm32_min_dev_blue_defconfig index efc78388025d8..b8bad7087b7ba 100644 --- a/boards/arm/stm32_min_dev/stm32_min_dev_blue_defconfig +++ b/boards/arm/stm32_min_dev/stm32_min_dev_blue_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F103X8=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/stm32f030_demo/Kconfig.board b/boards/arm/stm32f030_demo/Kconfig.board deleted file mode 100644 index 3a34ac759627f..0000000000000 --- a/boards/arm/stm32f030_demo/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2019 Antony Pavlov -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F030_DEMO - bool "STM32F030 DEMO Board" - depends on SOC_STM32F030X4 diff --git a/boards/arm/stm32f030_demo/Kconfig.defconfig b/boards/arm/stm32f030_demo/Kconfig.defconfig deleted file mode 100644 index 86e0233adad62..0000000000000 --- a/boards/arm/stm32f030_demo/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2019 Antony Pavlov -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32F030_DEMO - -config BOARD - default "stm32f030_demo" - -endif # BOARD_STM32F030_DEMO diff --git a/boards/arm/stm32f030_demo/Kconfig.stm32f030_demo b/boards/arm/stm32f030_demo/Kconfig.stm32f030_demo new file mode 100644 index 0000000000000..79550b2f6137f --- /dev/null +++ b/boards/arm/stm32f030_demo/Kconfig.stm32f030_demo @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F030_DEMO + bool + default y + select SOC_SERIES_STM32F0X + select SOC_STM32F030X4 diff --git a/boards/arm/stm32f030_demo/stm32f030_demo_defconfig b/boards/arm/stm32f030_demo/stm32f030_demo_defconfig index 1e436d1e3ea38..d361485db681e 100644 --- a/boards/arm/stm32f030_demo/stm32f030_demo_defconfig +++ b/boards/arm/stm32f030_demo/stm32f030_demo_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration -CONFIG_SOC_STM32F030X4=y # Kernel Options due to Low Memory (4k) CONFIG_MAIN_STACK_SIZE=640 diff --git a/boards/arm/stm32f072_eval/Kconfig.board b/boards/arm/stm32f072_eval/Kconfig.board deleted file mode 100644 index 9db08b5f96ad2..0000000000000 --- a/boards/arm/stm32f072_eval/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F072-EVAL board configuration - -# Copyright (c) 2017 BayLibre, SAS -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F072_EVAL - bool "STM32F072-EVAL Development Board" - depends on SOC_STM32F072XB diff --git a/boards/arm/stm32f072_eval/Kconfig.defconfig b/boards/arm/stm32f072_eval/Kconfig.defconfig deleted file mode 100644 index fa23a88cf1a64..0000000000000 --- a/boards/arm/stm32f072_eval/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32F072-EVAL board configuration - -# Copyright (c) 2017 BayLibre, SAS -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32F072_EVAL - -config BOARD - default "stm32f072_eval" - -endif # BOARD_STM32F072_EVAL diff --git a/boards/arm/stm32f072_eval/Kconfig.stm32f072_eval b/boards/arm/stm32f072_eval/Kconfig.stm32f072_eval new file mode 100644 index 0000000000000..abf38512d4398 --- /dev/null +++ b/boards/arm/stm32f072_eval/Kconfig.stm32f072_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F072_EVAL + bool + default y + select SOC_SERIES_STM32F0X + select SOC_STM32F072XB diff --git a/boards/arm/stm32f072_eval/stm32f072_eval_defconfig b/boards/arm/stm32f072_eval/stm32f072_eval_defconfig index b5a9b9a376877..4a8ad49c50812 100644 --- a/boards/arm/stm32f072_eval/stm32f072_eval_defconfig +++ b/boards/arm/stm32f072_eval/stm32f072_eval_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration -CONFIG_SOC_STM32F072XB=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/stm32f072b_disco/Kconfig.board b/boards/arm/stm32f072b_disco/Kconfig.board deleted file mode 100644 index 26be5a346e89a..0000000000000 --- a/boards/arm/stm32f072b_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F072B-DISCO board configuration - -# Copyright (c) 2017 Clage GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F072B_DISCO - bool "STM32F072B-DISCO Development Board" - depends on SOC_STM32F072XB diff --git a/boards/arm/stm32f072b_disco/Kconfig.defconfig b/boards/arm/stm32f072b_disco/Kconfig.defconfig index 75472bbad3d30..e59c0a78ff22d 100644 --- a/boards/arm/stm32f072b_disco/Kconfig.defconfig +++ b/boards/arm/stm32f072b_disco/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2017 Clage GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32F072B_DISCO - -config BOARD - default "stm32f072b_disco" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_STM32F072B_DISCO diff --git a/boards/arm/stm32f072b_disco/Kconfig.stm32f072b_disco b/boards/arm/stm32f072b_disco/Kconfig.stm32f072b_disco new file mode 100644 index 0000000000000..bf016e048dd6b --- /dev/null +++ b/boards/arm/stm32f072b_disco/Kconfig.stm32f072b_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F072B_DISCO + bool + default y + select SOC_SERIES_STM32F0X + select SOC_STM32F072XB diff --git a/boards/arm/stm32f072b_disco/stm32f072b_disco_defconfig b/boards/arm/stm32f072b_disco/stm32f072b_disco_defconfig index b5a9b9a376877..4a8ad49c50812 100644 --- a/boards/arm/stm32f072b_disco/stm32f072b_disco_defconfig +++ b/boards/arm/stm32f072b_disco/stm32f072b_disco_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration -CONFIG_SOC_STM32F072XB=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/stm32f0_disco/Kconfig.board b/boards/arm/stm32f0_disco/Kconfig.board deleted file mode 100644 index 82e26ac2b2dee..0000000000000 --- a/boards/arm/stm32f0_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F0DISCOVERY development board with STM32F051R8 MCU configuration - -# Copyright (c) 2018 Nathan Tsoi -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F0_DISCO - bool "STM32F0DISCOVERY Development Board" - depends on SOC_STM32F051X8 diff --git a/boards/arm/stm32f0_disco/Kconfig.defconfig b/boards/arm/stm32f0_disco/Kconfig.defconfig deleted file mode 100644 index 638b423952263..0000000000000 --- a/boards/arm/stm32f0_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32F0 development board with STM32F051R8T6 MCU - -# Copyright (c) 2018 Nathan Tsoi -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32F0_DISCO - -config BOARD - default "stm32f0_disco" - -endif # BOARD_STM32F0_DISCO diff --git a/boards/arm/stm32f0_disco/Kconfig.stm32f0_disco b/boards/arm/stm32f0_disco/Kconfig.stm32f0_disco new file mode 100644 index 0000000000000..58dfbd63b97b0 --- /dev/null +++ b/boards/arm/stm32f0_disco/Kconfig.stm32f0_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F0_DISCO + bool + default y + select SOC_SERIES_STM32F0X + select SOC_STM32F051X8 diff --git a/boards/arm/stm32f0_disco/stm32f0_disco_defconfig b/boards/arm/stm32f0_disco/stm32f0_disco_defconfig index f1fd239fa3b29..566868cd754f6 100644 --- a/boards/arm/stm32f0_disco/stm32f0_disco_defconfig +++ b/boards/arm/stm32f0_disco/stm32f0_disco_defconfig @@ -1,10 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration -CONFIG_SOC_STM32F051X8=y # Kernel Options due to Low Memory (8k) CONFIG_MAIN_STACK_SIZE=640 diff --git a/boards/arm/stm32f103_mini/Kconfig.board b/boards/arm/stm32f103_mini/Kconfig.board deleted file mode 100644 index c719f989076c5..0000000000000 --- a/boards/arm/stm32f103_mini/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F103RCT6 Mini board configuration - -# Copyright (c) 2020 WuhanStudio -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F103_MINI - bool "STM32F103RCT6 Mini Board" - depends on SOC_STM32F103XE diff --git a/boards/arm/stm32f103_mini/Kconfig.defconfig b/boards/arm/stm32f103_mini/Kconfig.defconfig deleted file mode 100644 index 294d123ccb170..0000000000000 --- a/boards/arm/stm32f103_mini/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32F103RCT6 Mini board configuration - -# Copyright (c) 2020 WuhanStudio -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32F103_MINI - -config BOARD - default "stm32f103_mini" - -endif # BOARD_STM32F103_mini diff --git a/boards/arm/stm32f103_mini/Kconfig.stm32f103_mini b/boards/arm/stm32f103_mini/Kconfig.stm32f103_mini new file mode 100644 index 0000000000000..6c2be9dcca7aa --- /dev/null +++ b/boards/arm/stm32f103_mini/Kconfig.stm32f103_mini @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F103_MINI + bool + default y + select SOC_SERIES_STM32F1X + select SOC_STM32F103XE diff --git a/boards/arm/stm32f103_mini/stm32f103_mini_defconfig b/boards/arm/stm32f103_mini/stm32f103_mini_defconfig index 765fc062bd7db..b5ca2afbd5f90 100644 --- a/boards/arm/stm32f103_mini/stm32f103_mini_defconfig +++ b/boards/arm/stm32f103_mini/stm32f103_mini_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F103XE=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/stm32f3_disco/Kconfig.board b/boards/arm/stm32f3_disco/Kconfig.board deleted file mode 100644 index 280b48f7cb575..0000000000000 --- a/boards/arm/stm32f3_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F3DISCOVERY board configuration - -# Copyright (c) 2017 I-SENSE group of ICCS -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F3_DISCO - bool "STM32F3DISCOVERY Development Board" - depends on SOC_STM32F303XC diff --git a/boards/arm/stm32f3_disco/Kconfig.defconfig b/boards/arm/stm32f3_disco/Kconfig.defconfig deleted file mode 100644 index f2def3315709a..0000000000000 --- a/boards/arm/stm32f3_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32F3DISCOVERY board configuration - -# Copyright (c) 2017 I-SENSE group of ICCS -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32F3_DISCO - -config BOARD - default "stm32f3_disco" - -endif # BOARD_STM32F3_DISCO diff --git a/boards/arm/stm32f3_disco/Kconfig.stm32f3_disco b/boards/arm/stm32f3_disco/Kconfig.stm32f3_disco new file mode 100644 index 0000000000000..8984c1b949d80 --- /dev/null +++ b/boards/arm/stm32f3_disco/Kconfig.stm32f3_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F3_DISCO + bool + default y + select SOC_SERIES_STM32F3X + select SOC_STM32F303XC diff --git a/boards/arm/stm32f3_disco/stm32f3_disco_defconfig b/boards/arm/stm32f3_disco/stm32f3_disco_defconfig index f5b6d9c5ec68d..b31f30e07ead3 100644 --- a/boards/arm/stm32f3_disco/stm32f3_disco_defconfig +++ b/boards/arm/stm32f3_disco/stm32f3_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F3X=y -CONFIG_SOC_STM32F303XC=y # Floating Point Options CONFIG_FPU=y diff --git a/boards/arm/stm32f401_mini/Kconfig.board b/boards/arm/stm32f401_mini/Kconfig.board deleted file mode 100644 index f2dc8bdfa612d..0000000000000 --- a/boards/arm/stm32f401_mini/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2022 Brian Bradley -# SPDX-License-Identifier: Apache-2.0 - -# STM32 Mini F401 Board - -config BOARD_STM32F401_MINI - bool "STM32 Mini F401 Board" - depends on SOC_STM32F401XC diff --git a/boards/arm/stm32f401_mini/Kconfig.defconfig b/boards/arm/stm32f401_mini/Kconfig.defconfig index 7279666dbcc74..f2eb5f819b13e 100644 --- a/boards/arm/stm32f401_mini/Kconfig.defconfig +++ b/boards/arm/stm32f401_mini/Kconfig.defconfig @@ -3,13 +3,6 @@ # STM32 Mini F401 board definitions -if BOARD_STM32F401_MINI - -config BOARD - default "stm32f401_mini" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_STM32F401_MINI diff --git a/boards/arm/stm32f401_mini/Kconfig.stm32f401_mini b/boards/arm/stm32f401_mini/Kconfig.stm32f401_mini new file mode 100644 index 0000000000000..945799fdb4871 --- /dev/null +++ b/boards/arm/stm32f401_mini/Kconfig.stm32f401_mini @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F401_MINI + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F401XC diff --git a/boards/arm/stm32f401_mini/stm32f401_mini_defconfig b/boards/arm/stm32f401_mini/stm32f401_mini_defconfig index cd8cbcfcad1e3..a6ae5e04b4313 100644 --- a/boards/arm/stm32f401_mini/stm32f401_mini_defconfig +++ b/boards/arm/stm32f401_mini/stm32f401_mini_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F401XC=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32f411e_disco/Kconfig.board b/boards/arm/stm32f411e_disco/Kconfig.board deleted file mode 100644 index 20906de1171ef..0000000000000 --- a/boards/arm/stm32f411e_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F411E-DISCO board configuration - -# Copyright (c) 2017 Fenix Engineering Solutions -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F411E_DISCO - bool "STM32F411E-DISCO Development Board" - depends on SOC_STM32F411XE diff --git a/boards/arm/stm32f411e_disco/Kconfig.defconfig b/boards/arm/stm32f411e_disco/Kconfig.defconfig deleted file mode 100644 index 28169b926e305..0000000000000 --- a/boards/arm/stm32f411e_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32F411E-DISCO board configuration - -# Copyright (c) 2017 Fenix Engineering Solutions -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32F411E_DISCO - -config BOARD - default "stm32f411e_disco" - -endif # BOARD_STM32F411E_DISCO diff --git a/boards/arm/stm32f411e_disco/Kconfig.stm32f411e_disco b/boards/arm/stm32f411e_disco/Kconfig.stm32f411e_disco new file mode 100644 index 0000000000000..1da8ca8b39929 --- /dev/null +++ b/boards/arm/stm32f411e_disco/Kconfig.stm32f411e_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F411E_DISCO + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F411XE diff --git a/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig b/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig index 30784f3514d63..303cf0de4ab09 100644 --- a/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig +++ b/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F411XE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32f412g_disco/Kconfig.board b/boards/arm/stm32f412g_disco/Kconfig.board deleted file mode 100644 index 1e0ba7aaae27d..0000000000000 --- a/boards/arm/stm32f412g_disco/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# STM32F412G-DISCO board configuration - -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F412G_DISCO - bool "STM32F412G-DISCO Development Board" - depends on SOC_STM32F412ZX diff --git a/boards/arm/stm32f412g_disco/Kconfig.defconfig b/boards/arm/stm32f412g_disco/Kconfig.defconfig deleted file mode 100644 index d91c45fd1e841..0000000000000 --- a/boards/arm/stm32f412g_disco/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# STM32F412G-DISCO board configuration - -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32F412G_DISCO - -config BOARD - default "stm32f412g_disco" - -endif # BOARD_STM32F412G_DISCO diff --git a/boards/arm/stm32f412g_disco/Kconfig.stm32f412g_disco b/boards/arm/stm32f412g_disco/Kconfig.stm32f412g_disco new file mode 100644 index 0000000000000..10f0c20e4e88e --- /dev/null +++ b/boards/arm/stm32f412g_disco/Kconfig.stm32f412g_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F412G_DISCO + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F412ZX diff --git a/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig b/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig index 1992a4de58c96..bdcaad7d3f443 100644 --- a/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig +++ b/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F412ZX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32f429i_disc1/Kconfig.board b/boards/arm/stm32f429i_disc1/Kconfig.board deleted file mode 100644 index 07ecfb82b6903..0000000000000 --- a/boards/arm/stm32f429i_disc1/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F4DISCOVERY board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F429I_DISC1 - bool "STM32F429I-DISC1 Development Board" - depends on SOC_STM32F429XX diff --git a/boards/arm/stm32f429i_disc1/Kconfig.defconfig b/boards/arm/stm32f429i_disc1/Kconfig.defconfig index 37fefc2292a17..392efe2ee8a02 100644 --- a/boards/arm/stm32f429i_disc1/Kconfig.defconfig +++ b/boards/arm/stm32f429i_disc1/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2016 Linaro Limited. # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32F429I_DISC1 - -config BOARD - default "stm32f429i_disc1" - config MEMC default y if DISPLAY - -endif # BOARD_STM32F429I_DISC1 diff --git a/boards/arm/stm32f429i_disc1/Kconfig.stm32f429i_disc1 b/boards/arm/stm32f429i_disc1/Kconfig.stm32f429i_disc1 new file mode 100644 index 0000000000000..7a5427afa849d --- /dev/null +++ b/boards/arm/stm32f429i_disc1/Kconfig.stm32f429i_disc1 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F429I_DISC1 + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F429XX diff --git a/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig b/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig index 0e2f562dc0377..bc6020b2f192f 100644 --- a/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig +++ b/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F429XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32f469i_disco/Kconfig.board b/boards/arm/stm32f469i_disco/Kconfig.board deleted file mode 100644 index 5dc1cf8044938..0000000000000 --- a/boards/arm/stm32f469i_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F469I-DISCO board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F469I_DISCO - bool "STM32F469I-DISCO Development Board" - depends on SOC_STM32F469XX diff --git a/boards/arm/stm32f469i_disco/Kconfig.defconfig b/boards/arm/stm32f469i_disco/Kconfig.defconfig index 0afb292c33363..95a727a20e342 100644 --- a/boards/arm/stm32f469i_disco/Kconfig.defconfig +++ b/boards/arm/stm32f469i_disco/Kconfig.defconfig @@ -3,14 +3,6 @@ # Copyright (c) 2016 Linaro Limited. # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32F469I_DISCO - -config BOARD - default "stm32f469i_disco" - config SPI_STM32_INTERRUPT default y depends on SPI - - -endif # BOARD_STM32F469I_DISCO diff --git a/boards/arm/stm32f469i_disco/Kconfig.stm32f469i_disco b/boards/arm/stm32f469i_disco/Kconfig.stm32f469i_disco new file mode 100644 index 0000000000000..a2b670d52cf0d --- /dev/null +++ b/boards/arm/stm32f469i_disco/Kconfig.stm32f469i_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F469I_DISCO + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F469XX diff --git a/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig b/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig index 94a8f52809e7e..bc6020b2f192f 100644 --- a/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig +++ b/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F469XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32f4_disco/Kconfig.board b/boards/arm/stm32f4_disco/Kconfig.board deleted file mode 100644 index e378800776621..0000000000000 --- a/boards/arm/stm32f4_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F4DISCOVERY board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F4_DISCO - bool "STM32F4DISCOVERY Development Board" - depends on SOC_STM32F407XG diff --git a/boards/arm/stm32f4_disco/Kconfig.defconfig b/boards/arm/stm32f4_disco/Kconfig.defconfig deleted file mode 100644 index 5d8c5341bbb79..0000000000000 --- a/boards/arm/stm32f4_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32F4DISCOVERY board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32F4_DISCO - -config BOARD - default "stm32f4_disco" - -endif # BOARD_STM32F4_DISCO diff --git a/boards/arm/stm32f4_disco/Kconfig.stm32f4_disco b/boards/arm/stm32f4_disco/Kconfig.stm32f4_disco new file mode 100644 index 0000000000000..b3b8a8a8013e5 --- /dev/null +++ b/boards/arm/stm32f4_disco/Kconfig.stm32f4_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F4_DISCO + bool + default y + select SOC_SERIES_STM32F4X + select SOC_STM32F407XG diff --git a/boards/arm/stm32f4_disco/stm32f4_disco_defconfig b/boards/arm/stm32f4_disco/stm32f4_disco_defconfig index ad325266c72c9..bc6020b2f192f 100644 --- a/boards/arm/stm32f4_disco/stm32f4_disco_defconfig +++ b/boards/arm/stm32f4_disco/stm32f4_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F407XG=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32f723e_disco/Kconfig.board b/boards/arm/stm32f723e_disco/Kconfig.board deleted file mode 100644 index 87101062904af..0000000000000 --- a/boards/arm/stm32f723e_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F723E Discovery board configuration - -# Copyright (c) 2018 Aurelien Jarno -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F723E_DISCO - bool "STM32F723E Discovery Development Board" - depends on SOC_STM32F723XX diff --git a/boards/arm/stm32f723e_disco/Kconfig.defconfig b/boards/arm/stm32f723e_disco/Kconfig.defconfig index f8406381d3f4a..368d367ed8401 100644 --- a/boards/arm/stm32f723e_disco/Kconfig.defconfig +++ b/boards/arm/stm32f723e_disco/Kconfig.defconfig @@ -3,14 +3,6 @@ # Copyright (c) 2018 Aurelien Jarno # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32F723E_DISCO - -config BOARD - default "stm32f723e_disco" - config SPI_STM32_INTERRUPT default y depends on SPI - - -endif # BOARD_STM32F723E_DISCO diff --git a/boards/arm/stm32f723e_disco/Kconfig.stm32f723e_disco b/boards/arm/stm32f723e_disco/Kconfig.stm32f723e_disco new file mode 100644 index 0000000000000..8a48a3ba24348 --- /dev/null +++ b/boards/arm/stm32f723e_disco/Kconfig.stm32f723e_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F723E_DISCO + bool + default y + select SOC_SERIES_STM32F7X + select SOC_STM32F723XX diff --git a/boards/arm/stm32f723e_disco/stm32f723e_disco_defconfig b/boards/arm/stm32f723e_disco/stm32f723e_disco_defconfig index 404cd5c1bb15f..bc6020b2f192f 100644 --- a/boards/arm/stm32f723e_disco/stm32f723e_disco_defconfig +++ b/boards/arm/stm32f723e_disco/stm32f723e_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F7X=y -CONFIG_SOC_STM32F723XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32f746g_disco/Kconfig.board b/boards/arm/stm32f746g_disco/Kconfig.board deleted file mode 100644 index b1916605531a0..0000000000000 --- a/boards/arm/stm32f746g_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F746G Discovery board configuration - -# Copyright (c) 2018 Yurii Hamann -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F746G_DISCO - bool "STM32F746G Discovery Development Board" - depends on SOC_STM32F746XX diff --git a/boards/arm/stm32f746g_disco/Kconfig.defconfig b/boards/arm/stm32f746g_disco/Kconfig.defconfig index 4dd3630095e77..3a3b0095e52fa 100644 --- a/boards/arm/stm32f746g_disco/Kconfig.defconfig +++ b/boards/arm/stm32f746g_disco/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018 Yurii Hamann # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32F746G_DISCO - -config BOARD - default "stm32f746g_disco" - if NETWORKING config NET_L2_ETHERNET @@ -36,5 +31,3 @@ endif # KSCAN config DISK_DRIVER_SDMMC default y if DISK_DRIVERS - -endif # BOARD_STM32F746G_DISCO diff --git a/boards/arm/stm32f746g_disco/Kconfig.stm32f746g_disco b/boards/arm/stm32f746g_disco/Kconfig.stm32f746g_disco new file mode 100644 index 0000000000000..1bd78643d02a6 --- /dev/null +++ b/boards/arm/stm32f746g_disco/Kconfig.stm32f746g_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F746G_DISCO + bool + default y + select SOC_SERIES_STM32F7X + select SOC_STM32F746XX diff --git a/boards/arm/stm32f746g_disco/stm32f746g_disco_defconfig b/boards/arm/stm32f746g_disco/stm32f746g_disco_defconfig index fff57f6d5e40b..bc6020b2f192f 100644 --- a/boards/arm/stm32f746g_disco/stm32f746g_disco_defconfig +++ b/boards/arm/stm32f746g_disco/stm32f746g_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F7X=y -CONFIG_SOC_STM32F746XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32f7508_dk/Kconfig.board b/boards/arm/stm32f7508_dk/Kconfig.board deleted file mode 100644 index 5f6e707d522d7..0000000000000 --- a/boards/arm/stm32f7508_dk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F7508-DK Discovery board configuration - -# Copyright (c) 2022, Rtone. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F7508_DK - bool "STM32F7508-DK Discovery Kit" - depends on SOC_STM32F750XX diff --git a/boards/arm/stm32f7508_dk/Kconfig.defconfig b/boards/arm/stm32f7508_dk/Kconfig.defconfig index a979b1ab1b573..7bd6c06d1421f 100644 --- a/boards/arm/stm32f7508_dk/Kconfig.defconfig +++ b/boards/arm/stm32f7508_dk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2022, Rtone. # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32F7508_DK - -config BOARD - default "stm32f7508_dk" - if NETWORKING config NET_L2_ETHERNET @@ -36,5 +31,3 @@ endif # KSCAN config DISK_DRIVER_SDMMC default y if DISK_DRIVERS - -endif # BOARD_STM32F7508_DK diff --git a/boards/arm/stm32f7508_dk/Kconfig.stm32f7508_dk b/boards/arm/stm32f7508_dk/Kconfig.stm32f7508_dk new file mode 100644 index 0000000000000..bae96ae737b5a --- /dev/null +++ b/boards/arm/stm32f7508_dk/Kconfig.stm32f7508_dk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F7508_DK + bool + default y + select SOC_SERIES_STM32F7X + select SOC_STM32F750XX diff --git a/boards/arm/stm32f7508_dk/stm32f7508_dk_defconfig b/boards/arm/stm32f7508_dk/stm32f7508_dk_defconfig index b78ebb9d3a3c4..ba494cbe0b475 100644 --- a/boards/arm/stm32f7508_dk/stm32f7508_dk_defconfig +++ b/boards/arm/stm32f7508_dk/stm32f7508_dk_defconfig @@ -1,8 +1,6 @@ # Copyright (c) 2022, Rtone. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F7X=y -CONFIG_SOC_STM32F750XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32f769i_disco/Kconfig.board b/boards/arm/stm32f769i_disco/Kconfig.board deleted file mode 100644 index 80c1b3ef5cbea..0000000000000 --- a/boards/arm/stm32f769i_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32F769I Discovery board configuration - -# Copyright (c) 2018 Yong Jin -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32F769I_DISCO - bool "STM32F769I Discovery Development Board" - depends on SOC_STM32F769XX diff --git a/boards/arm/stm32f769i_disco/Kconfig.defconfig b/boards/arm/stm32f769i_disco/Kconfig.defconfig index ae76044e9e5ec..e962d321a764e 100644 --- a/boards/arm/stm32f769i_disco/Kconfig.defconfig +++ b/boards/arm/stm32f769i_disco/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018 Yong Jin # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32F769I_DISCO - -config BOARD - default "stm32f769i_disco" - config SPI_STM32_INTERRUPT default y depends on SPI @@ -18,5 +13,3 @@ config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_STM32F769I_DISCO diff --git a/boards/arm/stm32f769i_disco/Kconfig.stm32f769i_disco b/boards/arm/stm32f769i_disco/Kconfig.stm32f769i_disco new file mode 100644 index 0000000000000..0016954ed16f3 --- /dev/null +++ b/boards/arm/stm32f769i_disco/Kconfig.stm32f769i_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32F769I_DISCO + bool + default y + select SOC_SERIES_STM32F7X + select SOC_STM32F769XX diff --git a/boards/arm/stm32f769i_disco/stm32f769i_disco_defconfig b/boards/arm/stm32f769i_disco/stm32f769i_disco_defconfig index 3a6c65f14b692..bc6020b2f192f 100644 --- a/boards/arm/stm32f769i_disco/stm32f769i_disco_defconfig +++ b/boards/arm/stm32f769i_disco/stm32f769i_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F7X=y -CONFIG_SOC_STM32F769XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32g0316_disco/Kconfig.board b/boards/arm/stm32g0316_disco/Kconfig.board deleted file mode 100644 index 3f00f126fe3d0..0000000000000 --- a/boards/arm/stm32g0316_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32G0316 Discovery board configuration - -# Copyright (c) 2019 SEAL AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32G0316_DISCO - bool "STM32G0316 Discovery Development Board" - depends on SOC_STM32G031XX diff --git a/boards/arm/stm32g0316_disco/Kconfig.defconfig b/boards/arm/stm32g0316_disco/Kconfig.defconfig deleted file mode 100644 index 3016470eb561d..0000000000000 --- a/boards/arm/stm32g0316_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32G0316 Discovery board configuration - -# Copyright (c) 2019 SEAL AG -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32G0316_DISCO - -config BOARD - default "stm32g0316_disco" - -endif # BOARD_STM32G0316_DISCO diff --git a/boards/arm/stm32g0316_disco/Kconfig.stm32g0316_disco b/boards/arm/stm32g0316_disco/Kconfig.stm32g0316_disco new file mode 100644 index 0000000000000..0ac1b13700c97 --- /dev/null +++ b/boards/arm/stm32g0316_disco/Kconfig.stm32g0316_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32G0316_DISCO + bool + default y + select SOC_SERIES_STM32G0X + select SOC_STM32G031XX diff --git a/boards/arm/stm32g0316_disco/stm32g0316_disco_defconfig b/boards/arm/stm32g0316_disco/stm32g0316_disco_defconfig index a790e064bf6c1..33374dcfd96be 100644 --- a/boards/arm/stm32g0316_disco/stm32g0316_disco_defconfig +++ b/boards/arm/stm32g0316_disco/stm32g0316_disco_defconfig @@ -1,6 +1,4 @@ # Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G031XX=y # Kernel Options due to Low Memory (8k) CONFIG_MAIN_STACK_SIZE=640 diff --git a/boards/arm/stm32g071b_disco/Kconfig.board b/boards/arm/stm32g071b_disco/Kconfig.board deleted file mode 100644 index 897dcce606db1..0000000000000 --- a/boards/arm/stm32g071b_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32G071B Discovery board configuration - -# Copyright 2021 The Chromium OS Authors -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32G071B_DISCO - bool "STM32G071B Discovery Board" - depends on SOC_STM32G071XX diff --git a/boards/arm/stm32g071b_disco/Kconfig.defconfig b/boards/arm/stm32g071b_disco/Kconfig.defconfig deleted file mode 100644 index 195b8ecdf4ffc..0000000000000 --- a/boards/arm/stm32g071b_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32G071B Discovery board configuration - -# Copyright 2021 The Chromium OS Authors -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32G071B_DISCO - -config BOARD - default "stm32g071b_disco" - -endif # BOARD_STM32G071B_DISCO diff --git a/boards/arm/stm32g071b_disco/Kconfig.stm32g071b_disco b/boards/arm/stm32g071b_disco/Kconfig.stm32g071b_disco new file mode 100644 index 0000000000000..6dcb3998eaea9 --- /dev/null +++ b/boards/arm/stm32g071b_disco/Kconfig.stm32g071b_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32G071B_DISCO + bool + default y + select SOC_SERIES_STM32G0X + select SOC_STM32G071XX diff --git a/boards/arm/stm32g071b_disco/stm32g071b_disco_defconfig b/boards/arm/stm32g071b_disco/stm32g071b_disco_defconfig index c4129b26a7fb3..399750fc2e3d1 100644 --- a/boards/arm/stm32g071b_disco/stm32g071b_disco_defconfig +++ b/boards/arm/stm32g071b_disco/stm32g071b_disco_defconfig @@ -2,8 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G071XX=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/stm32g081b_eval/Kconfig.board b/boards/arm/stm32g081b_eval/Kconfig.board deleted file mode 100644 index 2f2299670f520..0000000000000 --- a/boards/arm/stm32g081b_eval/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32G081B Evaluation board configuration - -# Copyright 2021 The Chromium OS Authors -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32G081B_EVAL - bool "STM32G081B Evaluation Board" - depends on SOC_STM32G081XX diff --git a/boards/arm/stm32g081b_eval/Kconfig.defconfig b/boards/arm/stm32g081b_eval/Kconfig.defconfig deleted file mode 100644 index 548b4d75cc13a..0000000000000 --- a/boards/arm/stm32g081b_eval/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32G081B evaluation board configuration - -# Copyright 2021 The Chromium OS Authors -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32G081B_EVAL - -config BOARD - default "stm32g081b_eval" - -endif # BOARD_STM32G081B_EVAL diff --git a/boards/arm/stm32g081b_eval/Kconfig.stm32g081b_eval b/boards/arm/stm32g081b_eval/Kconfig.stm32g081b_eval new file mode 100644 index 0000000000000..984a582cdc4aa --- /dev/null +++ b/boards/arm/stm32g081b_eval/Kconfig.stm32g081b_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32G081B_EVAL + bool + default y + select SOC_SERIES_STM32G0X + select SOC_STM32G081XX diff --git a/boards/arm/stm32g081b_eval/stm32g081b_eval_defconfig b/boards/arm/stm32g081b_eval/stm32g081b_eval_defconfig index cccb164bbcde7..399750fc2e3d1 100644 --- a/boards/arm/stm32g081b_eval/stm32g081b_eval_defconfig +++ b/boards/arm/stm32g081b_eval/stm32g081b_eval_defconfig @@ -2,8 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G081XX=y # Serial Drivers CONFIG_SERIAL=y diff --git a/boards/arm/stm32h735g_disco/Kconfig.board b/boards/arm/stm32h735g_disco/Kconfig.board deleted file mode 100644 index 78a8af8bc0160..0000000000000 --- a/boards/arm/stm32h735g_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32H735G Discovery board configuration - -# Copyright (c) 2021 SILA Embedded Solutions GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32H735G_DISCO - bool "STM32H735G Discovery Development Board" - depends on SOC_STM32H735XX diff --git a/boards/arm/stm32h735g_disco/Kconfig.defconfig b/boards/arm/stm32h735g_disco/Kconfig.defconfig index 42de4573d83ce..a823440c69605 100644 --- a/boards/arm/stm32h735g_disco/Kconfig.defconfig +++ b/boards/arm/stm32h735g_disco/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2021 SILA Embedded Solutions GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32H735G_DISCO - -config BOARD - default "stm32h735g_disco" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_STM32H735G_DISCO diff --git a/boards/arm/stm32h735g_disco/Kconfig.stm32h735g_disco b/boards/arm/stm32h735g_disco/Kconfig.stm32h735g_disco new file mode 100644 index 0000000000000..aecf640d1eaaf --- /dev/null +++ b/boards/arm/stm32h735g_disco/Kconfig.stm32h735g_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32H735G_DISCO + bool + default y + select SOC_SERIES_STM32H7X + select SOC_STM32H735XX diff --git a/boards/arm/stm32h735g_disco/stm32h735g_disco_defconfig b/boards/arm/stm32h735g_disco/stm32h735g_disco_defconfig index d8c7d4e78d061..4004e3e676d1e 100644 --- a/boards/arm/stm32h735g_disco/stm32h735g_disco_defconfig +++ b/boards/arm/stm32h735g_disco/stm32h735g_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H735XX=y # Enable the internal SMPS regulator CONFIG_POWER_SUPPLY_DIRECT_SMPS=y diff --git a/boards/arm/stm32h747i_disco/Kconfig.board b/boards/arm/stm32h747i_disco/Kconfig.board deleted file mode 100644 index 819e6f08a605c..0000000000000 --- a/boards/arm/stm32h747i_disco/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# STM32H747I Discovery board configuration - -# Copyright (c) 2019 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32H747I_DISCO_M7 - bool "STM32H747I Discovery Development Board" - depends on SOC_STM32H747XX - select CPU_CORTEX_M7 - -config BOARD_STM32H747I_DISCO_M4 - bool "STM32H747I Discovery Development Board" - depends on SOC_STM32H747XX - select CPU_CORTEX_M4 diff --git a/boards/arm/stm32h747i_disco/Kconfig.defconfig b/boards/arm/stm32h747i_disco/Kconfig.defconfig index c8fa55a2e37df..29fde5f2cb381 100644 --- a/boards/arm/stm32h747i_disco/Kconfig.defconfig +++ b/boards/arm/stm32h747i_disco/Kconfig.defconfig @@ -3,12 +3,6 @@ # Copyright (c) 2019 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32H747I_DISCO_M7 || BOARD_STM32H747I_DISCO_M4 - -config BOARD - default "stm32h747i_disco_m7" if BOARD_STM32H747I_DISCO_M7 - default "stm32h747i_disco_m4" if BOARD_STM32H747I_DISCO_M4 - config STM32H7_DUAL_CORE default y @@ -21,5 +15,3 @@ endif # NETWORKING config DISK_DRIVER_SDMMC default y if DISK_DRIVERS - -endif # BOARD_STM32H747I_DISCO_M7 diff --git a/boards/arm/stm32h747i_disco/Kconfig.stm32h747i_disco_m4 b/boards/arm/stm32h747i_disco/Kconfig.stm32h747i_disco_m4 new file mode 100644 index 0000000000000..a706a063a2621 --- /dev/null +++ b/boards/arm/stm32h747i_disco/Kconfig.stm32h747i_disco_m4 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32H747I_DISCO_M4 + bool + default y + select SOC_SERIES_STM32H7X + select SOC_STM32H747XX + select CPU_CORTEX_M4 diff --git a/boards/arm/stm32h747i_disco/Kconfig.stm32h747i_disco_m7 b/boards/arm/stm32h747i_disco/Kconfig.stm32h747i_disco_m7 new file mode 100644 index 0000000000000..759199626ac1d --- /dev/null +++ b/boards/arm/stm32h747i_disco/Kconfig.stm32h747i_disco_m7 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32H747I_DISCO_M7 + bool + default y + select SOC_SERIES_STM32H7X + select SOC_STM32H747XX + select CPU_CORTEX_M7 diff --git a/boards/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig b/boards/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig index 2f437301c8507..e66bbde95a3b6 100644 --- a/boards/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig +++ b/boards/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig @@ -1,10 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H747XX=y # Board config should be specified since there are 2 possible targets -CONFIG_BOARD_STM32H747I_DISCO_M4=y # enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig b/boards/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig index c288ddfc5e4cb..df6bb5aaa8d3a 100644 --- a/boards/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig +++ b/boards/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig @@ -1,10 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H747XX=y # Board config should be specified since there are 2 possible targets -CONFIG_BOARD_STM32H747I_DISCO_M7=y # Enable the internal SMPS regulator CONFIG_POWER_SUPPLY_DIRECT_SMPS=y diff --git a/boards/arm/stm32h7b3i_dk/Kconfig.board b/boards/arm/stm32h7b3i_dk/Kconfig.board deleted file mode 100644 index c3912d786e0ca..0000000000000 --- a/boards/arm/stm32h7b3i_dk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32H7B3I Discovery kit board configuration - -# Copyright (c) 2022 Byte-Lab d.o.o. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32H7B3I_DK - bool "STM32H7B3I Discovery Kit Development Board" - depends on SOC_STM32H7B3XXQ diff --git a/boards/arm/stm32h7b3i_dk/Kconfig.defconfig b/boards/arm/stm32h7b3i_dk/Kconfig.defconfig index c234dfe876dbe..0936d11753351 100644 --- a/boards/arm/stm32h7b3i_dk/Kconfig.defconfig +++ b/boards/arm/stm32h7b3i_dk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2022 Byte-Lab d.o.o. # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32H7B3I_DK - -config BOARD - default "stm32h7b3i_dk" - config KSCAN default y if DISPLAY @@ -18,5 +13,3 @@ config KSCAN_FT5336_INTERRUPT # display buffer to external SDRAM connected to FMC config MEMC default y if DISPLAY - -endif # BOARD_STM32H7B3I_DK diff --git a/boards/arm/stm32h7b3i_dk/Kconfig.stm32h7b3i_dk b/boards/arm/stm32h7b3i_dk/Kconfig.stm32h7b3i_dk new file mode 100644 index 0000000000000..88e53087df856 --- /dev/null +++ b/boards/arm/stm32h7b3i_dk/Kconfig.stm32h7b3i_dk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32H7B3I_DK + bool + default y + select SOC_SERIES_STM32H7X + select SOC_STM32H7B3XXQ diff --git a/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk_defconfig b/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk_defconfig index 913a1ed5dbd6e..683292e6df41e 100644 --- a/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk_defconfig +++ b/boards/arm/stm32h7b3i_dk/stm32h7b3i_dk_defconfig @@ -2,8 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 # Set SoC present on the board -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H7B3XXQ=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32l1_disco/Kconfig.board b/boards/arm/stm32l1_disco/Kconfig.board deleted file mode 100644 index e9621b560b076..0000000000000 --- a/boards/arm/stm32l1_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Board configuration - -# Copyright (c) 2019 eTactica ehf -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32L1_DISCO - bool "STM32L1DISCOVERY Development Board" - depends on SOC_STM32L151XB diff --git a/boards/arm/stm32l1_disco/Kconfig.defconfig b/boards/arm/stm32l1_disco/Kconfig.defconfig deleted file mode 100644 index 8159f9c1abbec..0000000000000 --- a/boards/arm/stm32l1_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Board configuration - -# Copyright (c) 2019 eTactica ehf -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32L1_DISCO - -config BOARD - default "stm32l1_disco" - -endif # BOARD_STM32L1_DISCO diff --git a/boards/arm/stm32l1_disco/Kconfig.stm32l1_disco b/boards/arm/stm32l1_disco/Kconfig.stm32l1_disco new file mode 100644 index 0000000000000..e7f77f27a150e --- /dev/null +++ b/boards/arm/stm32l1_disco/Kconfig.stm32l1_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32L1_DISCO + bool + default y + select SOC_SERIES_STM32L1X + select SOC_STM32L151XB diff --git a/boards/arm/stm32l1_disco/stm32l1_disco_defconfig b/boards/arm/stm32l1_disco/stm32l1_disco_defconfig index dfbf82011e57f..0d4d2471491ed 100644 --- a/boards/arm/stm32l1_disco/stm32l1_disco_defconfig +++ b/boards/arm/stm32l1_disco/stm32l1_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L1X=y -CONFIG_SOC_STM32L151XB=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/stm32l476g_disco/Kconfig.board b/boards/arm/stm32l476g_disco/Kconfig.board deleted file mode 100644 index 2aa9ec78b1930..0000000000000 --- a/boards/arm/stm32l476g_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32L476G Discovery board configuration - -# Copyright (c) 2017 Arthur Sfez -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32L476G_DISCO - bool "STM32L476G Discovery Development Board" - depends on SOC_STM32L476XX diff --git a/boards/arm/stm32l476g_disco/Kconfig.defconfig b/boards/arm/stm32l476g_disco/Kconfig.defconfig deleted file mode 100644 index 77e423642a3d5..0000000000000 --- a/boards/arm/stm32l476g_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32L476G DISCOVERY board configuration - -# Copyright (c) 2017 Arthur Sfez -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32L476G_DISCO - -config BOARD - default "stm32l476g_disco" - -endif # BOARD_STM32L476G_DISCO diff --git a/boards/arm/stm32l476g_disco/Kconfig.stm32l476g_disco b/boards/arm/stm32l476g_disco/Kconfig.stm32l476g_disco new file mode 100644 index 0000000000000..706c839b84338 --- /dev/null +++ b/boards/arm/stm32l476g_disco/Kconfig.stm32l476g_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32L476G_DISCO + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L476XX diff --git a/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig b/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig index 0f0f47059fe07..4b3bfc4541ae4 100644 --- a/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig +++ b/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L476XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32l496g_disco/Kconfig.board b/boards/arm/stm32l496g_disco/Kconfig.board deleted file mode 100644 index 4d2e23204a81a..0000000000000 --- a/boards/arm/stm32l496g_disco/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# STM32L496G Discovery board configuration - -# Copyright (c) 2016 Open-RnD Sp. z o.o. -# Copyright (c) 2016 BayLibre, SAS -# Copyright (c) 2019 Centaur Analytics, Inc -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32L496G_DISCO - bool "STM32L496G Discovery Development Board" - depends on SOC_STM32L496XX diff --git a/boards/arm/stm32l496g_disco/Kconfig.defconfig b/boards/arm/stm32l496g_disco/Kconfig.defconfig index 114aacf680d93..de49828d50807 100644 --- a/boards/arm/stm32l496g_disco/Kconfig.defconfig +++ b/boards/arm/stm32l496g_disco/Kconfig.defconfig @@ -4,16 +4,9 @@ # Copyright (c) 2016 BayLibre, SAS # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32L496G_DISCO - -config BOARD - default "stm32l496g_disco" - config SPI_STM32_INTERRUPT default y depends on SPI config DISK_DRIVER_SDMMC default y if DISK_DRIVERS - -endif # BOARD_STM32L496G_DISCO diff --git a/boards/arm/stm32l496g_disco/Kconfig.stm32l496g_disco b/boards/arm/stm32l496g_disco/Kconfig.stm32l496g_disco new file mode 100644 index 0000000000000..cd92035cfd405 --- /dev/null +++ b/boards/arm/stm32l496g_disco/Kconfig.stm32l496g_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32L496G_DISCO + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L496XX diff --git a/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig b/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig index d2d940208b5ce..6f0082c199c96 100644 --- a/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig +++ b/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L496XX=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/stm32l562e_dk/Kconfig.board b/boards/arm/stm32l562e_dk/Kconfig.board deleted file mode 100644 index 44cabce93d3d5..0000000000000 --- a/boards/arm/stm32l562e_dk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32L562E-DK Discovery board configuration - -# Copyright (c) 2020 Yestin Sun -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32L562E_DK - bool "STM32L562E-DK Discovery Development Board" - depends on SOC_STM32L562XX diff --git a/boards/arm/stm32l562e_dk/Kconfig.defconfig b/boards/arm/stm32l562e_dk/Kconfig.defconfig index 1fe37f3e0a4f3..3f7eca3d7ad3c 100644 --- a/boards/arm/stm32l562e_dk/Kconfig.defconfig +++ b/boards/arm/stm32l562e_dk/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2020 Yestin Sun # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32L562E_DK - -config BOARD - default "stm32l562e_dk" - # LPTIM clocked by LSE, force tick freq to 4096 for tick accuracy config SYS_CLOCK_TICKS_PER_SEC default 4096 if STM32_LPTIM_TIMER @@ -43,5 +38,3 @@ config USE_DT_CODE_PARTITION default y endif # TRUSTED_EXECUTION_NONSECURE - -endif # BOARD_STM32L562E_DK diff --git a/boards/arm/stm32l562e_dk/Kconfig.stm32l562e_dk b/boards/arm/stm32l562e_dk/Kconfig.stm32l562e_dk new file mode 100644 index 0000000000000..1fae5cca0ea43 --- /dev/null +++ b/boards/arm/stm32l562e_dk/Kconfig.stm32l562e_dk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32L562E_DK + bool + default y + select SOC_SERIES_STM32L5X + select SOC_STM32L562XX diff --git a/boards/arm/stm32l562e_dk/Kconfig.stm32l562e_dk_ns b/boards/arm/stm32l562e_dk/Kconfig.stm32l562e_dk_ns new file mode 100644 index 0000000000000..3c839bd4f4db9 --- /dev/null +++ b/boards/arm/stm32l562e_dk/Kconfig.stm32l562e_dk_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32L562E_DK_NS + bool + default y + select SOC_SERIES_STM32L5X + select SOC_STM32L562XX diff --git a/boards/arm/stm32l562e_dk/stm32l562e_dk_defconfig b/boards/arm/stm32l562e_dk/stm32l562e_dk_defconfig index 6646832e7ef7e..a575007b44172 100644 --- a/boards/arm/stm32l562e_dk/stm32l562e_dk_defconfig +++ b/boards/arm/stm32l562e_dk/stm32l562e_dk_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L5X=y -CONFIG_SOC_STM32L562XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/stm32l562e_dk/stm32l562e_dk_ns_defconfig b/boards/arm/stm32l562e_dk/stm32l562e_dk_ns_defconfig index c28424d306a05..72c4a744f04eb 100644 --- a/boards/arm/stm32l562e_dk/stm32l562e_dk_ns_defconfig +++ b/boards/arm/stm32l562e_dk/stm32l562e_dk_ns_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L5X=y -CONFIG_SOC_STM32L562XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/stm32mp157c_dk2/Kconfig.board b/boards/arm/stm32mp157c_dk2/Kconfig.board deleted file mode 100644 index b020b97dd881a..0000000000000 --- a/boards/arm/stm32mp157c_dk2/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32MP157C Discovery board configuration - -# Copyright (c) 2019 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32MP157C_DK2 - bool "STM32MP157C Discovery Development 2 Board" - depends on SOC_STM32MP15_M4 diff --git a/boards/arm/stm32mp157c_dk2/Kconfig.defconfig b/boards/arm/stm32mp157c_dk2/Kconfig.defconfig index ca57d3afe02c6..82582234d0fc2 100644 --- a/boards/arm/stm32mp157c_dk2/Kconfig.defconfig +++ b/boards/arm/stm32mp157c_dk2/Kconfig.defconfig @@ -3,13 +3,6 @@ # Copyright (c) 2019 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32MP157C_DK2 - -config BOARD - default "stm32mp157c_dk2" - config SPI_STM32_INTERRUPT default y depends on SPI - -endif # BOARD_STM32MP157_Dk2 diff --git a/boards/arm/stm32mp157c_dk2/Kconfig.stm32mp157c_dk2 b/boards/arm/stm32mp157c_dk2/Kconfig.stm32mp157c_dk2 new file mode 100644 index 0000000000000..11f1fcae91032 --- /dev/null +++ b/boards/arm/stm32mp157c_dk2/Kconfig.stm32mp157c_dk2 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32MP157C_DK2 + bool + default y + select SOC_SERIES_STM32MP1X + select SOC_STM32MP15_M4 diff --git a/boards/arm/stm32mp157c_dk2/stm32mp157c_dk2_defconfig b/boards/arm/stm32mp157c_dk2/stm32mp157c_dk2_defconfig index 66503dc240673..056ce7eddc026 100644 --- a/boards/arm/stm32mp157c_dk2/stm32mp157c_dk2_defconfig +++ b/boards/arm/stm32mp157c_dk2/stm32mp157c_dk2_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_STM32MP1X=y -CONFIG_SOC_STM32MP15_M4=y - # enable GPIO CONFIG_GPIO=y diff --git a/boards/arm/stm32vl_disco/Kconfig.board b/boards/arm/stm32vl_disco/Kconfig.board deleted file mode 100644 index 57a0e43e68e9f..0000000000000 --- a/boards/arm/stm32vl_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Board configuration - -# Copyright (c) 2020 Jonas Eriksson, Up to Code AB -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32VL_DISCO - bool "STM32VLDISCOVERY Development Board" - depends on SOC_STM32F100XB diff --git a/boards/arm/stm32vl_disco/Kconfig.defconfig b/boards/arm/stm32vl_disco/Kconfig.defconfig deleted file mode 100644 index 1bdcdc36a0dbe..0000000000000 --- a/boards/arm/stm32vl_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Board configuration - -# Copyright (c) 2020 Jonas Eriksson, Up to Code AB -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32VL_DISCO - -config BOARD - default "stm32vl_disco" - -endif # BOARD_STM32VL_DISCO diff --git a/boards/arm/stm32vl_disco/Kconfig.stm32vl_disco b/boards/arm/stm32vl_disco/Kconfig.stm32vl_disco new file mode 100644 index 0000000000000..14fd546e427ae --- /dev/null +++ b/boards/arm/stm32vl_disco/Kconfig.stm32vl_disco @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32VL_DISCO + bool + default y + select SOC_SERIES_STM32F1X + select SOC_STM32F100XB diff --git a/boards/arm/stm32vl_disco/stm32vl_disco_defconfig b/boards/arm/stm32vl_disco/stm32vl_disco_defconfig index ee2e8b8462ac5..3172cd396aec6 100644 --- a/boards/arm/stm32vl_disco/stm32vl_disco_defconfig +++ b/boards/arm/stm32vl_disco/stm32vl_disco_defconfig @@ -1,8 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # Platform Configuration -CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F100XB=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/swan_r5/Kconfig.board b/boards/arm/swan_r5/Kconfig.board deleted file mode 100644 index f1f15cb8bd72a..0000000000000 --- a/boards/arm/swan_r5/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Blues Wireless Swan board configuration - -# Copyright (c) 2022 Blues Inc. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SWAN_R5 - bool "Blues Wireless Swan Development Board" - depends on SOC_STM32L4R5XX diff --git a/boards/arm/swan_r5/Kconfig.defconfig b/boards/arm/swan_r5/Kconfig.defconfig index 0ab4dbfb0d0f2..906de56e19695 100644 --- a/boards/arm/swan_r5/Kconfig.defconfig +++ b/boards/arm/swan_r5/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2022 Blues Inc. # SPDX-License-Identifier: Apache-2.0 -if BOARD_SWAN_R5 - -config BOARD - default "swan_r5" - config SPI_STM32_INTERRUPT default y depends on SPI @@ -21,5 +16,3 @@ config USB_DEVICE_NETWORK_EEM default y endif # NETWORKING - -endif # BOARD_SWAN_R5 diff --git a/boards/arm/swan_r5/Kconfig.swan_r5 b/boards/arm/swan_r5/Kconfig.swan_r5 new file mode 100644 index 0000000000000..a310b8ad64454 --- /dev/null +++ b/boards/arm/swan_r5/Kconfig.swan_r5 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SWAN_R5 + bool + default y + select SOC_SERIES_STM32L4X + select SOC_STM32L4R5XX diff --git a/boards/arm/swan_r5/swan_r5_defconfig b/boards/arm/swan_r5/swan_r5_defconfig index 0efb42f55a9f6..85e8b269821be 100644 --- a/boards/arm/swan_r5/swan_r5_defconfig +++ b/boards/arm/swan_r5/swan_r5_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L4R5XX=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/tdk_robokit1/Kconfig.board b/boards/arm/tdk_robokit1/Kconfig.board deleted file mode 100644 index 16ea951fc203c..0000000000000 --- a/boards/arm/tdk_robokit1/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# TDK RoboKit 1 Board Options - -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_TDK_ROBOKIT1 - bool "TDK RoboKit1 Board" - depends on SOC_PART_NUMBER_SAME70Q21 || SOC_PART_NUMBER_SAME70Q21B diff --git a/boards/arm/tdk_robokit1/Kconfig.defconfig b/boards/arm/tdk_robokit1/Kconfig.defconfig deleted file mode 100644 index eab856c9089ab..0000000000000 --- a/boards/arm/tdk_robokit1/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# TDK RoboKit1 Configuration - -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_TDK_ROBOKIT1 - -config BOARD - default "tdk_robotkit1" - -endif # BOARD_TDK_ROBOKIT1 diff --git a/boards/arm/tdk_robokit1/Kconfig.tdk_robokit1 b/boards/arm/tdk_robokit1/Kconfig.tdk_robokit1 new file mode 100644 index 0000000000000..0175329aba873 --- /dev/null +++ b/boards/arm/tdk_robokit1/Kconfig.tdk_robokit1 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_TDK_ROBOKIT1 + bool + default y + select SOC_SERIES_SAME70 + select SOC_PART_NUMBER_SAME70Q21 diff --git a/boards/arm/tdk_robokit1/tdk_robokit1_defconfig b/boards/arm/tdk_robokit1/tdk_robokit1_defconfig index 60050f3724f5e..cb99c456c49a6 100644 --- a/boards/arm/tdk_robokit1/tdk_robokit1_defconfig +++ b/boards/arm/tdk_robokit1/tdk_robokit1_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAME70=y -CONFIG_SOC_PART_NUMBER_SAME70Q21=y CONFIG_SOC_ATMEL_SAME70_EXT_MAINCK=y CONFIG_SOC_ATMEL_SAME70_PLLA_MULA=24 CONFIG_SOC_ATMEL_SAME70_PLLA_DIVA=1 @@ -9,7 +7,6 @@ CONFIG_ARM_MPU=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y -CONFIG_BOARD_TDK_ROBOKIT1=y CONFIG_WDT_DISABLE_AT_BOOT=y CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/arm/teensy4/Kconfig.board b/boards/arm/teensy4/Kconfig.board deleted file mode 100644 index f0f5f55a8e0e7..0000000000000 --- a/boards/arm/teensy4/Kconfig.board +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2020, Bernhard Kraemer -# -# SPDX-License-Identifier: Apache-2.0 -# - -config BOARD_TEENSY40 - bool "PJRC TEENSY40" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1062DVL6A - -config BOARD_TEENSY41 - bool "PJRC TEENSY41" - depends on SOC_SERIES_IMX_RT - select SOC_PART_NUMBER_MIMXRT1062DVJ6A diff --git a/boards/arm/teensy4/Kconfig.defconfig b/boards/arm/teensy4/Kconfig.defconfig index 5e8eac0d0f0f7..dc7ec94242d56 100644 --- a/boards/arm/teensy4/Kconfig.defconfig +++ b/boards/arm/teensy4/Kconfig.defconfig @@ -4,21 +4,13 @@ # SPDX-License-Identifier: Apache-2.0 # -if BOARD_TEENSY40 || BOARD_TEENSY41 - config BUILD_OUTPUT_HEX bool default y -config BOARD - default "teensy40" if BOARD_TEENSY40 - default "teensy41" if BOARD_TEENSY41 - choice CODE_LOCATION default CODE_FLEXSPI endchoice config DISK_DRIVER_SDMMC default y if DISK_DRIVERS - -endif # BOARD_TEENSY40 || BOARD_TEENSY41 diff --git a/boards/arm/teensy4/Kconfig.teensy40 b/boards/arm/teensy4/Kconfig.teensy40 new file mode 100644 index 0000000000000..d53b78fcab8c8 --- /dev/null +++ b/boards/arm/teensy4/Kconfig.teensy40 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_TEENSY40 + bool + default y + select SOC_MIMXRT1062 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1062DVL6A diff --git a/boards/arm/teensy4/Kconfig.teensy41 b/boards/arm/teensy4/Kconfig.teensy41 new file mode 100644 index 0000000000000..5802d8f0566e1 --- /dev/null +++ b/boards/arm/teensy4/Kconfig.teensy41 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_TEENSY41 + bool + default y + select SOC_MIMXRT1062 + select SOC_SERIES_IMX_RT + select SOC_PART_NUMBER_MIMXRT1062DVJ6A diff --git a/boards/arm/teensy4/teensy40_defconfig b/boards/arm/teensy4/teensy40_defconfig index 89b2890fbe2f8..1d186d986c48a 100644 --- a/boards/arm/teensy4/teensy40_defconfig +++ b/boards/arm/teensy4/teensy40_defconfig @@ -4,10 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1062=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_DEVICE_CONFIGURATION_DATA=n -CONFIG_BOARD_TEENSY40=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/teensy4/teensy41_defconfig b/boards/arm/teensy4/teensy41_defconfig index 018d31d009ebc..1d186d986c48a 100644 --- a/boards/arm/teensy4/teensy41_defconfig +++ b/boards/arm/teensy4/teensy41_defconfig @@ -4,10 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1062=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_DEVICE_CONFIGURATION_DATA=n -CONFIG_BOARD_TEENSY41=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/thingy52_nrf52832/Kconfig b/boards/arm/thingy52_nrf52832/Kconfig index 318d486efefe2..3dccb86445ebc 100644 --- a/boards/arm/thingy52_nrf52832/Kconfig +++ b/boards/arm/thingy52_nrf52832/Kconfig @@ -3,8 +3,6 @@ # Copyright (c) 2018 Aapo Vienamo # SPDX-License-Identifier: Apache-2.0 -if BOARD_THINGY52_NRF52832 - config BOARD_CCS_VDD_PWR_CTRL_INIT_PRIORITY int "CCS_VDD power rail init priority" default 85 @@ -13,5 +11,3 @@ config BOARD_CCS_VDD_PWR_CTRL_INIT_PRIORITY Initialization priority for the CCS_VDD power rail. This powers the CCS811 gas sensor. The value has to be greater than BOARD_VDD_PWR_CTRL_INIT_PRIORITY, but smaller than SENSOR_INIT_PRIORITY. - -endif # BOARD_THINGY52_NRF52832 diff --git a/boards/arm/thingy52_nrf52832/Kconfig.board b/boards/arm/thingy52_nrf52832/Kconfig.board deleted file mode 100644 index c369b95554bfb..0000000000000 --- a/boards/arm/thingy52_nrf52832/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Thingy52 NRF52832 board configuration - -# Copyright (c) 2018 Aapo Vienamo -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_THINGY52_NRF52832 - bool "Thingy52 NRF52832" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/thingy52_nrf52832/Kconfig.defconfig b/boards/arm/thingy52_nrf52832/Kconfig.defconfig index d0002ec5e91c4..16031ddafc80f 100644 --- a/boards/arm/thingy52_nrf52832/Kconfig.defconfig +++ b/boards/arm/thingy52_nrf52832/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2018 Aapo Vienamo # SPDX-License-Identifier: Apache-2.0 -if BOARD_THINGY52_NRF52832 - -config BOARD - default "thingy52_nrf52832" - config BT_CTLR default BT - -endif # BOARD_THINGY52_NRF52832 diff --git a/boards/arm/thingy52_nrf52832/Kconfig.thingy52_nrf52832 b/boards/arm/thingy52_nrf52832/Kconfig.thingy52_nrf52832 new file mode 100644 index 0000000000000..a6a9880ad9eff --- /dev/null +++ b/boards/arm/thingy52_nrf52832/Kconfig.thingy52_nrf52832 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_THINGY52_NRF52832 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/thingy52_nrf52832/thingy52_nrf52832_defconfig b/boards/arm/thingy52_nrf52832/thingy52_nrf52832_defconfig index 6cdebdd6ff177..83f257e8617d5 100644 --- a/boards/arm/thingy52_nrf52832/thingy52_nrf52832_defconfig +++ b/boards/arm/thingy52_nrf52832/thingy52_nrf52832_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_THINGY52_NRF52832=y # Enable regulators CONFIG_REGULATOR=y diff --git a/boards/arm/thingy53_nrf5340/Kconfig.board b/boards/arm/thingy53_nrf5340/Kconfig.board deleted file mode 100644 index 0e472778a32a5..0000000000000 --- a/boards/arm/thingy53_nrf5340/Kconfig.board +++ /dev/null @@ -1,21 +0,0 @@ -# Thingy53 NRF5340 board configuration - -# Copyright (c) 2021 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -if SOC_NRF5340_CPUAPP_QKAA - -config BOARD_THINGY53_NRF5340_CPUAPP - bool "Thingy53 nRF5340 Application MCU" - -config BOARD_THINGY53_NRF5340_CPUAPP_NS - bool "Thingy53 nRF5340 Application MCU non-secure" - -endif # SOC_NRF5340_CPUAPP_QKAA - -if SOC_NRF5340_CPUNET_QKAA - -config BOARD_THINGY53_NRF5340_CPUNET - bool "Thingy53 nRF5340 Network MCU" - -endif # SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/thingy53_nrf5340/Kconfig.defconfig b/boards/arm/thingy53_nrf5340/Kconfig.defconfig index c5ae7da4c3bbf..0b657b3950048 100644 --- a/boards/arm/thingy53_nrf5340/Kconfig.defconfig +++ b/boards/arm/thingy53_nrf5340/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS -config BOARD - default "thingy53_nrf5340_cpuapp" - # Code Partition: # # For the secure version of the board the firmware is linked at the beginning @@ -86,9 +83,6 @@ endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS if BOARD_THINGY53_NRF5340_CPUNET -config BOARD - default "thingy53_nrf5340_cpunet" - config BT_CTLR default BT diff --git a/boards/arm/thingy53_nrf5340/Kconfig.thingy53_nrf5340_cpuapp b/boards/arm/thingy53_nrf5340/Kconfig.thingy53_nrf5340_cpuapp new file mode 100644 index 0000000000000..8f2b9ea143588 --- /dev/null +++ b/boards/arm/thingy53_nrf5340/Kconfig.thingy53_nrf5340_cpuapp @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_THINGY53_NRF5340_CPUAPP + bool + default y + select SOC_SERIES_NRF53X + select SOC_NRF5340_CPUAPP_QKAA diff --git a/boards/arm/thingy53_nrf5340/Kconfig.thingy53_nrf5340_cpuapp_ns b/boards/arm/thingy53_nrf5340/Kconfig.thingy53_nrf5340_cpuapp_ns new file mode 100644 index 0000000000000..61d4467a66d2c --- /dev/null +++ b/boards/arm/thingy53_nrf5340/Kconfig.thingy53_nrf5340_cpuapp_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_THINGY53_NRF5340_CPUAPP_NS + bool + default y + select SOC_SERIES_NRF53X + select SOC_NRF5340_CPUAPP_QKAA diff --git a/boards/arm/thingy53_nrf5340/Kconfig.thingy53_nrf5340_cpunet b/boards/arm/thingy53_nrf5340/Kconfig.thingy53_nrf5340_cpunet new file mode 100644 index 0000000000000..99388c60e4816 --- /dev/null +++ b/boards/arm/thingy53_nrf5340/Kconfig.thingy53_nrf5340_cpunet @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_THINGY53_NRF5340_CPUNET + bool + default y + select SOC_SERIES_NRF53X + select SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp_defconfig b/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp_defconfig index 04cad28c36a97..aec36b586bd22 100644 --- a/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp_defconfig +++ b/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_THINGY53_NRF5340_CPUAPP=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp_ns_defconfig b/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp_ns_defconfig index d0c90e3f0ada2..ba0115d4eac80 100644 --- a/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp_ns_defconfig +++ b/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp_ns_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpunet_defconfig b/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpunet_defconfig index 50a0e59d6529e..d8bca647a2eab 100644 --- a/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpunet_defconfig +++ b/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpunet_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUNET_QKAA=y -CONFIG_BOARD_THINGY53_NRF5340_CPUNET=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/twr_ke18f/Kconfig b/boards/arm/twr_ke18f/Kconfig index 55f834aea2098..13a49acdfc47e 100644 --- a/boards/arm/twr_ke18f/Kconfig +++ b/boards/arm/twr_ke18f/Kconfig @@ -3,11 +3,7 @@ # Copyright (c) 2019 Vestas Wind Systems A/S # SPDX-License-Identifier: Apache-2.0 -if BOARD_TWR_KE18F - config BOARD_TWR_KE18F_FLEXIO_CLKOUT bool "CLKOUT signal on FlexIO header" help Enable the CLKOUT signal on FlexIO header pin 7 (PTE10). - -endif # BOARD_TWR_KE18F diff --git a/boards/arm/twr_ke18f/Kconfig.board b/boards/arm/twr_ke18f/Kconfig.board deleted file mode 100644 index 42713ad2c5f42..0000000000000 --- a/boards/arm/twr_ke18f/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# TWR-KE18F board configuration - -# Copyright (c) 2019 Vestas Wind Systems A/S -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_TWR_KE18F - bool "NXP TWR-KE18F" - depends on SOC_SERIES_KINETIS_KE1XF - select SOC_PART_NUMBER_MKE18F512VLL16 diff --git a/boards/arm/twr_ke18f/Kconfig.defconfig b/boards/arm/twr_ke18f/Kconfig.defconfig index ddf4f9274ebde..7ee28b843db4a 100644 --- a/boards/arm/twr_ke18f/Kconfig.defconfig +++ b/boards/arm/twr_ke18f/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2019 Vestas Wind Systems A/S # SPDX-License-Identifier: Apache-2.0 -if BOARD_TWR_KE18F - -config BOARD - default "twr_ke18f" - config I2C_MCUX_LPI2C_BUS_RECOVERY default y depends on I2C_MCUX_LPI2C && PINCTRL @@ -16,5 +11,3 @@ config I2C_MCUX_LPI2C_BUS_RECOVERY # and userspace. Only enable HW stack protection if userspace is not enabled. config HW_STACK_PROTECTION default y if !USERSPACE - -endif # BOARD_TWR_KE18F diff --git a/boards/arm/twr_ke18f/Kconfig.twr_ke18f b/boards/arm/twr_ke18f/Kconfig.twr_ke18f new file mode 100644 index 0000000000000..10f4632e5a14e --- /dev/null +++ b/boards/arm/twr_ke18f/Kconfig.twr_ke18f @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_TWR_KE18F + bool + default y + select SOC_SERIES_KINETIS_KE1XF + select SOC_MKE18F16 + select SOC_PART_NUMBER_MKE18F512VLL16 diff --git a/boards/arm/twr_ke18f/twr_ke18f_defconfig b/boards/arm/twr_ke18f/twr_ke18f_defconfig index 05247818cabeb..1890a4409028d 100644 --- a/boards/arm/twr_ke18f/twr_ke18f_defconfig +++ b/boards/arm/twr_ke18f/twr_ke18f_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_KINETIS_KE1XF=y -CONFIG_SOC_MKE18F16=y -CONFIG_BOARD_TWR_KE18F=y CONFIG_SERIAL=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/twr_kv58f220m/Kconfig.board b/boards/arm/twr_kv58f220m/Kconfig.board deleted file mode 100644 index a5ee3947f3fcd..0000000000000 --- a/boards/arm/twr_kv58f220m/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# TWR-KV58F220M board configuration - -# Copyright (c) 2019 SEAL AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_TWR_KV58F220M - bool "NXP TWR-KV58F220M" - depends on SOC_SERIES_KINETIS_KV5X - select SOC_PART_NUMBER_MKV58F1M0VLQ24 diff --git a/boards/arm/twr_kv58f220m/Kconfig.defconfig b/boards/arm/twr_kv58f220m/Kconfig.defconfig index d9545c8762da5..e3b5b32c17939 100644 --- a/boards/arm/twr_kv58f220m/Kconfig.defconfig +++ b/boards/arm/twr_kv58f220m/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2019 SEAL AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_TWR_KV58F220M - -config BOARD - default "twr_kv58f220m" - config OSC_XTAL0_FREQ default 50000000 @@ -19,5 +14,3 @@ config MCG_VDIV0 config MCG_FCRDIV default 1 - -endif # BOARD_TWR_KV58F220M diff --git a/boards/arm/twr_kv58f220m/Kconfig.twr_kv58f220m b/boards/arm/twr_kv58f220m/Kconfig.twr_kv58f220m new file mode 100644 index 0000000000000..3d0244542180c --- /dev/null +++ b/boards/arm/twr_kv58f220m/Kconfig.twr_kv58f220m @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_TWR_KV58F220M + bool + default y + select SOC_SERIES_KINETIS_KV5X + select SOC_MKV58F24 + select SOC_PART_NUMBER_MKV58F1M0VLQ24 diff --git a/boards/arm/twr_kv58f220m/twr_kv58f220m_defconfig b/boards/arm/twr_kv58f220m/twr_kv58f220m_defconfig index c46bf43c2a660..88afd604b5b80 100644 --- a/boards/arm/twr_kv58f220m/twr_kv58f220m_defconfig +++ b/boards/arm/twr_kv58f220m/twr_kv58f220m_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_KINETIS_KV5X=y -CONFIG_SOC_MKV58F24=y -CONFIG_BOARD_TWR_KV58F220M=y CONFIG_SERIAL=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/arm/ubx_bmd300eval_nrf52832/Kconfig.board b/boards/arm/ubx_bmd300eval_nrf52832/Kconfig.board deleted file mode 100644 index cc5c009623b26..0000000000000 --- a/boards/arm/ubx_bmd300eval_nrf52832/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# BMD-300-EVAL, BMD-301-EVAL, and BMD-350-EVAL board configuration - -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UBX_BMD300EVAL_NRF52832 - bool "u-blox BMD-300-EVAL" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/ubx_bmd300eval_nrf52832/Kconfig.defconfig b/boards/arm/ubx_bmd300eval_nrf52832/Kconfig.defconfig index 29b0576f3e1db..ffea779d9bcee 100644 --- a/boards/arm/ubx_bmd300eval_nrf52832/Kconfig.defconfig +++ b/boards/arm/ubx_bmd300eval_nrf52832/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_UBX_BMD300EVAL_NRF52832 - -config BOARD - default "ubx_bmd300eval_nrf52832" - config BT_CTLR default BT - -endif # BOARD_UBX_BMD300EVAL_NRF52832 diff --git a/boards/arm/ubx_bmd300eval_nrf52832/Kconfig.ubx_bmd300eval_nrf52832 b/boards/arm/ubx_bmd300eval_nrf52832/Kconfig.ubx_bmd300eval_nrf52832 new file mode 100644 index 0000000000000..e3764f7b58736 --- /dev/null +++ b/boards/arm/ubx_bmd300eval_nrf52832/Kconfig.ubx_bmd300eval_nrf52832 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_BMD300EVAL_NRF52832 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/ubx_bmd300eval_nrf52832/ubx_bmd300eval_nrf52832_defconfig b/boards/arm/ubx_bmd300eval_nrf52832/ubx_bmd300eval_nrf52832_defconfig index 769e28f584699..b407b31ef3ec0 100644 --- a/boards/arm/ubx_bmd300eval_nrf52832/ubx_bmd300eval_nrf52832_defconfig +++ b/boards/arm/ubx_bmd300eval_nrf52832/ubx_bmd300eval_nrf52832_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_UBX_BMD300EVAL_NRF52832=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/ubx_bmd330eval_nrf52810/Kconfig.board b/boards/arm/ubx_bmd330eval_nrf52810/Kconfig.board deleted file mode 100644 index fa39a7e9bff2c..0000000000000 --- a/boards/arm/ubx_bmd330eval_nrf52810/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# BMD-330-EVAL board configuration - -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UBX_BMD330EVAL_NRF52810 - bool "u-blox BMD-330-EVAL" - depends on SOC_NRF52810_QFAA diff --git a/boards/arm/ubx_bmd330eval_nrf52810/Kconfig.defconfig b/boards/arm/ubx_bmd330eval_nrf52810/Kconfig.defconfig deleted file mode 100644 index 7168f408f393d..0000000000000 --- a/boards/arm/ubx_bmd330eval_nrf52810/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# BMD-330-EVAL board configuration - -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_UBX_BMD330EVAL_NRF52810 - -config BOARD - default "ubx_bmd330eval_nrf52810" - -endif # BOARD_UBX_BMD330EVAL_NRF52810 diff --git a/boards/arm/ubx_bmd330eval_nrf52810/Kconfig.ubx_bmd330eval_nrf52810 b/boards/arm/ubx_bmd330eval_nrf52810/Kconfig.ubx_bmd330eval_nrf52810 new file mode 100644 index 0000000000000..6ad1cef696c3b --- /dev/null +++ b/boards/arm/ubx_bmd330eval_nrf52810/Kconfig.ubx_bmd330eval_nrf52810 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_BMD330EVAL_NRF52810 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52810_QFAA diff --git a/boards/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810_defconfig b/boards/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810_defconfig index 6fd69454784cf..d551245e0a2e0 100644 --- a/boards/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810_defconfig +++ b/boards/arm/ubx_bmd330eval_nrf52810/ubx_bmd330eval_nrf52810_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52810_QFAA=y -CONFIG_BOARD_UBX_BMD330EVAL_NRF52810=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/ubx_bmd340eval_nrf52840/Kconfig.board b/boards/arm/ubx_bmd340eval_nrf52840/Kconfig.board deleted file mode 100644 index 538bd40ed3d06..0000000000000 --- a/boards/arm/ubx_bmd340eval_nrf52840/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# BMD-340-EVAL board configuration - -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UBX_BMD340EVAL_NRF52840 - bool "u-blox BMD-340-EVAL" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/ubx_bmd340eval_nrf52840/Kconfig.defconfig b/boards/arm/ubx_bmd340eval_nrf52840/Kconfig.defconfig index f3113a62b3a6e..46990cdd84112 100644 --- a/boards/arm/ubx_bmd340eval_nrf52840/Kconfig.defconfig +++ b/boards/arm/ubx_bmd340eval_nrf52840/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_UBX_BMD340EVAL_NRF52840 - -config BOARD - default "ubx_bmd340eval_nrf52840" - config BT_CTLR default BT - -endif # BOARD_UBX_BMD340EVAL_NRF52840 diff --git a/boards/arm/ubx_bmd340eval_nrf52840/Kconfig.ubx_bmd340eval_nrf52840 b/boards/arm/ubx_bmd340eval_nrf52840/Kconfig.ubx_bmd340eval_nrf52840 new file mode 100644 index 0000000000000..ea8801ff3b2f0 --- /dev/null +++ b/boards/arm/ubx_bmd340eval_nrf52840/Kconfig.ubx_bmd340eval_nrf52840 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_BMD340EVAL_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/ubx_bmd340eval_nrf52840/ubx_bmd340eval_nrf52840_defconfig b/boards/arm/ubx_bmd340eval_nrf52840/ubx_bmd340eval_nrf52840_defconfig index 4a1d3a6075ca2..915858997d12e 100644 --- a/boards/arm/ubx_bmd340eval_nrf52840/ubx_bmd340eval_nrf52840_defconfig +++ b/boards/arm/ubx_bmd340eval_nrf52840/ubx_bmd340eval_nrf52840_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_UBX_BMD340EVAL_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/ubx_bmd345eval_nrf52840/Kconfig.board b/boards/arm/ubx_bmd345eval_nrf52840/Kconfig.board deleted file mode 100644 index 9f6b6acc0ebba..0000000000000 --- a/boards/arm/ubx_bmd345eval_nrf52840/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# BMD-340-EVAL board configuration - -# Copyright (c) 2021 u-blox AG -# Copyright (c) 2021 Linumiz -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UBX_BMD345EVAL_NRF52840 - bool "u-blox BMD-345-EVAL" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/ubx_bmd345eval_nrf52840/Kconfig.defconfig b/boards/arm/ubx_bmd345eval_nrf52840/Kconfig.defconfig index e66bae50d8654..c71b023097d02 100644 --- a/boards/arm/ubx_bmd345eval_nrf52840/Kconfig.defconfig +++ b/boards/arm/ubx_bmd345eval_nrf52840/Kconfig.defconfig @@ -4,12 +4,5 @@ # Copyright (c) 2021 Linumiz # SPDX-License-Identifier: Apache-2.0 -if BOARD_UBX_BMD345EVAL_NRF52840 - -config BOARD - default "ubx_bmd345eval_nrf52840" - config BT_CTLR default BT - -endif # BOARD_UBX_BMD345EVAL_NRF52840 diff --git a/boards/arm/ubx_bmd345eval_nrf52840/Kconfig.ubx_bmd345eval_nrf52840 b/boards/arm/ubx_bmd345eval_nrf52840/Kconfig.ubx_bmd345eval_nrf52840 new file mode 100644 index 0000000000000..ec67d70ccd6cb --- /dev/null +++ b/boards/arm/ubx_bmd345eval_nrf52840/Kconfig.ubx_bmd345eval_nrf52840 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_BMD345EVAL_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/ubx_bmd345eval_nrf52840/ubx_bmd345eval_nrf52840_defconfig b/boards/arm/ubx_bmd345eval_nrf52840/ubx_bmd345eval_nrf52840_defconfig index 6a6d80f1b2b5f..5b5d930e5fc3b 100644 --- a/boards/arm/ubx_bmd345eval_nrf52840/ubx_bmd345eval_nrf52840_defconfig +++ b/boards/arm/ubx_bmd345eval_nrf52840/ubx_bmd345eval_nrf52840_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_UBX_BMD345EVAL_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/ubx_bmd360eval_nrf52811/Kconfig.board b/boards/arm/ubx_bmd360eval_nrf52811/Kconfig.board deleted file mode 100644 index b041fc6a2c77d..0000000000000 --- a/boards/arm/ubx_bmd360eval_nrf52811/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# BMD-360-EVAL board configuration - -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UBX_BMD360EVAL_NRF52811 - bool "u-blox BMD-360-EVAL" - depends on SOC_NRF52811_QFAA diff --git a/boards/arm/ubx_bmd360eval_nrf52811/Kconfig.defconfig b/boards/arm/ubx_bmd360eval_nrf52811/Kconfig.defconfig deleted file mode 100644 index a604bf98cd493..0000000000000 --- a/boards/arm/ubx_bmd360eval_nrf52811/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# BMD-360-EVAL board configuration - -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_UBX_BMD360EVAL_NRF52811 - -config BOARD - default "ubx_bmd360eval_nrf52811" - -endif # BOARD_UBX_BMD360EVAL_NRF52811 diff --git a/boards/arm/ubx_bmd360eval_nrf52811/Kconfig.ubx_bmd360eval_nrf52811 b/boards/arm/ubx_bmd360eval_nrf52811/Kconfig.ubx_bmd360eval_nrf52811 new file mode 100644 index 0000000000000..38dbffc2917d8 --- /dev/null +++ b/boards/arm/ubx_bmd360eval_nrf52811/Kconfig.ubx_bmd360eval_nrf52811 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_BMD360EVAL_NRF52811 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52811_QFAA diff --git a/boards/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811_defconfig b/boards/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811_defconfig index b2996dba82d50..e031630296b1f 100644 --- a/boards/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811_defconfig +++ b/boards/arm/ubx_bmd360eval_nrf52811/ubx_bmd360eval_nrf52811_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52811_QFAA=y -CONFIG_BOARD_UBX_BMD360EVAL_NRF52811=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/ubx_bmd380eval_nrf52840/Kconfig.board b/boards/arm/ubx_bmd380eval_nrf52840/Kconfig.board deleted file mode 100644 index e930b4d4ac433..0000000000000 --- a/boards/arm/ubx_bmd380eval_nrf52840/Kconfig.board +++ /dev/null @@ -1,11 +0,0 @@ -# BMD-380-EVAL board configuration - -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UBX_BMD380EVAL_NRF52840 - bool "u-blox BMD-380-EVAL" - depends on SOC_NRF52840_QIAA - -# should be CKAA, -# but SOC file not yet available from Nordic Semiconductor diff --git a/boards/arm/ubx_bmd380eval_nrf52840/Kconfig.defconfig b/boards/arm/ubx_bmd380eval_nrf52840/Kconfig.defconfig index b77590a1fdd8f..f4f1e047beeca 100644 --- a/boards/arm/ubx_bmd380eval_nrf52840/Kconfig.defconfig +++ b/boards/arm/ubx_bmd380eval_nrf52840/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_UBX_BMD380EVAL_NRF52840 - -config BOARD - default "ubx_bmd380eval_nrf52840" - config BT_CTLR default BT - -endif # BOARD_UBX_BMD380EVAL_NRF52840 diff --git a/boards/arm/ubx_bmd380eval_nrf52840/Kconfig.ubx_bmd380eval_nrf52840 b/boards/arm/ubx_bmd380eval_nrf52840/Kconfig.ubx_bmd380eval_nrf52840 new file mode 100644 index 0000000000000..808a7d741e442 --- /dev/null +++ b/boards/arm/ubx_bmd380eval_nrf52840/Kconfig.ubx_bmd380eval_nrf52840 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_BMD380EVAL_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/ubx_bmd380eval_nrf52840/ubx_bmd380eval_nrf52840_defconfig b/boards/arm/ubx_bmd380eval_nrf52840/ubx_bmd380eval_nrf52840_defconfig index d0a583edbe87e..1ede10b8e8d27 100644 --- a/boards/arm/ubx_bmd380eval_nrf52840/ubx_bmd380eval_nrf52840_defconfig +++ b/boards/arm/ubx_bmd380eval_nrf52840/ubx_bmd380eval_nrf52840_defconfig @@ -3,10 +3,7 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y # should be CKAA, but not available yet from Nordic Semiconductor -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_UBX_BMD380EVAL_NRF52840=y # Enable hardware stack protection CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/ubx_evkannab1_nrf52832/Kconfig.board b/boards/arm/ubx_evkannab1_nrf52832/Kconfig.board deleted file mode 100644 index 81a8fb291ba77..0000000000000 --- a/boards/arm/ubx_evkannab1_nrf52832/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# u-blox EVK-ANNA-B1 board configuration -# -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UBX_EVKANNAB1_NRF52832 - bool "u-blox EVK-ANNA-B1" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/ubx_evkannab1_nrf52832/Kconfig.defconfig b/boards/arm/ubx_evkannab1_nrf52832/Kconfig.defconfig index eaac8eb95d998..e13f0b05319a1 100644 --- a/boards/arm/ubx_evkannab1_nrf52832/Kconfig.defconfig +++ b/boards/arm/ubx_evkannab1_nrf52832/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_UBX_EVKANNAB1_NRF52832 - -config BOARD - default "ubx_evkannab1_nrf52832" - config BT_CTLR default BT - -endif # BOARD_UBX_EVKANNAB1_NRF52832 diff --git a/boards/arm/ubx_evkannab1_nrf52832/Kconfig.ubx_evkannab1_nrf52832 b/boards/arm/ubx_evkannab1_nrf52832/Kconfig.ubx_evkannab1_nrf52832 new file mode 100644 index 0000000000000..9e407bd102967 --- /dev/null +++ b/boards/arm/ubx_evkannab1_nrf52832/Kconfig.ubx_evkannab1_nrf52832 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_EVKANNAB1_NRF52832 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832_defconfig b/boards/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832_defconfig index 4a289cc2597c8..cf102c8fff333 100644 --- a/boards/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832_defconfig +++ b/boards/arm/ubx_evkannab1_nrf52832/ubx_evkannab1_nrf52832_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_UBX_EVKANNAB1_NRF52832=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/ubx_evkninab1_nrf52832/Kconfig.board b/boards/arm/ubx_evkninab1_nrf52832/Kconfig.board deleted file mode 100644 index e97367f358c3a..0000000000000 --- a/boards/arm/ubx_evkninab1_nrf52832/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# u-blox EVK-NINA-B1 board configuration - -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UBX_EVKNINAB1_NRF52832 - bool "u-blox EVK-NINA-B1" - depends on SOC_NRF52832_QFAA diff --git a/boards/arm/ubx_evkninab1_nrf52832/Kconfig.defconfig b/boards/arm/ubx_evkninab1_nrf52832/Kconfig.defconfig index 408147057d14d..76d3d582b60f6 100644 --- a/boards/arm/ubx_evkninab1_nrf52832/Kconfig.defconfig +++ b/boards/arm/ubx_evkninab1_nrf52832/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_UBX_EVKNINAB1_NRF52832 - -config BOARD - default "ubx_evkninab1_nrf52832" - config BT_CTLR default BT - -endif # BOARD_UBX_EVKNINAB1_NRF52832 diff --git a/boards/arm/ubx_evkninab1_nrf52832/Kconfig.ubx_evkninab1_nrf52832 b/boards/arm/ubx_evkninab1_nrf52832/Kconfig.ubx_evkninab1_nrf52832 new file mode 100644 index 0000000000000..be70a55d42224 --- /dev/null +++ b/boards/arm/ubx_evkninab1_nrf52832/Kconfig.ubx_evkninab1_nrf52832 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_EVKNINAB1_NRF52832 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_QFAA diff --git a/boards/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832_defconfig b/boards/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832_defconfig index b7064633b25b4..f38604df55ebc 100644 --- a/boards/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832_defconfig +++ b/boards/arm/ubx_evkninab1_nrf52832/ubx_evkninab1_nrf52832_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y -CONFIG_BOARD_UBX_EVKNINAB1_NRF52832=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/ubx_evkninab3_nrf52840/Kconfig.board b/boards/arm/ubx_evkninab3_nrf52840/Kconfig.board deleted file mode 100644 index ee5b2dc98b992..0000000000000 --- a/boards/arm/ubx_evkninab3_nrf52840/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# EVK-NINA-B3 board configuration - -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UBX_EVKNINAB3_NRF52840 - bool "u-blox EVK-NINA-B3" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/ubx_evkninab3_nrf52840/Kconfig.defconfig b/boards/arm/ubx_evkninab3_nrf52840/Kconfig.defconfig index e28e100e9fc2f..3bf8919b0c2d3 100644 --- a/boards/arm/ubx_evkninab3_nrf52840/Kconfig.defconfig +++ b/boards/arm/ubx_evkninab3_nrf52840/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_UBX_EVKNINAB3_NRF52840 - -config BOARD - default "ubx_evkninab3_nrf52840" - config BT_CTLR default BT - -endif # BOARD_UBX_EVKNINAB3_NRF52840 diff --git a/boards/arm/ubx_evkninab3_nrf52840/Kconfig.ubx_evkninab3_nrf52840 b/boards/arm/ubx_evkninab3_nrf52840/Kconfig.ubx_evkninab3_nrf52840 new file mode 100644 index 0000000000000..046ec24ea8c5f --- /dev/null +++ b/boards/arm/ubx_evkninab3_nrf52840/Kconfig.ubx_evkninab3_nrf52840 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_EVKNINAB3_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/ubx_evkninab3_nrf52840/ubx_evkninab3_nrf52840_defconfig b/boards/arm/ubx_evkninab3_nrf52840/ubx_evkninab3_nrf52840_defconfig index ca03d00a8e771..c5c07c3d73854 100644 --- a/boards/arm/ubx_evkninab3_nrf52840/ubx_evkninab3_nrf52840_defconfig +++ b/boards/arm/ubx_evkninab3_nrf52840/ubx_evkninab3_nrf52840_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_UBX_EVKNINAB3_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/ubx_evkninab4_nrf52833/Kconfig.board b/boards/arm/ubx_evkninab4_nrf52833/Kconfig.board deleted file mode 100644 index 0eb3268ba9e1f..0000000000000 --- a/boards/arm/ubx_evkninab4_nrf52833/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# NINA-B4 EVK board configuration -# -# Copyright (c) 2021 u-blox AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UBX_EVKNINAB4_NRF52833 - bool "u-blox EVK-NINA-B4" - depends on SOC_NRF52833_QIAA diff --git a/boards/arm/ubx_evkninab4_nrf52833/Kconfig.defconfig b/boards/arm/ubx_evkninab4_nrf52833/Kconfig.defconfig index 0e6ffbcfc5a21..7ed48a422217e 100644 --- a/boards/arm/ubx_evkninab4_nrf52833/Kconfig.defconfig +++ b/boards/arm/ubx_evkninab4_nrf52833/Kconfig.defconfig @@ -3,12 +3,5 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -if BOARD_UBX_EVKNINAB4_NRF52833 - -config BOARD - default "ubx_evkninab4_nrf52833" - config BT_CTLR default BT - -endif # BOARD_UBX_EVKNINAB4_NRF52833 diff --git a/boards/arm/ubx_evkninab4_nrf52833/Kconfig.ubx_evkninab4_nrf52833 b/boards/arm/ubx_evkninab4_nrf52833/Kconfig.ubx_evkninab4_nrf52833 new file mode 100644 index 0000000000000..ddacd865d443b --- /dev/null +++ b/boards/arm/ubx_evkninab4_nrf52833/Kconfig.ubx_evkninab4_nrf52833 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UBX_EVKNINAB4_NRF52833 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52833_QIAA diff --git a/boards/arm/ubx_evkninab4_nrf52833/ubx_evkninab4_nrf52833_defconfig b/boards/arm/ubx_evkninab4_nrf52833/ubx_evkninab4_nrf52833_defconfig index 96d9973852686..620ccf9c22473 100644 --- a/boards/arm/ubx_evkninab4_nrf52833/ubx_evkninab4_nrf52833_defconfig +++ b/boards/arm/ubx_evkninab4_nrf52833/ubx_evkninab4_nrf52833_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2021 u-blox AG # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52833_QIAA=y -CONFIG_BOARD_UBX_EVKNINAB4_NRF52833=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/udoo_neo_full_m4/Kconfig.board b/boards/arm/udoo_neo_full_m4/Kconfig.board deleted file mode 100644 index f9f67b923ed3d..0000000000000 --- a/boards/arm/udoo_neo_full_m4/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2018, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UDOO_NEO_FULL_M4 - bool "UDOO Neo Full" - depends on SOC_SERIES_IMX_6X_M4 - select SOC_PART_NUMBER_MCIMX6X4EVM10AB diff --git a/boards/arm/udoo_neo_full_m4/Kconfig.defconfig b/boards/arm/udoo_neo_full_m4/Kconfig.defconfig deleted file mode 100644 index 62636188a78da..0000000000000 --- a/boards/arm/udoo_neo_full_m4/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# UDOO Neo Full board - -# Copyright (c) 2018, NXP -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_UDOO_NEO_FULL_M4 - -config BOARD - default "udoo_neo_full_m4" - -endif # BOARD_UDOO_NEO_FULL_M4 diff --git a/boards/arm/udoo_neo_full_m4/Kconfig.udoo_neo_full_m4 b/boards/arm/udoo_neo_full_m4/Kconfig.udoo_neo_full_m4 new file mode 100644 index 0000000000000..38fecd1f84226 --- /dev/null +++ b/boards/arm/udoo_neo_full_m4/Kconfig.udoo_neo_full_m4 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UDOO_NEO_FULL_M4 + bool + default y + select SOC_MCIMX6X_M4 + select SOC_SERIES_IMX_6X_M4 + select SOC_PART_NUMBER_MCIMX6X4EVM10AB diff --git a/boards/arm/udoo_neo_full_m4/udoo_neo_full_m4_defconfig b/boards/arm/udoo_neo_full_m4/udoo_neo_full_m4_defconfig index c03d8770a7d13..140679e50c3f5 100644 --- a/boards/arm/udoo_neo_full_m4/udoo_neo_full_m4_defconfig +++ b/boards/arm/udoo_neo_full_m4/udoo_neo_full_m4_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MCIMX6X_M4=y -CONFIG_SOC_SERIES_IMX_6X_M4=y -CONFIG_BOARD_UDOO_NEO_FULL_M4=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/usb_kw24d512/Kconfig.board b/boards/arm/usb_kw24d512/Kconfig.board deleted file mode 100644 index f76553fe19d59..0000000000000 --- a/boards/arm/usb_kw24d512/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# USB-KW24D512 board - -# Copyright (c) 2017, Phytec Messtechnik GmbH -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_USB_KW24D512 - bool "NXP USB-KW24D512" - depends on SOC_SERIES_KINETIS_KWX - select SOC_PART_NUMBER_MKW24D512VHA5 diff --git a/boards/arm/usb_kw24d512/Kconfig.defconfig b/boards/arm/usb_kw24d512/Kconfig.defconfig index 373eae6292abc..4f3dbd8f5d9b5 100644 --- a/boards/arm/usb_kw24d512/Kconfig.defconfig +++ b/boards/arm/usb_kw24d512/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2017, Phytec Messtechnik GmbH # SPDX-License-Identifier: Apache-2.0 -if BOARD_USB_KW24D512 - -config BOARD - default "usb_kw24d512" - config OSC_XTAL0_FREQ # The MCU is configured to use 4 MHz external # clock from the transceiver provided at the CLK_OUT output. @@ -27,5 +22,3 @@ config MCG_FCRDIV config MCR20A_IS_PART_OF_KW2XD_SIP default y depends on IEEE802154_MCR20A - -endif # BOARD_USB_KW24D512 diff --git a/boards/arm/usb_kw24d512/Kconfig.usb_kw24d512 b/boards/arm/usb_kw24d512/Kconfig.usb_kw24d512 new file mode 100644 index 0000000000000..aabe301599de4 --- /dev/null +++ b/boards/arm/usb_kw24d512/Kconfig.usb_kw24d512 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_USB_KW24D512 + bool + default y + select SOC_MKW24D5 + select SOC_SERIES_KINETIS_KWX + select SOC_PART_NUMBER_MKW24D512VHA5 diff --git a/boards/arm/usb_kw24d512/usb_kw24d512_defconfig b/boards/arm/usb_kw24d512/usb_kw24d512_defconfig index 1d9dbb0406780..005cd998960f0 100644 --- a/boards/arm/usb_kw24d512/usb_kw24d512_defconfig +++ b/boards/arm/usb_kw24d512/usb_kw24d512_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_MKW24D5=y -CONFIG_SOC_SERIES_KINETIS_KWX=y -CONFIG_BOARD_USB_KW24D512=y CONFIG_CONSOLE=y CONFIG_RTT_CONSOLE=y CONFIG_USE_SEGGER_RTT=y diff --git a/boards/arm/v2m_beetle/Kconfig.board b/boards/arm/v2m_beetle/Kconfig.board deleted file mode 100644 index 6c0d883865dbe..0000000000000 --- a/boards/arm/v2m_beetle/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# ARM V2M Beetle Board configuration options - -# Copyright (c) 2016 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -# V2M (V2 = Versatile Express, M = Motherboard) -config BOARD_V2M_BEETLE - bool "ARM V2M Beetle Board" - depends on SOC_BEETLE_R0 diff --git a/boards/arm/v2m_beetle/Kconfig.defconfig b/boards/arm/v2m_beetle/Kconfig.defconfig index 2c88eebef3906..9a58b23a57a73 100644 --- a/boards/arm/v2m_beetle/Kconfig.defconfig +++ b/boards/arm/v2m_beetle/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2016 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_V2M_BEETLE - -config BOARD - default "v2m_beetle" - if SERIAL config UART_INTERRUPT_DRIVEN default y endif # SERIAL - -endif # BOARD_V2M_BEETLE diff --git a/boards/arm/v2m_beetle/Kconfig.v2m_beetle b/boards/arm/v2m_beetle/Kconfig.v2m_beetle new file mode 100644 index 0000000000000..8f6122626783b --- /dev/null +++ b/boards/arm/v2m_beetle/Kconfig.v2m_beetle @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_V2M_BEETLE + bool + default y + select SOC_BEETLE_R0 + select SOC_SERIES_BEETLE diff --git a/boards/arm/v2m_beetle/v2m_beetle_defconfig b/boards/arm/v2m_beetle/v2m_beetle_defconfig index 7301a8a27328a..6d3b78f3be789 100644 --- a/boards/arm/v2m_beetle/v2m_beetle_defconfig +++ b/boards/arm/v2m_beetle/v2m_beetle_defconfig @@ -6,9 +6,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_BEETLE_R0=y -CONFIG_SOC_SERIES_BEETLE=y -CONFIG_BOARD_V2M_BEETLE=y CONFIG_RUNTIME_NMI=y CONFIG_CLOCK_CONTROL=y # 24MHz system clock diff --git a/boards/arm/v2m_musca_b1/Kconfig.board b/boards/arm/v2m_musca_b1/Kconfig.board deleted file mode 100644 index 6fc98094cfd80..0000000000000 --- a/boards/arm/v2m_musca_b1/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2019 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MUSCA_B1 - bool "ARM Cortex-M33 SMM on V2M-MUSCA" - depends on SOC_SERIES_MUSCA_B1 diff --git a/boards/arm/v2m_musca_b1/Kconfig.defconfig b/boards/arm/v2m_musca_b1/Kconfig.defconfig index efed150bdbff7..73676b1e596ed 100644 --- a/boards/arm/v2m_musca_b1/Kconfig.defconfig +++ b/boards/arm/v2m_musca_b1/Kconfig.defconfig @@ -1,12 +1,6 @@ # Copyright (c) 2019 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_MUSCA_B1 - -config BOARD - default "musca_b1" if TRUSTED_EXECUTION_SECURE || !TRUSTED_EXECUTION_NONSECURE - default "musca_b1_ns" - if SERIAL config UART_INTERRUPT_DRIVEN @@ -20,5 +14,3 @@ config IPM_MHU default y endif # IPM - -endif diff --git a/boards/arm/v2m_musca_b1/Kconfig.v2m_musca_b1 b/boards/arm/v2m_musca_b1/Kconfig.v2m_musca_b1 new file mode 100644 index 0000000000000..cf8039dfa6d05 --- /dev/null +++ b/boards/arm/v2m_musca_b1/Kconfig.v2m_musca_b1 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_V2M_MUSCA_B1 + bool + default y + select SOC_SERIES_MUSCA_B1 + select SOC_V2M_MUSCA_B1 diff --git a/boards/arm/v2m_musca_b1/Kconfig.v2m_musca_b1_ns b/boards/arm/v2m_musca_b1/Kconfig.v2m_musca_b1_ns new file mode 100644 index 0000000000000..3538347addc44 --- /dev/null +++ b/boards/arm/v2m_musca_b1/Kconfig.v2m_musca_b1_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_V2M_MUSCA_B1_NS + bool + default y + select SOC_SERIES_MUSCA_B1 + select SOC_V2M_MUSCA_B1 diff --git a/boards/arm/v2m_musca_b1/v2m_musca_b1_defconfig b/boards/arm/v2m_musca_b1/v2m_musca_b1_defconfig index d6f7a3876d193..b04afd5915d38 100644 --- a/boards/arm/v2m_musca_b1/v2m_musca_b1_defconfig +++ b/boards/arm/v2m_musca_b1/v2m_musca_b1_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_MUSCA_B1=y -CONFIG_SOC_V2M_MUSCA_B1=y CONFIG_RUNTIME_NMI=y CONFIG_ARM_TRUSTZONE_M=y CONFIG_ARM_MPU=y diff --git a/boards/arm/v2m_musca_b1/v2m_musca_b1_ns_defconfig b/boards/arm/v2m_musca_b1/v2m_musca_b1_ns_defconfig index b782032beffe6..3faa402f46f45 100644 --- a/boards/arm/v2m_musca_b1/v2m_musca_b1_ns_defconfig +++ b/boards/arm/v2m_musca_b1/v2m_musca_b1_ns_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_MUSCA_B1=y -CONFIG_SOC_V2M_MUSCA_B1=y CONFIG_ARM_TRUSTZONE_M=y CONFIG_RUNTIME_NMI=y CONFIG_TRUSTED_EXECUTION_NONSECURE=y diff --git a/boards/arm/v2m_musca_s1/Kconfig.board b/boards/arm/v2m_musca_s1/Kconfig.board deleted file mode 100644 index 81261ba47bf18..0000000000000 --- a/boards/arm/v2m_musca_s1/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2019-2020 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MUSCA_S1 - bool "ARM Cortex-M33 SMM on V2M-MUSCA-S1" - depends on SOC_SERIES_MUSCA_S1 diff --git a/boards/arm/v2m_musca_s1/Kconfig.defconfig b/boards/arm/v2m_musca_s1/Kconfig.defconfig index 0c48683f3ca23..4c286bdee7caa 100644 --- a/boards/arm/v2m_musca_s1/Kconfig.defconfig +++ b/boards/arm/v2m_musca_s1/Kconfig.defconfig @@ -1,12 +1,6 @@ # Copyright (c) 2019-2020 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_MUSCA_S1 - -config BOARD - default "musca_s1" if TRUSTED_EXECUTION_SECURE || !TRUSTED_EXECUTION_NONSECURE - default "musca_s1_ns" - if SERIAL config UART_INTERRUPT_DRIVEN @@ -20,5 +14,3 @@ config IPM_MHU default y endif # IPM - -endif diff --git a/boards/arm/v2m_musca_s1/Kconfig.v2m_musca_s1 b/boards/arm/v2m_musca_s1/Kconfig.v2m_musca_s1 new file mode 100644 index 0000000000000..1cad81bed0fb4 --- /dev/null +++ b/boards/arm/v2m_musca_s1/Kconfig.v2m_musca_s1 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_V2M_MUSCA_S1 + bool + default y + select SOC_SERIES_MUSCA_S1 + select SOC_V2M_MUSCA_S1 diff --git a/boards/arm/v2m_musca_s1/Kconfig.v2m_musca_s1_ns b/boards/arm/v2m_musca_s1/Kconfig.v2m_musca_s1_ns new file mode 100644 index 0000000000000..1f72bcd7492f0 --- /dev/null +++ b/boards/arm/v2m_musca_s1/Kconfig.v2m_musca_s1_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_V2M_MUSCA_S1_NS + bool + default y + select SOC_SERIES_MUSCA_S1 + select SOC_V2M_MUSCA_S1 diff --git a/boards/arm/v2m_musca_s1/v2m_musca_s1_defconfig b/boards/arm/v2m_musca_s1/v2m_musca_s1_defconfig index dd2b349173649..59601296cfae3 100644 --- a/boards/arm/v2m_musca_s1/v2m_musca_s1_defconfig +++ b/boards/arm/v2m_musca_s1/v2m_musca_s1_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_MUSCA_S1=y -CONFIG_SOC_V2M_MUSCA_S1=y CONFIG_RUNTIME_NMI=y CONFIG_ARM_TRUSTZONE_M=y CONFIG_ARM_MPU=y diff --git a/boards/arm/v2m_musca_s1/v2m_musca_s1_ns_defconfig b/boards/arm/v2m_musca_s1/v2m_musca_s1_ns_defconfig index 146db80b6f8f9..3653f77de0aac 100644 --- a/boards/arm/v2m_musca_s1/v2m_musca_s1_ns_defconfig +++ b/boards/arm/v2m_musca_s1/v2m_musca_s1_ns_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_MUSCA_S1=y -CONFIG_SOC_V2M_MUSCA_S1=y CONFIG_ARM_TRUSTZONE_M=y CONFIG_RUNTIME_NMI=y CONFIG_TRUSTED_EXECUTION_NONSECURE=y diff --git a/boards/arm/warp7_m4/Kconfig.board b/boards/arm/warp7_m4/Kconfig.board deleted file mode 100644 index 14ab7c1023f88..0000000000000 --- a/boards/arm/warp7_m4/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# WaRP7 iMX7S M4 board - -# Copyright (c) 2018, Diego Sueiro -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_WARP7_M4 - bool "WaRP7 iMX7 Solo" - depends on SOC_SERIES_IMX7_M4 - select SOC_PART_NUMBER_MCIMX7S3DVK08SA diff --git a/boards/arm/warp7_m4/Kconfig.defconfig b/boards/arm/warp7_m4/Kconfig.defconfig index 6086acb474b83..e24d90b4ad349 100644 --- a/boards/arm/warp7_m4/Kconfig.defconfig +++ b/boards/arm/warp7_m4/Kconfig.defconfig @@ -3,11 +3,6 @@ # Copyright (c) 2018, Diego Sueiro # SPDX-License-Identifier: Apache-2.0 -if BOARD_WARP7_M4 - -config BOARD - default "warp7_m4" - config FXOS8700_DRDY_INT1 default y depends on FXOS8700_TRIGGER @@ -17,10 +12,11 @@ config FXAS21002_DRDY_INT1 depends on FXAS21002_TRIGGER if !XIP + config FLASH_SIZE default 0 + config FLASH_BASE_ADDRESS default 0 -endif -endif # BOARD_WARP7_M4 +endif diff --git a/boards/arm/warp7_m4/Kconfig.warp7_m4 b/boards/arm/warp7_m4/Kconfig.warp7_m4 new file mode 100644 index 0000000000000..0af44c605d891 --- /dev/null +++ b/boards/arm/warp7_m4/Kconfig.warp7_m4 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_WARP7_M4 + bool + default y + select SOC_SERIES_IMX7_M4 + select SOC_MCIMX7_M4 + select SOC_PART_NUMBER_MCIMX7S3DVK08SA diff --git a/boards/arm/warp7_m4/warp7_m4_defconfig b/boards/arm/warp7_m4/warp7_m4_defconfig index 25281eb93ac27..b62210da43e09 100644 --- a/boards/arm/warp7_m4/warp7_m4_defconfig +++ b/boards/arm/warp7_m4/warp7_m4_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_SERIES_IMX7_M4=y -CONFIG_SOC_MCIMX7_M4=y -CONFIG_BOARD_WARP7_M4=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/boards/arm/waveshare_open103z/Kconfig.board b/boards/arm/waveshare_open103z/Kconfig.board deleted file mode 100644 index ea48f05c767ae..0000000000000 --- a/boards/arm/waveshare_open103z/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Waveshare Open103Z board configuration - -# Copyright (c) 2020 Stefano Manni -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_WAVESHARE_OPEN103Z - bool "Waveshare OPEN103Z Development Board" - depends on SOC_STM32F103XE diff --git a/boards/arm/waveshare_open103z/Kconfig.defconfig b/boards/arm/waveshare_open103z/Kconfig.defconfig deleted file mode 100644 index 4a2b56b826ae2..0000000000000 --- a/boards/arm/waveshare_open103z/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Waveshare Open103Z board configuration - -# Copyright (c) 2020 Stefano Manni -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_WAVESHARE_OPEN103Z - -config BOARD - default "waveshare_open103z" - -endif # BOARD_WAVESHARE_OPEN103Z diff --git a/boards/arm/waveshare_open103z/Kconfig.waveshare_open103z b/boards/arm/waveshare_open103z/Kconfig.waveshare_open103z new file mode 100644 index 0000000000000..4a362e129ee2b --- /dev/null +++ b/boards/arm/waveshare_open103z/Kconfig.waveshare_open103z @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_WAVESHARE_OPEN103Z + bool + default y + select SOC_SERIES_STM32F1X + select SOC_STM32F103XE diff --git a/boards/arm/waveshare_open103z/waveshare_open103z_defconfig b/boards/arm/waveshare_open103z/waveshare_open103z_defconfig index 765fc062bd7db..b5ca2afbd5f90 100644 --- a/boards/arm/waveshare_open103z/waveshare_open103z_defconfig +++ b/boards/arm/waveshare_open103z/waveshare_open103z_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F103XE=y # enable uart driver CONFIG_SERIAL=y diff --git a/boards/arm/we_ophelia1ev_nrf52805/Kconfig.board b/boards/arm/we_ophelia1ev_nrf52805/Kconfig.board deleted file mode 100644 index c2709b066bb5c..0000000000000 --- a/boards/arm/we_ophelia1ev_nrf52805/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_WE_OPHELIA1EV_NRF52805 - bool "we_ophelia1ev_nrf52805" - depends on SOC_NRF52805_CAAA diff --git a/boards/arm/we_ophelia1ev_nrf52805/Kconfig.defconfig b/boards/arm/we_ophelia1ev_nrf52805/Kconfig.defconfig index b0a71cc39493c..bc9d9713d5c92 100644 --- a/boards/arm/we_ophelia1ev_nrf52805/Kconfig.defconfig +++ b/boards/arm/we_ophelia1ev_nrf52805/Kconfig.defconfig @@ -1,12 +1,5 @@ # Copyright (c) 2022 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_WE_OPHELIA1EV_NRF52805 - -config BOARD - default "we_ophelia1ev_nrf52805" - config BT_CTLR default BT - -endif diff --git a/boards/arm/we_ophelia1ev_nrf52805/Kconfig.we_ophelia1ev_nrf52805 b/boards/arm/we_ophelia1ev_nrf52805/Kconfig.we_ophelia1ev_nrf52805 new file mode 100644 index 0000000000000..d85062a35f830 --- /dev/null +++ b/boards/arm/we_ophelia1ev_nrf52805/Kconfig.we_ophelia1ev_nrf52805 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_WE_OPHELIA1EV_NRF52805 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52805_CAAA diff --git a/boards/arm/we_ophelia1ev_nrf52805/we_ophelia1ev_nrf52805_defconfig b/boards/arm/we_ophelia1ev_nrf52805/we_ophelia1ev_nrf52805_defconfig index d1a44910ced99..cd273f3b0c111 100644 --- a/boards/arm/we_ophelia1ev_nrf52805/we_ophelia1ev_nrf52805_defconfig +++ b/boards/arm/we_ophelia1ev_nrf52805/we_ophelia1ev_nrf52805_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2022 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52805_CAAA=y -CONFIG_BOARD_WE_OPHELIA1EV_NRF52805=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/we_proteus2ev_nrf52832/Kconfig b/boards/arm/we_proteus2ev_nrf52832/Kconfig index f0729af5c1fd0..b2d3164bdb218 100644 --- a/boards/arm/we_proteus2ev_nrf52832/Kconfig +++ b/boards/arm/we_proteus2ev_nrf52832/Kconfig @@ -3,12 +3,8 @@ # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_WE_PROTEUS2EV_NRF52832 - config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X default y depends on BOARD_WE_PROTEUS2EV_NRF52832 - -endif # BOARD_WE_PROTEUS2EV_NRF52832 diff --git a/boards/arm/we_proteus2ev_nrf52832/Kconfig.board b/boards/arm/we_proteus2ev_nrf52832/Kconfig.board deleted file mode 100644 index 98f30de1fee7b..0000000000000 --- a/boards/arm/we_proteus2ev_nrf52832/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_WE_PROTEUS2EV_NRF52832 - bool "we_proteus2ev_nrf52832" - depends on SOC_NRF52832_CIAA diff --git a/boards/arm/we_proteus2ev_nrf52832/Kconfig.defconfig b/boards/arm/we_proteus2ev_nrf52832/Kconfig.defconfig index 52437ae72dbd1..bc9d9713d5c92 100644 --- a/boards/arm/we_proteus2ev_nrf52832/Kconfig.defconfig +++ b/boards/arm/we_proteus2ev_nrf52832/Kconfig.defconfig @@ -1,12 +1,5 @@ # Copyright (c) 2022 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_WE_PROTEUS2EV_NRF52832 - -config BOARD - default "we_proteus2ev_nrf52832" - config BT_CTLR default BT - -endif diff --git a/boards/arm/we_proteus2ev_nrf52832/Kconfig.we_proteus2ev_nrf52832 b/boards/arm/we_proteus2ev_nrf52832/Kconfig.we_proteus2ev_nrf52832 new file mode 100644 index 0000000000000..887d7502ee3e0 --- /dev/null +++ b/boards/arm/we_proteus2ev_nrf52832/Kconfig.we_proteus2ev_nrf52832 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_WE_PROTEUS2EV_NRF52832 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52832_CIAA diff --git a/boards/arm/we_proteus2ev_nrf52832/we_proteus2ev_nrf52832_defconfig b/boards/arm/we_proteus2ev_nrf52832/we_proteus2ev_nrf52832_defconfig index ab2356cf412c6..a099d976ff86e 100644 --- a/boards/arm/we_proteus2ev_nrf52832/we_proteus2ev_nrf52832_defconfig +++ b/boards/arm/we_proteus2ev_nrf52832/we_proteus2ev_nrf52832_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2022 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_CIAA=y -CONFIG_BOARD_WE_PROTEUS2EV_NRF52832=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/we_proteus3ev_nrf52840/Kconfig b/boards/arm/we_proteus3ev_nrf52840/Kconfig index 415c14238bf27..3ce4a96f1120b 100644 --- a/boards/arm/we_proteus3ev_nrf52840/Kconfig +++ b/boards/arm/we_proteus3ev_nrf52840/Kconfig @@ -3,8 +3,6 @@ # Copyright (c) 2016 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_WE_PROTEUS3EV_NRF52840 - config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X @@ -14,5 +12,3 @@ config BOARD_ENABLE_DCDC_HV bool "High Voltage DCDC converter" select SOC_DCDC_NRF52X_HV default y - -endif # BOARD_WE_PROTEUS3EV_NRF52840 diff --git a/boards/arm/we_proteus3ev_nrf52840/Kconfig.board b/boards/arm/we_proteus3ev_nrf52840/Kconfig.board deleted file mode 100644 index e59eb93e9c239..0000000000000 --- a/boards/arm/we_proteus3ev_nrf52840/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_WE_PROTEUS3EV_NRF52840 - bool "we_proteus3ev_nrf52840" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/we_proteus3ev_nrf52840/Kconfig.defconfig b/boards/arm/we_proteus3ev_nrf52840/Kconfig.defconfig index 8e1fa9443b4ba..bc9d9713d5c92 100644 --- a/boards/arm/we_proteus3ev_nrf52840/Kconfig.defconfig +++ b/boards/arm/we_proteus3ev_nrf52840/Kconfig.defconfig @@ -1,12 +1,5 @@ # Copyright (c) 2022 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_WE_PROTEUS3EV_NRF52840 - -config BOARD - default "we_proteus3ev_nrf52840" - config BT_CTLR default BT - -endif diff --git a/boards/arm/we_proteus3ev_nrf52840/Kconfig.we_proteus3ev_nrf52840 b/boards/arm/we_proteus3ev_nrf52840/Kconfig.we_proteus3ev_nrf52840 new file mode 100644 index 0000000000000..7cc3349b7fd5d --- /dev/null +++ b/boards/arm/we_proteus3ev_nrf52840/Kconfig.we_proteus3ev_nrf52840 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_WE_PROTEUS3EV_NRF52840 + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/we_proteus3ev_nrf52840/we_proteus3ev_nrf52840_defconfig b/boards/arm/we_proteus3ev_nrf52840/we_proteus3ev_nrf52840_defconfig index b232a355e4016..a099d976ff86e 100644 --- a/boards/arm/we_proteus3ev_nrf52840/we_proteus3ev_nrf52840_defconfig +++ b/boards/arm/we_proteus3ev_nrf52840/we_proteus3ev_nrf52840_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2022 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_WE_PROTEUS3EV_NRF52840=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/xiao_ble/Kconfig b/boards/arm/xiao_ble/Kconfig index 0250a94850edd..af4ecf80ce03a 100644 --- a/boards/arm/xiao_ble/Kconfig +++ b/boards/arm/xiao_ble/Kconfig @@ -3,8 +3,6 @@ # Copyright (c) 2022 Marcin Niestroj # SPDX-License-Identifier: Apache-2.0 -if BOARD_XIAO_BLE - config BOARD_ENABLE_DCDC bool "DCDC mode" select SOC_DCDC_NRF52X @@ -14,5 +12,3 @@ config BOARD_ENABLE_DCDC_HV bool "High Voltage DCDC converter" select SOC_DCDC_NRF52X_HV default y - -endif # BOARD_XIAO_BLE diff --git a/boards/arm/xiao_ble/Kconfig.board b/boards/arm/xiao_ble/Kconfig.board deleted file mode 100644 index ca317fd24510e..0000000000000 --- a/boards/arm/xiao_ble/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# XIAO BLE board configuration - -# Copyright (c) 2022 Marcin Niestroj -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_XIAO_BLE - bool "XIAO BLE" - depends on SOC_NRF52840_QIAA diff --git a/boards/arm/xiao_ble/Kconfig.defconfig b/boards/arm/xiao_ble/Kconfig.defconfig index e0e6dbc28e89c..75a442d022980 100644 --- a/boards/arm/xiao_ble/Kconfig.defconfig +++ b/boards/arm/xiao_ble/Kconfig.defconfig @@ -3,16 +3,9 @@ # Copyright (c) 2022 Marcin Niestroj # SPDX-License-Identifier: Apache-2.0 -if BOARD_XIAO_BLE - -config BOARD - default "xiao_ble" - config BT_CTLR default BT -endif # BOARD_XIAO_BLE - if USB_DEVICE_STACK config UART_CONSOLE diff --git a/boards/arm/xiao_ble/Kconfig.xiao_ble b/boards/arm/xiao_ble/Kconfig.xiao_ble new file mode 100644 index 0000000000000..d0d2dff3f4472 --- /dev/null +++ b/boards/arm/xiao_ble/Kconfig.xiao_ble @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_XIAO_BLE + bool + default y + select SOC_SERIES_NRF52X + select SOC_NRF52840_QIAA diff --git a/boards/arm/xiao_ble/xiao_ble_defconfig b/boards/arm/xiao_ble/xiao_ble_defconfig index ac0a5b9bb2261..66209c2d9579c 100644 --- a/boards/arm/xiao_ble/xiao_ble_defconfig +++ b/boards/arm/xiao_ble/xiao_ble_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_XIAO_BLE=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/xmc45_relax_kit/Kconfig.board b/boards/arm/xmc45_relax_kit/Kconfig.board deleted file mode 100644 index 6be8d36685926..0000000000000 --- a/boards/arm/xmc45_relax_kit/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright (c) 2020 Linumiz -# Author: Parthiban Nallathambi - -config BOARD_XMC45_RELAX_KIT - bool "Infineon Relax Kit" - depends on SOC_SERIES_XMC_4XXX - select SOC_PART_NUMBER_F100X1024 diff --git a/boards/arm/xmc45_relax_kit/Kconfig.defconfig b/boards/arm/xmc45_relax_kit/Kconfig.defconfig deleted file mode 100644 index e6f0add4859f2..0000000000000 --- a/boards/arm/xmc45_relax_kit/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright (c) 2020 Linumiz -# Author: Parthiban Nallathambi - -if BOARD_XMC45_RELAX_KIT - -config BOARD - default "xmc45_relax_kit" - -endif # BOARD_XMC45_RELAX_KIT diff --git a/boards/arm/xmc45_relax_kit/Kconfig.xmc45_relax_kit b/boards/arm/xmc45_relax_kit/Kconfig.xmc45_relax_kit new file mode 100644 index 0000000000000..5f8e3cc46b0e7 --- /dev/null +++ b/boards/arm/xmc45_relax_kit/Kconfig.xmc45_relax_kit @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_XMC45_RELAX_KIT + bool + default y + select SOC_SERIES_XMC_4XXX + select SOC_XMC4500 + select SOC_PART_NUMBER_F100X1024 diff --git a/boards/arm/xmc45_relax_kit/xmc45_relax_kit_defconfig b/boards/arm/xmc45_relax_kit/xmc45_relax_kit_defconfig index d09521e699299..23aaf543315d9 100644 --- a/boards/arm/xmc45_relax_kit/xmc45_relax_kit_defconfig +++ b/boards/arm/xmc45_relax_kit/xmc45_relax_kit_defconfig @@ -3,9 +3,6 @@ # Copyright (c) 2020 Linumiz # Author: Parthiban Nallathambi -CONFIG_BOARD_XMC45_RELAX_KIT=y -CONFIG_SOC_SERIES_XMC_4XXX=y -CONFIG_SOC_XMC4500=y CONFIG_ARM_MPU=y # enable uart driver diff --git a/boards/arm/zybo/Kconfig.board b/boards/arm/zybo/Kconfig.board deleted file mode 100644 index 30dfd50f3da38..0000000000000 --- a/boards/arm/zybo/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Digilent Zybo board configuration - -# Copyright (c) 2022 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ZYBO - bool "Digilent Zybo" - depends on SOC_XILINX_XC7Z010 diff --git a/boards/arm/zybo/Kconfig.defconfig b/boards/arm/zybo/Kconfig.defconfig deleted file mode 100644 index ea8ddb6a62a45..0000000000000 --- a/boards/arm/zybo/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Digilent Zybo board - -# Copyright (c) 2022 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_ZYBO - -config BOARD - default "zybo" - -endif # BOARD_ZYBO diff --git a/boards/arm/zybo/Kconfig.zybo b/boards/arm/zybo/Kconfig.zybo new file mode 100644 index 0000000000000..a00b0b293b316 --- /dev/null +++ b/boards/arm/zybo/Kconfig.zybo @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ZYBO + bool + default y + select SOC_SERIES_XILINX_XC7ZXXX + select SOC_XILINX_XC7Z010 diff --git a/boards/arm/zybo/zybo_defconfig b/boards/arm/zybo/zybo_defconfig index ad4d88eaee358..8d76bdf310f66 100644 --- a/boards/arm/zybo/zybo_defconfig +++ b/boards/arm/zybo/zybo_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_XILINX_XC7ZXXX=y -CONFIG_SOC_XILINX_XC7Z010=y -CONFIG_BOARD_ZYBO=y # The GTC is always clocked at 1/2 of the CPU frequency (CPU_3x2x) CONFIG_ARM_ARCH_TIMER=y diff --git a/boards/arm64/bcm958402m2_a72/Kconfig.bcm958402m2_a72 b/boards/arm64/bcm958402m2_a72/Kconfig.bcm958402m2_a72 new file mode 100644 index 0000000000000..fc85815a05108 --- /dev/null +++ b/boards/arm64/bcm958402m2_a72/Kconfig.bcm958402m2_a72 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BCM958402M2_A72 + bool + default y + select SOC_SERIES_VIPER + select SOC_BCM58402_A72 diff --git a/boards/arm64/bcm958402m2_a72/Kconfig.board b/boards/arm64/bcm958402m2_a72/Kconfig.board deleted file mode 100644 index 655d894e4d5a7..0000000000000 --- a/boards/arm64/bcm958402m2_a72/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2020 Broadcom -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BCM958402M2_A72 - bool "Broadcom Viper BCM958402M2_A72" - depends on SOC_BCM58402_A72 diff --git a/boards/arm64/bcm958402m2_a72/Kconfig.defconfig b/boards/arm64/bcm958402m2_a72/Kconfig.defconfig deleted file mode 100644 index 8f7714ab9f30b..0000000000000 --- a/boards/arm64/bcm958402m2_a72/Kconfig.defconfig +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2020 Broadcom -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "bcm958402m2_a72" - depends on BOARD_BCM958402M2_A72 diff --git a/boards/arm64/bcm958402m2_a72/bcm958402m2_a72_defconfig b/boards/arm64/bcm958402m2_a72/bcm958402m2_a72_defconfig index 6f758f867d9d9..e7b8f00265b77 100644 --- a/boards/arm64/bcm958402m2_a72/bcm958402m2_a72_defconfig +++ b/boards/arm64/bcm958402m2_a72/bcm958402m2_a72_defconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # Platform Configuration -CONFIG_SOC_SERIES_VIPER=y -CONFIG_SOC_BCM58402_A72=y -CONFIG_BOARD_BCM958402M2_A72=y CONFIG_ARM64_VA_BITS_36=y CONFIG_ARM64_PA_BITS_36=y diff --git a/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.board b/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.board deleted file mode 100644 index dbc0bf5ac7db5..0000000000000 --- a/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Carlo Caione -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_FVP_BASE_REVC_2XAEMV8A - bool "FVP Base RevC AEMv8A simulation board" - depends on SOC_FVP_BASE_REVC_2XAEMV8A diff --git a/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.defconfig b/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.defconfig index bfbb54fb049c8..b58354db365e4 100644 --- a/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.defconfig +++ b/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.defconfig @@ -1,12 +1,5 @@ # Copyright (c) 2021 Carlo Caione # SPDX-License-Identifier: Apache-2.0 -if BOARD_FVP_BASE_REVC_2XAEMV8A - config BUILD_OUTPUT_BIN default y - -config BOARD - default "fvp_base_revc_2xaemv8a" - -endif # BOARD_FVP_BASE_REVC_2XAEMV8A diff --git a/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.fvp_base_revc_2xaemv8a b/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.fvp_base_revc_2xaemv8a new file mode 100644 index 0000000000000..791f8bec21457 --- /dev/null +++ b/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.fvp_base_revc_2xaemv8a @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_FVP_BASE_REVC_2XAEMV8A + bool + default y + select SOC_SERIES_FVP_AEMV8A + select SOC_FVP_BASE_REVC_2XAEMV8A diff --git a/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.fvp_base_revc_2xaemv8a_smp_ns b/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.fvp_base_revc_2xaemv8a_smp_ns new file mode 100644 index 0000000000000..adcf7462e5864 --- /dev/null +++ b/boards/arm64/fvp_base_revc_2xaemv8a/Kconfig.fvp_base_revc_2xaemv8a_smp_ns @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_FVP_BASE_REVC_2XAEMV8A_SMP_NS + bool + default y + select SOC_SERIES_FVP_AEMV8A + select SOC_FVP_BASE_REVC_2XAEMV8A diff --git a/boards/arm64/fvp_base_revc_2xaemv8a/fvp_base_revc_2xaemv8a_defconfig b/boards/arm64/fvp_base_revc_2xaemv8a/fvp_base_revc_2xaemv8a_defconfig index 159682f9295d6..2af7de4e8137a 100644 --- a/boards/arm64/fvp_base_revc_2xaemv8a/fvp_base_revc_2xaemv8a_defconfig +++ b/boards/arm64/fvp_base_revc_2xaemv8a/fvp_base_revc_2xaemv8a_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2021 Carlo Caione # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_FVP_AEMV8A=y -CONFIG_SOC_FVP_BASE_REVC_2XAEMV8A=y -CONFIG_BOARD_FVP_BASE_REVC_2XAEMV8A=y CONFIG_XIP=n diff --git a/boards/arm64/fvp_base_revc_2xaemv8a/fvp_base_revc_2xaemv8a_smp_ns_defconfig b/boards/arm64/fvp_base_revc_2xaemv8a/fvp_base_revc_2xaemv8a_smp_ns_defconfig index a7ec7e0e6e4d3..0e6e30702dac3 100644 --- a/boards/arm64/fvp_base_revc_2xaemv8a/fvp_base_revc_2xaemv8a_smp_ns_defconfig +++ b/boards/arm64/fvp_base_revc_2xaemv8a/fvp_base_revc_2xaemv8a_smp_ns_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022 Arm Limited (or its affiliates). All rights reserved. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_FVP_AEMV8A=y -CONFIG_SOC_FVP_BASE_REVC_2XAEMV8A=y -CONFIG_BOARD_FVP_BASE_REVC_2XAEMV8A=y - CONFIG_THREAD_STACK_INFO=y # Enable Timer and Sys clock diff --git a/boards/arm64/fvp_baser_aemv8r/Kconfig.board b/boards/arm64/fvp_baser_aemv8r/Kconfig.board deleted file mode 100644 index 3b0c7ba708197..0000000000000 --- a/boards/arm64/fvp_baser_aemv8r/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_FVP_BASER_AEMV8R - bool "FVP BaseR AEMv8R simulation board" - depends on SOC_FVP_AEMV8R_AARCH64 diff --git a/boards/arm64/fvp_baser_aemv8r/Kconfig.defconfig b/boards/arm64/fvp_baser_aemv8r/Kconfig.defconfig index 89a9b37380385..289bf00ca1b58 100644 --- a/boards/arm64/fvp_baser_aemv8r/Kconfig.defconfig +++ b/boards/arm64/fvp_baser_aemv8r/Kconfig.defconfig @@ -1,12 +1,5 @@ # Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if BOARD_FVP_BASER_AEMV8R - config BUILD_OUTPUT_BIN default y - -config BOARD - default "fvp_baser_aemv8r" - -endif # BOARD_FVP_BASER_AEMV8R diff --git a/boards/arm64/fvp_baser_aemv8r/Kconfig.fvp_baser_aemv8r b/boards/arm64/fvp_baser_aemv8r/Kconfig.fvp_baser_aemv8r new file mode 100644 index 0000000000000..38b5c50e1524f --- /dev/null +++ b/boards/arm64/fvp_baser_aemv8r/Kconfig.fvp_baser_aemv8r @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_FVP_BASER_AEMV8R + bool + default y + select SOC_SERIES_FVP_AEMV8R + select SOC_FVP_AEMV8R_AARCH64 diff --git a/boards/arm64/fvp_baser_aemv8r/Kconfig.fvp_baser_aemv8r_smp b/boards/arm64/fvp_baser_aemv8r/Kconfig.fvp_baser_aemv8r_smp new file mode 100644 index 0000000000000..6d8ad660fb5ce --- /dev/null +++ b/boards/arm64/fvp_baser_aemv8r/Kconfig.fvp_baser_aemv8r_smp @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_FVP_BASER_AEMV8R_SMP + bool + default y + select SOC_SERIES_FVP_AEMV8R + select SOC_FVP_AEMV8R_AARCH64 diff --git a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_defconfig b/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_defconfig index 7876a7453279f..fb029e44ab54e 100644 --- a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_defconfig +++ b/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_FVP_AEMV8R=y -CONFIG_SOC_FVP_AEMV8R_AARCH64=y -CONFIG_BOARD_FVP_BASER_AEMV8R=y - # Cache management CONFIG_CACHE_MANAGEMENT=y diff --git a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp_defconfig b/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp_defconfig index bdd2cac9e9027..ead062ef4ea0a 100644 --- a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp_defconfig +++ b/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_FVP_AEMV8R=y -CONFIG_SOC_FVP_AEMV8R_AARCH64=y -CONFIG_BOARD_FVP_BASER_AEMV8R=y - # Cache management CONFIG_CACHE_MANAGEMENT=y diff --git a/boards/arm64/intel_socfpga_agilex_socdk/Kconfig.board b/boards/arm64/intel_socfpga_agilex_socdk/Kconfig.board deleted file mode 100644 index 7dcc7b1e7a52c..0000000000000 --- a/boards/arm64/intel_socfpga_agilex_socdk/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_SOCFPGA_AGILEX_SOCDK - bool "Intel SoC FPGA Development Kit (Agilex)" - depends on SOC_AGILEX diff --git a/boards/arm64/intel_socfpga_agilex_socdk/Kconfig.defconfig b/boards/arm64/intel_socfpga_agilex_socdk/Kconfig.defconfig deleted file mode 100644 index 58c3bddb5a198..0000000000000 --- a/boards/arm64/intel_socfpga_agilex_socdk/Kconfig.defconfig +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "intel_socfpga_agilex_socdk" - depends on BOARD_INTEL_SOCFPGA_AGILEX_SOCDK diff --git a/boards/arm64/intel_socfpga_agilex_socdk/Kconfig.intel_socfpga_agilex_socdk b/boards/arm64/intel_socfpga_agilex_socdk/Kconfig.intel_socfpga_agilex_socdk new file mode 100644 index 0000000000000..bac528ddcd9d0 --- /dev/null +++ b/boards/arm64/intel_socfpga_agilex_socdk/Kconfig.intel_socfpga_agilex_socdk @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_SOCFPGA_AGILEX_SOCDK + bool + default y + select SOC_SERIES_AGILEX + select SOC_AGILEX diff --git a/boards/arm64/intel_socfpga_agilex_socdk/intel_socfpga_agilex_socdk_defconfig b/boards/arm64/intel_socfpga_agilex_socdk/intel_socfpga_agilex_socdk_defconfig index b2ffb0602d3c9..88573fa99c8a7 100644 --- a/boards/arm64/intel_socfpga_agilex_socdk/intel_socfpga_agilex_socdk_defconfig +++ b/boards/arm64/intel_socfpga_agilex_socdk/intel_socfpga_agilex_socdk_defconfig @@ -5,9 +5,6 @@ # Intel Arm Trusted Firmware (ATF) # Boot Flow: BL21 -> BL31 -> Zephyr -CONFIG_SOC_SERIES_AGILEX=y -CONFIG_SOC_AGILEX=y -CONFIG_BOARD_INTEL_SOCFPGA_AGILEX_SOCDK=y CONFIG_ARM_ARCH_TIMER=y # Serial Drivers diff --git a/boards/arm64/mimx8mm_evk/Kconfig.board b/boards/arm64/mimx8mm_evk/Kconfig.board deleted file mode 100644 index c84e506adb7ed..0000000000000 --- a/boards/arm64/mimx8mm_evk/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2021-2022 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMX8MM_EVK_A53 - bool "NXP i.MX8M Mini EVK A53" - depends on SOC_SERIES_MIMX8M_A53 - select SOC_PART_NUMBER_MIMX8MM6DVTLZ diff --git a/boards/arm64/mimx8mm_evk/Kconfig.defconfig b/boards/arm64/mimx8mm_evk/Kconfig.defconfig deleted file mode 100644 index 9f4d9e9490f36..0000000000000 --- a/boards/arm64/mimx8mm_evk/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2020-2022 NXP -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_MIMX8MM_EVK_A53 - -config BOARD - default "mimx8mm_evk_a53" - -endif # BOARD_MIMX8MM_EVK_A53 diff --git a/boards/arm64/mimx8mm_evk/Kconfig.mimx8mm_evk_a53 b/boards/arm64/mimx8mm_evk/Kconfig.mimx8mm_evk_a53 new file mode 100644 index 0000000000000..efdccf07cd66b --- /dev/null +++ b/boards/arm64/mimx8mm_evk/Kconfig.mimx8mm_evk_a53 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMX8MM_EVK_A53 + bool + default y + select SOC_SERIES_MIMX8M_A53 + select SOC_MIMX8MM_A53 + select SOC_PART_NUMBER_MIMX8MM6DVTLZ diff --git a/boards/arm64/mimx8mm_evk/Kconfig.mimx8mm_evk_a53_smp b/boards/arm64/mimx8mm_evk/Kconfig.mimx8mm_evk_a53_smp new file mode 100644 index 0000000000000..b8d19d0892544 --- /dev/null +++ b/boards/arm64/mimx8mm_evk/Kconfig.mimx8mm_evk_a53_smp @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMX8MM_EVK_A53_SMP + bool + default y + select SOC_SERIES_MIMX8M_A53 + select SOC_MIMX8MM_A53 + select SOC_PART_NUMBER_MIMX8MM6DVTLZ diff --git a/boards/arm64/mimx8mm_evk/mimx8mm_evk_a53_defconfig b/boards/arm64/mimx8mm_evk/mimx8mm_evk_a53_defconfig index d8c66f1754a10..d4a0f73a71921 100644 --- a/boards/arm64/mimx8mm_evk/mimx8mm_evk_a53_defconfig +++ b/boards/arm64/mimx8mm_evk/mimx8mm_evk_a53_defconfig @@ -12,9 +12,6 @@ CONFIG_DCACHE_LINE_SIZE_DETECT=y CONFIG_ICACHE_LINE_SIZE_DETECT=y # Platform Configuration -CONFIG_SOC_SERIES_MIMX8M_A53=y -CONFIG_SOC_MIMX8MM_A53=y -CONFIG_BOARD_MIMX8MM_EVK_A53=y # Zephyr Kernel Configuration CONFIG_XIP=n diff --git a/boards/arm64/mimx8mm_evk/mimx8mm_evk_a53_smp_defconfig b/boards/arm64/mimx8mm_evk/mimx8mm_evk_a53_smp_defconfig index 31e7e6ae189f6..ce43e016ac10c 100644 --- a/boards/arm64/mimx8mm_evk/mimx8mm_evk_a53_smp_defconfig +++ b/boards/arm64/mimx8mm_evk/mimx8mm_evk_a53_smp_defconfig @@ -12,9 +12,6 @@ CONFIG_DCACHE_LINE_SIZE_DETECT=y CONFIG_ICACHE_LINE_SIZE_DETECT=y # Platform Configuration -CONFIG_SOC_SERIES_MIMX8M_A53=y -CONFIG_SOC_MIMX8MM_A53=y -CONFIG_BOARD_MIMX8MM_EVK_A53=y # Zephyr Kernel Configuration CONFIG_XIP=n diff --git a/boards/arm64/mimx8mn_evk/Kconfig.board b/boards/arm64/mimx8mn_evk/Kconfig.board deleted file mode 100644 index 04506a42ed83a..0000000000000 --- a/boards/arm64/mimx8mn_evk/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2022 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMX8MN_EVK_A53 - bool "NXP i.MX8M Nano EVK A53" - depends on SOC_SERIES_MIMX8M_A53 - select SOC_PART_NUMBER_MIMX8MN6DVTJZ diff --git a/boards/arm64/mimx8mn_evk/Kconfig.defconfig b/boards/arm64/mimx8mn_evk/Kconfig.defconfig deleted file mode 100644 index 21f6caecd9bb5..0000000000000 --- a/boards/arm64/mimx8mn_evk/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2022 NXP -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_MIMX8MN_EVK_A53 - -config BOARD - default "mimx8mn_evk_a53" - -endif # BOARD_MIMX8MN_EVK_A53 diff --git a/boards/arm64/mimx8mn_evk/Kconfig.mimx8mn_evk_a53 b/boards/arm64/mimx8mn_evk/Kconfig.mimx8mn_evk_a53 new file mode 100644 index 0000000000000..f83e06f5f70ff --- /dev/null +++ b/boards/arm64/mimx8mn_evk/Kconfig.mimx8mn_evk_a53 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMX8MN_EVK_A53 + bool + default y + select SOC_SERIES_MIMX8M_A53 + select SOC_MIMX8MN_A53 + select SOC_PART_NUMBER_MIMX8MN6DVTJZ diff --git a/boards/arm64/mimx8mn_evk/Kconfig.mimx8mn_evk_a53_smp b/boards/arm64/mimx8mn_evk/Kconfig.mimx8mn_evk_a53_smp new file mode 100644 index 0000000000000..97ef0d830e1dd --- /dev/null +++ b/boards/arm64/mimx8mn_evk/Kconfig.mimx8mn_evk_a53_smp @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMX8MN_EVK_A53_SMP + bool + default y + select SOC_SERIES_MIMX8M_A53 + select SOC_MIMX8MN_A53 + select SOC_PART_NUMBER_MIMX8MN6DVTJZ diff --git a/boards/arm64/mimx8mn_evk/mimx8mn_evk_a53_defconfig b/boards/arm64/mimx8mn_evk/mimx8mn_evk_a53_defconfig index 79da4a06d8fcf..d4a0f73a71921 100644 --- a/boards/arm64/mimx8mn_evk/mimx8mn_evk_a53_defconfig +++ b/boards/arm64/mimx8mn_evk/mimx8mn_evk_a53_defconfig @@ -12,9 +12,6 @@ CONFIG_DCACHE_LINE_SIZE_DETECT=y CONFIG_ICACHE_LINE_SIZE_DETECT=y # Platform Configuration -CONFIG_SOC_SERIES_MIMX8M_A53=y -CONFIG_SOC_MIMX8MN_A53=y -CONFIG_BOARD_MIMX8MN_EVK_A53=y # Zephyr Kernel Configuration CONFIG_XIP=n diff --git a/boards/arm64/mimx8mn_evk/mimx8mn_evk_a53_smp_defconfig b/boards/arm64/mimx8mn_evk/mimx8mn_evk_a53_smp_defconfig index e458e65c0b98e..ce43e016ac10c 100644 --- a/boards/arm64/mimx8mn_evk/mimx8mn_evk_a53_smp_defconfig +++ b/boards/arm64/mimx8mn_evk/mimx8mn_evk_a53_smp_defconfig @@ -12,9 +12,6 @@ CONFIG_DCACHE_LINE_SIZE_DETECT=y CONFIG_ICACHE_LINE_SIZE_DETECT=y # Platform Configuration -CONFIG_SOC_SERIES_MIMX8M_A53=y -CONFIG_SOC_MIMX8MN_A53=y -CONFIG_BOARD_MIMX8MN_EVK_A53=y # Zephyr Kernel Configuration CONFIG_XIP=n diff --git a/boards/arm64/mimx8mp_evk/Kconfig.board b/boards/arm64/mimx8mp_evk/Kconfig.board deleted file mode 100644 index c37a3a6d1f2a5..0000000000000 --- a/boards/arm64/mimx8mp_evk/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2021-2022 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MIMX8MP_EVK_A53 - bool "NXP i.MX8M Plus EVK A53" - depends on SOC_SERIES_MIMX8M_A53 - select SOC_PART_NUMBER_MIMX8ML8DVNLZ diff --git a/boards/arm64/mimx8mp_evk/Kconfig.defconfig b/boards/arm64/mimx8mp_evk/Kconfig.defconfig deleted file mode 100644 index e43bd17cae858..0000000000000 --- a/boards/arm64/mimx8mp_evk/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2021-2022 NXP -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_MIMX8MP_EVK_A53 - -config BOARD - default "mimx8mp_evk_a53" - -endif # BOARD_MIMX8MP_EVK_A53 diff --git a/boards/arm64/mimx8mp_evk/Kconfig.mimx8mp_evk_a53 b/boards/arm64/mimx8mp_evk/Kconfig.mimx8mp_evk_a53 new file mode 100644 index 0000000000000..435bc52f425f9 --- /dev/null +++ b/boards/arm64/mimx8mp_evk/Kconfig.mimx8mp_evk_a53 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMX8MP_EVK_A53 + bool + default y + select SOC_SERIES_MIMX8M_A53 + select SOC_MIMX8MP_A53 + select SOC_PART_NUMBER_MIMX8ML8DVNLZ diff --git a/boards/arm64/mimx8mp_evk/Kconfig.mimx8mp_evk_a53_smp b/boards/arm64/mimx8mp_evk/Kconfig.mimx8mp_evk_a53_smp new file mode 100644 index 0000000000000..563723d150ece --- /dev/null +++ b/boards/arm64/mimx8mp_evk/Kconfig.mimx8mp_evk_a53_smp @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMX8MP_EVK_A53_SMP + bool + default y + select SOC_SERIES_MIMX8M_A53 + select SOC_MIMX8MP_A53 + select SOC_PART_NUMBER_MIMX8ML8DVNLZ diff --git a/boards/arm64/mimx8mp_evk/mimx8mp_evk_a53_defconfig b/boards/arm64/mimx8mp_evk/mimx8mp_evk_a53_defconfig index 215166ba08042..d4a0f73a71921 100644 --- a/boards/arm64/mimx8mp_evk/mimx8mp_evk_a53_defconfig +++ b/boards/arm64/mimx8mp_evk/mimx8mp_evk_a53_defconfig @@ -12,9 +12,6 @@ CONFIG_DCACHE_LINE_SIZE_DETECT=y CONFIG_ICACHE_LINE_SIZE_DETECT=y # Platform Configuration -CONFIG_SOC_SERIES_MIMX8M_A53=y -CONFIG_SOC_MIMX8MP_A53=y -CONFIG_BOARD_MIMX8MP_EVK_A53=y # Zephyr Kernel Configuration CONFIG_XIP=n diff --git a/boards/arm64/mimx8mp_evk/mimx8mp_evk_a53_smp_defconfig b/boards/arm64/mimx8mp_evk/mimx8mp_evk_a53_smp_defconfig index 5b861202c60a7..ce43e016ac10c 100644 --- a/boards/arm64/mimx8mp_evk/mimx8mp_evk_a53_smp_defconfig +++ b/boards/arm64/mimx8mp_evk/mimx8mp_evk_a53_smp_defconfig @@ -12,9 +12,6 @@ CONFIG_DCACHE_LINE_SIZE_DETECT=y CONFIG_ICACHE_LINE_SIZE_DETECT=y # Platform Configuration -CONFIG_SOC_SERIES_MIMX8M_A53=y -CONFIG_SOC_MIMX8MP_A53=y -CONFIG_BOARD_MIMX8MP_EVK_A53=y # Zephyr Kernel Configuration CONFIG_XIP=n diff --git a/boards/arm64/nxp_ls1046ardb/Kconfig.board b/boards/arm64/nxp_ls1046ardb/Kconfig.board deleted file mode 100644 index 5986971533e40..0000000000000 --- a/boards/arm64/nxp_ls1046ardb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright 2021 NXP -# SPDX-License-Identifier: Apache-2.0 -# - -config BOARD_NXP_LS1046ARDB - bool "NXP Layerscape ls1046ardb" - depends on SOC_SERIES_LS1046A diff --git a/boards/arm64/nxp_ls1046ardb/Kconfig.defconfig b/boards/arm64/nxp_ls1046ardb/Kconfig.defconfig deleted file mode 100644 index 1896c014d5cf1..0000000000000 --- a/boards/arm64/nxp_ls1046ardb/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright 2021 NXP -# SPDX-License-Identifier: Apache-2.0 -# - -config BOARD - default "nxp_ls1046ardb" - depends on BOARD_NXP_LS1046ARDB diff --git a/boards/arm64/nxp_ls1046ardb/Kconfig.nxp_ls1046ardb b/boards/arm64/nxp_ls1046ardb/Kconfig.nxp_ls1046ardb new file mode 100644 index 0000000000000..b6f6a47bca900 --- /dev/null +++ b/boards/arm64/nxp_ls1046ardb/Kconfig.nxp_ls1046ardb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NXP_LS1046ARDB + bool + default y + select SOC_SERIES_LS1046A + select SOC_LS1046A diff --git a/boards/arm64/nxp_ls1046ardb/Kconfig.nxp_ls1046ardb_smp_2cores b/boards/arm64/nxp_ls1046ardb/Kconfig.nxp_ls1046ardb_smp_2cores new file mode 100644 index 0000000000000..1d9ab701558c9 --- /dev/null +++ b/boards/arm64/nxp_ls1046ardb/Kconfig.nxp_ls1046ardb_smp_2cores @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NXP_LS1046ARDB_SMP_2CORES + bool + default y + select SOC_SERIES_LS1046A + select SOC_LS1046A diff --git a/boards/arm64/nxp_ls1046ardb/Kconfig.nxp_ls1046ardb_smp_4cores b/boards/arm64/nxp_ls1046ardb/Kconfig.nxp_ls1046ardb_smp_4cores new file mode 100644 index 0000000000000..96181f69aee24 --- /dev/null +++ b/boards/arm64/nxp_ls1046ardb/Kconfig.nxp_ls1046ardb_smp_4cores @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NXP_LS1046ARDB_SMP_4CORES + bool + default y + select SOC_SERIES_LS1046A + select SOC_LS1046A diff --git a/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_defconfig b/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_defconfig index c8bb699fd1c93..ffe3e0b5c250a 100644 --- a/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_defconfig +++ b/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_defconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # Platform Configuration -CONFIG_SOC_SERIES_LS1046A=y -CONFIG_SOC_LS1046A=y -CONFIG_BOARD_NXP_LS1046ARDB=y CONFIG_ARM64_VA_BITS_40=y CONFIG_ARM64_PA_BITS_40=y # 25 MHz system clock diff --git a/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_smp_2cores_defconfig b/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_smp_2cores_defconfig index 2c3f404510a22..28689f97f9776 100644 --- a/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_smp_2cores_defconfig +++ b/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_smp_2cores_defconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # Platform Configuration -CONFIG_SOC_SERIES_LS1046A=y -CONFIG_SOC_LS1046A=y -CONFIG_BOARD_NXP_LS1046ARDB=y CONFIG_ARM64_VA_BITS_40=y CONFIG_ARM64_PA_BITS_40=y # 25 MHz system clock diff --git a/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_smp_4cores_defconfig b/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_smp_4cores_defconfig index 08341471aa0e2..b1c255897dc5a 100644 --- a/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_smp_4cores_defconfig +++ b/boards/arm64/nxp_ls1046ardb/nxp_ls1046ardb_smp_4cores_defconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # Platform Configuration -CONFIG_SOC_SERIES_LS1046A=y -CONFIG_SOC_LS1046A=y -CONFIG_BOARD_NXP_LS1046ARDB=y CONFIG_ARM64_VA_BITS_40=y CONFIG_ARM64_PA_BITS_40=y # 25 MHz system clock diff --git a/boards/arm64/qemu_cortex_a53/Kconfig.board b/boards/arm64/qemu_cortex_a53/Kconfig.board deleted file mode 100644 index 1f7714000827b..0000000000000 --- a/boards/arm64/qemu_cortex_a53/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2019 Carlo Caione -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_CORTEX_A53 - bool "Cortex-A53 Emulation (QEMU)" - depends on SOC_QEMU_CORTEX_A53 - select ARM64 - select QEMU_TARGET diff --git a/boards/arm64/qemu_cortex_a53/Kconfig.defconfig b/boards/arm64/qemu_cortex_a53/Kconfig.defconfig index cbe833f42f6ff..6db6716a83b6d 100644 --- a/boards/arm64/qemu_cortex_a53/Kconfig.defconfig +++ b/boards/arm64/qemu_cortex_a53/Kconfig.defconfig @@ -1,12 +1,5 @@ # Copyright (c) 2019 Carlo Caione # SPDX-License-Identifier: Apache-2.0 -if BOARD_QEMU_CORTEX_A53 - config BUILD_OUTPUT_BIN default y - -config BOARD - default "qemu_cortex_a53" - -endif # BOARD_QEMU_CORTEX_A53 diff --git a/boards/arm64/qemu_cortex_a53/Kconfig.qemu_cortex_a53 b/boards/arm64/qemu_cortex_a53/Kconfig.qemu_cortex_a53 new file mode 100644 index 0000000000000..db9be91d1ebe9 --- /dev/null +++ b/boards/arm64/qemu_cortex_a53/Kconfig.qemu_cortex_a53 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_CORTEX_A53 + bool + default y + select SOC_QEMU_CORTEX_A53 + select ARM64 + select QEMU_TARGET diff --git a/boards/arm64/qemu_cortex_a53/Kconfig.qemu_cortex_a53_smp b/boards/arm64/qemu_cortex_a53/Kconfig.qemu_cortex_a53_smp new file mode 100644 index 0000000000000..9570647546983 --- /dev/null +++ b/boards/arm64/qemu_cortex_a53/Kconfig.qemu_cortex_a53_smp @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_CORTEX_A53_SMP + bool + default y + select SOC_QEMU_CORTEX_A53 + select ARM64 + select QEMU_TARGET diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_defconfig b/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_defconfig index 4c19444708bcb..ac9283f6706be 100644 --- a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_defconfig +++ b/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_CORTEX_A53=y -CONFIG_BOARD_QEMU_CORTEX_A53=y CONFIG_ARM_ARCH_TIMER=y CONFIG_QEMU_ICOUNT=y CONFIG_QEMU_ICOUNT_SHIFT=4 diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp_defconfig b/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp_defconfig index e6007718759f2..d6d995539cc73 100644 --- a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp_defconfig +++ b/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_CORTEX_A53=y -CONFIG_BOARD_QEMU_CORTEX_A53=y CONFIG_ARM_ARCH_TIMER=y CONFIG_QEMU_ICOUNT=n diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip_defconfig b/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip_defconfig index 68e7fea9754b4..9c67b0392c8c1 100644 --- a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip_defconfig +++ b/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_CORTEX_A53=y -CONFIG_BOARD_QEMU_CORTEX_A53=y CONFIG_ARM_ARCH_TIMER=y CONFIG_QEMU_ICOUNT=n diff --git a/boards/arm64/xenvm/Kconfig b/boards/arm64/xenvm/Kconfig index d6735af0283ee..f9854f398d2f9 100644 --- a/boards/arm64/xenvm/Kconfig +++ b/boards/arm64/xenvm/Kconfig @@ -3,6 +3,6 @@ config XENVM_USE_GIC_V3 bool "Xen VM using GICv3" - depends on BOARD_XENVM + depends on BOARD_XENVM_GICV3 help Configure Xen VM to use GICv3 instead of default GICv2. diff --git a/boards/arm64/xenvm/Kconfig.board b/boards/arm64/xenvm/Kconfig.board deleted file mode 100644 index a967e98216aa2..0000000000000 --- a/boards/arm64/xenvm/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2020 EPAM Systems -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_XENVM - bool "Xen Virtual Machine" - depends on SOC_XENVM - select ARM64 diff --git a/boards/arm64/xenvm/Kconfig.defconfig b/boards/arm64/xenvm/Kconfig.defconfig index 2e8d48bc8f65d..636317935d968 100644 --- a/boards/arm64/xenvm/Kconfig.defconfig +++ b/boards/arm64/xenvm/Kconfig.defconfig @@ -1,12 +1,5 @@ # Copyright (c) 2020 EPAM Systems # SPDX-License-Identifier: Apache-2.0 -if BOARD_XENVM - config BUILD_OUTPUT_BIN default y - -config BOARD - default "xenvm" - -endif # BOARD_XENVM diff --git a/boards/arm64/xenvm/Kconfig.xenvm b/boards/arm64/xenvm/Kconfig.xenvm new file mode 100644 index 0000000000000..053d3b331b830 --- /dev/null +++ b/boards/arm64/xenvm/Kconfig.xenvm @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_XENVM + bool + default y + select SOC_XENVM diff --git a/boards/arm64/xenvm/Kconfig.xenvm_gicv3 b/boards/arm64/xenvm/Kconfig.xenvm_gicv3 new file mode 100644 index 0000000000000..09586df139b14 --- /dev/null +++ b/boards/arm64/xenvm/Kconfig.xenvm_gicv3 @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_XENVM_GICV3 + bool + default y + select SOC_XENVM diff --git a/boards/arm64/xenvm/xenvm_defconfig b/boards/arm64/xenvm/xenvm_defconfig index 8905b74a0c979..1adffc9025cd1 100644 --- a/boards/arm64/xenvm/xenvm_defconfig +++ b/boards/arm64/xenvm/xenvm_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_XENVM=y -CONFIG_BOARD_XENVM=y - # Enable UART driver CONFIG_SERIAL=y diff --git a/boards/arm64/xenvm/xenvm_gicv3_defconfig b/boards/arm64/xenvm/xenvm_gicv3_defconfig index b5b63987b4988..53822efd12b8b 100644 --- a/boards/arm64/xenvm/xenvm_gicv3_defconfig +++ b/boards/arm64/xenvm/xenvm_gicv3_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_XENVM=y -CONFIG_BOARD_XENVM=y - # Use GICv3 CONFIG_XENVM_USE_GIC_V3=y diff --git a/boards/mips/qemu_malta/Kconfig.board b/boards/mips/qemu_malta/Kconfig.board deleted file mode 100644 index 4716bd6dbe51b..0000000000000 --- a/boards/mips/qemu_malta/Kconfig.board +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2020 Antony Pavlov -# -# SPDX-License-Identifier: Apache-2.0 -# - -config BOARD_QEMU_MALTA - bool "QEMU emulation for little endian MIPS Malta" - depends on SOC_QEMU_MALTA - select QEMU_TARGET - -config BOARD_QEMU_MALTA_BE - bool "QEMU emulation for big endian MIPS Malta" - depends on SOC_QEMU_MALTA - select QEMU_TARGET - select BIG_ENDIAN diff --git a/boards/mips/qemu_malta/Kconfig.defconfig b/boards/mips/qemu_malta/Kconfig.defconfig index 4a583be0d9e44..df3442f5ddabe 100644 --- a/boards/mips/qemu_malta/Kconfig.defconfig +++ b/boards/mips/qemu_malta/Kconfig.defconfig @@ -4,13 +4,5 @@ # SPDX-License-Identifier: Apache-2.0 # -if BOARD_QEMU_MALTA || BOARD_QEMU_MALTA_BE - config BUILD_OUTPUT_BIN default n - -config BOARD - default "qemu_malta" if BOARD_QEMU_MALTA - default "qemu_malta_be" if BOARD_QEMU_MALTA_BE - -endif # BOARD_QEMU_MALTA || BOARD_QEMU_MALTA_BE diff --git a/boards/mips/qemu_malta/Kconfig.qemu_malta b/boards/mips/qemu_malta/Kconfig.qemu_malta new file mode 100644 index 0000000000000..9c2429b6b50fa --- /dev/null +++ b/boards/mips/qemu_malta/Kconfig.qemu_malta @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_MALTA + bool + default y + select SOC_QEMU_MALTA + select QEMU_TARGET + select BIG_ENDIAN diff --git a/boards/mips/qemu_malta/Kconfig.qemu_malta_be b/boards/mips/qemu_malta/Kconfig.qemu_malta_be new file mode 100644 index 0000000000000..14f23c637bdcb --- /dev/null +++ b/boards/mips/qemu_malta/Kconfig.qemu_malta_be @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_MALTA_BE + bool + default y + select SOC_QEMU_MALTA + select QEMU_TARGET diff --git a/boards/mips/qemu_malta/qemu_malta_be_defconfig b/boards/mips/qemu_malta/qemu_malta_be_defconfig index cbdcfed736af0..fe217db926bc9 100644 --- a/boards/mips/qemu_malta/qemu_malta_be_defconfig +++ b/boards/mips/qemu_malta/qemu_malta_be_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_MALTA=y -CONFIG_BOARD_QEMU_MALTA_BE=y CONFIG_MIPS_CP0_TIMER=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/mips/qemu_malta/qemu_malta_defconfig b/boards/mips/qemu_malta/qemu_malta_defconfig index edf9e1478976a..fe217db926bc9 100644 --- a/boards/mips/qemu_malta/qemu_malta_defconfig +++ b/boards/mips/qemu_malta/qemu_malta_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_MALTA=y -CONFIG_BOARD_QEMU_MALTA=y CONFIG_MIPS_CP0_TIMER=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/nios2/altera_max10/Kconfig.altera_max10 b/boards/nios2/altera_max10/Kconfig.altera_max10 new file mode 100644 index 0000000000000..a2191bd2fcb41 --- /dev/null +++ b/boards/nios2/altera_max10/Kconfig.altera_max10 @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ALTERA_MAX10 + bool + default y + select SOC_NIOS2F_ZEPHYR diff --git a/boards/nios2/altera_max10/Kconfig.board b/boards/nios2/altera_max10/Kconfig.board deleted file mode 100644 index 90f467915bdd9..0000000000000 --- a/boards/nios2/altera_max10/Kconfig.board +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ALTERA_MAX10 - bool "Altera MAX10 Board" - depends on SOC_NIOS2F_ZEPHYR diff --git a/boards/nios2/altera_max10/Kconfig.defconfig b/boards/nios2/altera_max10/Kconfig.defconfig index f59d5d33b7b69..1585f1567bfd5 100644 --- a/boards/nios2/altera_max10/Kconfig.defconfig +++ b/boards/nios2/altera_max10/Kconfig.defconfig @@ -1,10 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_ALTERA_MAX10 - -config BOARD - default "altera_max10" - if FLASH config SOC_FLASH_NIOS2_QSPI @@ -37,5 +32,3 @@ endif # DISK_DRIVER_FLASH endif # SOC_FLASH_NIOS2_QSPI endif # FLASH - -endif # BOARD_ALTERA_MAX10 diff --git a/boards/nios2/altera_max10/altera_max10_defconfig b/boards/nios2/altera_max10/altera_max10_defconfig index 925abcca34c48..e98725d3c1caf 100644 --- a/boards/nios2/altera_max10/altera_max10_defconfig +++ b/boards/nios2/altera_max10/altera_max10_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NIOS2F_ZEPHYR=y -CONFIG_BOARD_ALTERA_MAX10=y CONFIG_HAS_ALTERA_HAL=y CONFIG_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/nios2/qemu_nios2/Kconfig.board b/boards/nios2/qemu_nios2/Kconfig.board deleted file mode 100644 index de59ab26b4abf..0000000000000 --- a/boards/nios2/qemu_nios2/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_NIOS2 - bool "QEMU NIOS II target" - depends on SOC_NIOS2_QEMU - select QEMU_TARGET diff --git a/boards/nios2/qemu_nios2/Kconfig.defconfig b/boards/nios2/qemu_nios2/Kconfig.defconfig index b550e80e0f64e..ecd72934a9f79 100644 --- a/boards/nios2/qemu_nios2/Kconfig.defconfig +++ b/boards/nios2/qemu_nios2/Kconfig.defconfig @@ -1,11 +1,4 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_QEMU_NIOS2 - config BUILD_OUTPUT_BIN default n - -config BOARD - default "qemu_nios2" - -endif diff --git a/boards/nios2/qemu_nios2/Kconfig.qemu_nios2 b/boards/nios2/qemu_nios2/Kconfig.qemu_nios2 new file mode 100644 index 0000000000000..9bd48bb550c73 --- /dev/null +++ b/boards/nios2/qemu_nios2/Kconfig.qemu_nios2 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_NIOS2 + bool + default y + select SOC_NIOS2_QEMU + select QEMU_TARGET diff --git a/boards/nios2/qemu_nios2/qemu_nios2_defconfig b/boards/nios2/qemu_nios2/qemu_nios2_defconfig index 7820e1f8fc576..f891ff2973f4b 100644 --- a/boards/nios2/qemu_nios2/qemu_nios2_defconfig +++ b/boards/nios2/qemu_nios2/qemu_nios2_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NIOS2_QEMU=y -CONFIG_BOARD_QEMU_NIOS2=y CONFIG_HAS_ALTERA_HAL=y CONFIG_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/posix/native_posix/Kconfig b/boards/posix/native_posix/Kconfig index 807fa5b4fedd9..2a60df9b1ac0c 100644 --- a/boards/posix/native_posix/Kconfig +++ b/boards/posix/native_posix/Kconfig @@ -1,12 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -config BOARD_NATIVE_POSIX - bool - select NATIVE_POSIX_TIMER - select NATIVE_POSIX_CONSOLE - -if BOARD_NATIVE_POSIX - comment "Native POSIX options" config NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME @@ -25,5 +18,3 @@ config HAS_SDL bool help This option specifies that the target board has SDL support - -endif diff --git a/boards/posix/native_posix/Kconfig.board b/boards/posix/native_posix/Kconfig.board deleted file mode 100644 index 4367cd5063158..0000000000000 --- a/boards/posix/native_posix/Kconfig.board +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NATIVE_POSIX_32BIT - bool "Native POSIX for 32-bit host" - depends on SOC_POSIX - select BOARD_NATIVE_POSIX - help - Will produce a console Linux process which can be executed natively - as a 32-bit executable. - It provides some minimal needed models: - An interrupt controller, timer (system tick), and redirects kernel prints to - stdout. - -config BOARD_NATIVE_POSIX_64BIT - bool "Native POSIX for 64-bit host" - depends on SOC_POSIX - select BOARD_NATIVE_POSIX - select 64BIT - help - Will produce a console Linux process which can be executed natively - as a 64-bit executable. - It provides some minimal needed models: - An interrupt controller, timer (system tick), and redirects kernel prints to - stdout. diff --git a/boards/posix/native_posix/Kconfig.defconfig b/boards/posix/native_posix/Kconfig.defconfig index 141e1686b8ecf..53531aae9fc47 100644 --- a/boards/posix/native_posix/Kconfig.defconfig +++ b/boards/posix/native_posix/Kconfig.defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_NATIVE_POSIX - config BUILD_OUTPUT_BIN default n @@ -11,10 +9,6 @@ config BUILD_OUTPUT_EXE config OUTPUT_PRINT_MEMORY_USAGE default n -config BOARD - default "native_posix_64" if BOARD_NATIVE_POSIX_64BIT - default "native_posix" - if NETWORKING config NET_L2_ETHERNET @@ -68,5 +62,3 @@ config EMUL default y endif # I2C - -endif # BOARD_NATIVE_POSIX diff --git a/boards/posix/native_posix/Kconfig.native_posix b/boards/posix/native_posix/Kconfig.native_posix new file mode 100644 index 0000000000000..138a7d400da27 --- /dev/null +++ b/boards/posix/native_posix/Kconfig.native_posix @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NATIVE_POSIX + bool + default y + select SOC_POSIX + select NATIVE_POSIX_TIMER + select NATIVE_POSIX_CONSOLE diff --git a/boards/posix/native_posix/Kconfig.native_posix_64 b/boards/posix/native_posix/Kconfig.native_posix_64 new file mode 100644 index 0000000000000..993765031d8a0 --- /dev/null +++ b/boards/posix/native_posix/Kconfig.native_posix_64 @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NATIVE_POSIX_64 + bool + default y + select SOC_POSIX + select 64BIT + select NATIVE_POSIX_TIMER + select NATIVE_POSIX_CONSOLE diff --git a/boards/posix/native_posix/native_posix_64_defconfig b/boards/posix/native_posix/native_posix_64_defconfig index 5ccadf2bc6aed..b0033eda61f9b 100644 --- a/boards/posix/native_posix/native_posix_64_defconfig +++ b/boards/posix/native_posix/native_posix_64_defconfig @@ -1,6 +1,4 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_POSIX=y -CONFIG_BOARD_NATIVE_POSIX_64BIT=y CONFIG_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000 diff --git a/boards/posix/native_posix/native_posix_defconfig b/boards/posix/native_posix/native_posix_defconfig index ee7f4b92eda46..b0033eda61f9b 100644 --- a/boards/posix/native_posix/native_posix_defconfig +++ b/boards/posix/native_posix/native_posix_defconfig @@ -1,6 +1,4 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_POSIX=y -CONFIG_BOARD_NATIVE_POSIX_32BIT=y CONFIG_CONSOLE=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000 diff --git a/boards/posix/nrf52_bsim/Kconfig b/boards/posix/nrf52_bsim/Kconfig index 159327977bf5b..38e295f152ad5 100644 --- a/boards/posix/nrf52_bsim/Kconfig +++ b/boards/posix/nrf52_bsim/Kconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52_BSIM - # The following file is normally parsed only for the ARM architecture, which is # used by Nordic SoCs, so to make the symbols defined in this file available for # the simulated nrf52_bsim board, which uses the POSIX architecture, the file @@ -16,9 +14,6 @@ config PRINTK_HOOK_INIT_PRIORITY help Just the driver init priority -endif # BOARD_NRF52_BSIM - - # This would eventually be shared by a possible family of simulated NRF boards # which use BabbleSim. When that happens, we can move this to a common # Kconfig file diff --git a/boards/posix/nrf52_bsim/Kconfig.board b/boards/posix/nrf52_bsim/Kconfig.board deleted file mode 100644 index 4a97c8d4cd2a3..0000000000000 --- a/boards/posix/nrf52_bsim/Kconfig.board +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NRF52_BSIM - bool "NRF52 simulation model" - select SOC_SERIES_BSIM_NRFXX - select SOC_SERIES_BSIM_NRF52X - select SOC_COMPATIBLE_NRF - select SOC_COMPATIBLE_NRF52X - select SOC_COMPATIBLE_NRF52832 - select CONSOLE_HAS_DRIVER - select NRF_RTC_TIMER - select CLOCK_CONTROL - select HAS_NRFX - help - Will produce a console Linux process which can be executed natively. - It needs the BabbleSim simulator both in compile time and to execute diff --git a/boards/posix/nrf52_bsim/Kconfig.defconfig b/boards/posix/nrf52_bsim/Kconfig.defconfig index 94e30c2a17cc5..5e6dcb6478616 100644 --- a/boards/posix/nrf52_bsim/Kconfig.defconfig +++ b/boards/posix/nrf52_bsim/Kconfig.defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF52_BSIM - config BUILD_OUTPUT_BIN default n @@ -11,9 +9,6 @@ config BUILD_OUTPUT_EXE config OUTPUT_PRINT_MEMORY_USAGE default n -config BOARD - default "nrf52_bsim" - config BT_CTLR default y depends on BT @@ -27,5 +22,3 @@ choice LOG_MODE endchoice endif # LOG - -endif # BOARD_NRF52_BSIM diff --git a/boards/posix/nrf52_bsim/Kconfig.nrf52_bsim b/boards/posix/nrf52_bsim/Kconfig.nrf52_bsim new file mode 100644 index 0000000000000..ec66af51b655e --- /dev/null +++ b/boards/posix/nrf52_bsim/Kconfig.nrf52_bsim @@ -0,0 +1,16 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NRF52_BSIM + bool + default y + select SOC_POSIX + select SOC_SERIES_BSIM_NRFXX + select SOC_SERIES_BSIM_NRF52X + select SOC_COMPATIBLE_NRF + select SOC_COMPATIBLE_NRF52X + select SOC_COMPATIBLE_NRF52832 + select CONSOLE_HAS_DRIVER + select NRF_RTC_TIMER + select CLOCK_CONTROL + select HAS_NRFX diff --git a/boards/posix/nrf52_bsim/nrf52_bsim_defconfig b/boards/posix/nrf52_bsim/nrf52_bsim_defconfig index b5e41ffc4ff9e..bf5e9e1c0f380 100644 --- a/boards/posix/nrf52_bsim/nrf52_bsim_defconfig +++ b/boards/posix/nrf52_bsim/nrf52_bsim_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_POSIX=y -CONFIG_BOARD_NRF52_BSIM=y CONFIG_CONSOLE=y CONFIG_NO_OPTIMIZATIONS=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32768 diff --git a/boards/riscv/adp_xc7k_ae350/Kconfig.adp_xc7k_ae350 b/boards/riscv/adp_xc7k_ae350/Kconfig.adp_xc7k_ae350 new file mode 100644 index 0000000000000..eab835f250ec8 --- /dev/null +++ b/boards/riscv/adp_xc7k_ae350/Kconfig.adp_xc7k_ae350 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ADP_XC7K_AE350 + bool + default y + select SOC_SERIES_RISCV_ANDES_V5 + select SOC_RISCV_ANDES_AE350 diff --git a/boards/riscv/adp_xc7k_ae350/Kconfig.board b/boards/riscv/adp_xc7k_ae350/Kconfig.board deleted file mode 100644 index 085eb9696a8c4..0000000000000 --- a/boards/riscv/adp_xc7k_ae350/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Andes Technology Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ADP_XC7K_AE350 - bool "Andes ADP-XC7K AE350 Platform" - depends on SOC_RISCV_ANDES_AE350 diff --git a/boards/riscv/adp_xc7k_ae350/Kconfig.defconfig b/boards/riscv/adp_xc7k_ae350/Kconfig.defconfig deleted file mode 100644 index 7438c2eae72ec..0000000000000 --- a/boards/riscv/adp_xc7k_ae350/Kconfig.defconfig +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2021 Andes Technology Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "adp_xc7k_ae350" if BOARD_ADP_XC7K_AE350 diff --git a/boards/riscv/adp_xc7k_ae350/adp_xc7k_ae350_defconfig b/boards/riscv/adp_xc7k_ae350/adp_xc7k_ae350_defconfig index 680c35034742c..e0dd1716459f2 100644 --- a/boards/riscv/adp_xc7k_ae350/adp_xc7k_ae350_defconfig +++ b/boards/riscv/adp_xc7k_ae350/adp_xc7k_ae350_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_RISCV_ANDES_V5=y -CONFIG_SOC_RISCV_ANDES_AE350=y -CONFIG_BOARD_ADP_XC7K_AE350=y CONFIG_XIP=n CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/riscv/beaglev_starlight_jh7100/Kconfig.beaglev_starlight_jh7100 b/boards/riscv/beaglev_starlight_jh7100/Kconfig.beaglev_starlight_jh7100 new file mode 100644 index 0000000000000..0346f02d953eb --- /dev/null +++ b/boards/riscv/beaglev_starlight_jh7100/Kconfig.beaglev_starlight_jh7100 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_BEAGLEV_STARLIGHT_JH7100 + bool + default y + select SOC_SERIES_STARFIVE_JH71XX + select SOC_JH7100 + select 64BIT diff --git a/boards/riscv/beaglev_starlight_jh7100/Kconfig.board b/boards/riscv/beaglev_starlight_jh7100/Kconfig.board deleted file mode 100644 index ddb5420e4a7aa..0000000000000 --- a/boards/riscv/beaglev_starlight_jh7100/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2021 Rajnesh Kanwal -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_BEAGLEV_STARLIGHT_JH7100 - bool "BeagleV Starlight JH7100 RISCV64 target" - depends on SOC_JH7100 - select 64BIT diff --git a/boards/riscv/beaglev_starlight_jh7100/Kconfig.defconfig b/boards/riscv/beaglev_starlight_jh7100/Kconfig.defconfig deleted file mode 100644 index 1c1647804ecd5..0000000000000 --- a/boards/riscv/beaglev_starlight_jh7100/Kconfig.defconfig +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Rajnesh Kanwal -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "beaglev_starlight_jh7100" - depends on BOARD_BEAGLEV_STARLIGHT_JH7100 diff --git a/boards/riscv/beaglev_starlight_jh7100/beaglev_starlight_jh7100_defconfig b/boards/riscv/beaglev_starlight_jh7100/beaglev_starlight_jh7100_defconfig index 72463474717ee..d2df81ad542be 100644 --- a/boards/riscv/beaglev_starlight_jh7100/beaglev_starlight_jh7100_defconfig +++ b/boards/riscv/beaglev_starlight_jh7100/beaglev_starlight_jh7100_defconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # Platform Configuration -CONFIG_SOC_SERIES_STARFIVE_JH71XX=y -CONFIG_SOC_JH7100=y -CONFIG_BOARD_BEAGLEV_STARLIGHT_JH7100=y CONFIG_STACK_SENTINEL=y # Zephyr Kernel Configuration diff --git a/boards/riscv/esp32c3_devkitm/Kconfig.board b/boards/riscv/esp32c3_devkitm/Kconfig.board deleted file mode 100644 index 8f5157be8b969..0000000000000 --- a/boards/riscv/esp32c3_devkitm/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# ESP32C3 devkitm board configuration - -# Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ESP32C3_DEVKITM - bool "ESP32C3 Devkit-M Board" - depends on SOC_ESP32C3 - select CONSOLE_HAS_DRIVER diff --git a/boards/riscv/esp32c3_devkitm/Kconfig.defconfig b/boards/riscv/esp32c3_devkitm/Kconfig.defconfig index d608df2ca4b21..b767cdb1592dc 100644 --- a/boards/riscv/esp32c3_devkitm/Kconfig.defconfig +++ b/boards/riscv/esp32c3_devkitm/Kconfig.defconfig @@ -3,10 +3,6 @@ # Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd. # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "esp32c3_devkitm" - depends on BOARD_ESP32C3_DEVKITM - if BT config HEAP_MEM_POOL_SIZE diff --git a/boards/riscv/esp32c3_devkitm/Kconfig.esp32c3_devkitm b/boards/riscv/esp32c3_devkitm/Kconfig.esp32c3_devkitm new file mode 100644 index 0000000000000..bdaaf9fbfb418 --- /dev/null +++ b/boards/riscv/esp32c3_devkitm/Kconfig.esp32c3_devkitm @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ESP32C3_DEVKITM + bool + default y + select SOC_ESP32C3 + select CONSOLE_HAS_DRIVER diff --git a/boards/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig b/boards/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig index 722854025bb1a..5fba412ddef27 100644 --- a/boards/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig +++ b/boards/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_ESP32C3_DEVKITM=y -CONFIG_SOC_ESP32C3=y CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 diff --git a/boards/riscv/gd32vf103c_starter/Kconfig.board b/boards/riscv/gd32vf103c_starter/Kconfig.board deleted file mode 100644 index 747958bef1a61..0000000000000 --- a/boards/riscv/gd32vf103c_starter/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 YuLong Yao -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32VF103C_STARTER - bool "GigaDevice GD32VF103C-STARTER" - depends on SOC_GD32VF103 diff --git a/boards/riscv/gd32vf103c_starter/Kconfig.defconfig b/boards/riscv/gd32vf103c_starter/Kconfig.defconfig deleted file mode 100644 index 09c16cab05598..0000000000000 --- a/boards/riscv/gd32vf103c_starter/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 YuLong Yao -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32VF103C_STARTER - -config BOARD - default "gd32vf103c_starter" - -endif # BOARD_GD32VF103C_STARTER diff --git a/boards/riscv/gd32vf103c_starter/Kconfig.gd32vf103c_starter b/boards/riscv/gd32vf103c_starter/Kconfig.gd32vf103c_starter new file mode 100644 index 0000000000000..1dd9b219e5bb3 --- /dev/null +++ b/boards/riscv/gd32vf103c_starter/Kconfig.gd32vf103c_starter @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32VF103C_STARTER + bool + default y + select SOC_SERIES_GD32VF103 + select SOC_GD32VF103 diff --git a/boards/riscv/gd32vf103c_starter/gd32vf103c_starter_defconfig b/boards/riscv/gd32vf103c_starter/gd32vf103c_starter_defconfig index 056959e18fb96..40bd1e379fad3 100644 --- a/boards/riscv/gd32vf103c_starter/gd32vf103c_starter_defconfig +++ b/boards/riscv/gd32vf103c_starter/gd32vf103c_starter_defconfig @@ -1,8 +1,5 @@ # Copyright (c) 2022 YuLong Yao # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32VF103=y -CONFIG_SOC_GD32VF103=y -CONFIG_BOARD_GD32VF103C_STARTER=y CONFIG_GD32_HXTAL_8MHZ=y diff --git a/boards/riscv/gd32vf103v_eval/Kconfig.board b/boards/riscv/gd32vf103v_eval/Kconfig.board deleted file mode 100644 index 1893adae071f9..0000000000000 --- a/boards/riscv/gd32vf103v_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021, Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32VF103V_EVAL - bool "GigaDevice GD32VF103V-EVAL" - depends on SOC_GD32VF103 diff --git a/boards/riscv/gd32vf103v_eval/Kconfig.defconfig b/boards/riscv/gd32vf103v_eval/Kconfig.defconfig deleted file mode 100644 index e3c8b4150f720..0000000000000 --- a/boards/riscv/gd32vf103v_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32VF103V_EVAL - -config BOARD - default "gd32vf103v_eval" - -endif # BOARD_GD32VF103V_EVAL diff --git a/boards/riscv/gd32vf103v_eval/Kconfig.gd32vf103v_eval b/boards/riscv/gd32vf103v_eval/Kconfig.gd32vf103v_eval new file mode 100644 index 0000000000000..0aeff9b48a361 --- /dev/null +++ b/boards/riscv/gd32vf103v_eval/Kconfig.gd32vf103v_eval @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32VF103V_EVAL + bool + default y + select SOC_SERIES_GD32VF103 + select SOC_GD32VF103 diff --git a/boards/riscv/gd32vf103v_eval/gd32vf103v_eval_defconfig b/boards/riscv/gd32vf103v_eval/gd32vf103v_eval_defconfig index 078392eed2a07..5e0cf1bd7cf16 100644 --- a/boards/riscv/gd32vf103v_eval/gd32vf103v_eval_defconfig +++ b/boards/riscv/gd32vf103v_eval/gd32vf103v_eval_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2021, Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32VF103=y -CONFIG_SOC_GD32VF103=y -CONFIG_BOARD_GD32VF103V_EVAL=y CONFIG_GD32_HXTAL_8MHZ=y diff --git a/boards/riscv/hifive1/Kconfig.board b/boards/riscv/hifive1/Kconfig.board deleted file mode 100644 index b5b3264944117..0000000000000 --- a/boards/riscv/hifive1/Kconfig.board +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_HIFIVE1 - bool "HiFive1 target" - depends on SOC_RISCV_SIFIVE_FREEDOM diff --git a/boards/riscv/hifive1/Kconfig.defconfig b/boards/riscv/hifive1/Kconfig.defconfig index 33356cb4da795..83850a151d1dd 100644 --- a/boards/riscv/hifive1/Kconfig.defconfig +++ b/boards/riscv/hifive1/Kconfig.defconfig @@ -1,11 +1,4 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_HIFIVE1 - -config BOARD - default "hifive1" - config SYS_CLOCK_TICKS_PER_SEC default 128 - -endif diff --git a/boards/riscv/hifive1/Kconfig.hifive1 b/boards/riscv/hifive1/Kconfig.hifive1 new file mode 100644 index 0000000000000..11e6eb7b704df --- /dev/null +++ b/boards/riscv/hifive1/Kconfig.hifive1 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HIFIVE1 + bool + default y + select SOC_SERIES_RISCV_SIFIVE_FREEDOM + select SOC_RISCV_SIFIVE_FREEDOM diff --git a/boards/riscv/hifive1/hifive1_defconfig b/boards/riscv/hifive1/hifive1_defconfig index 221b9028660f0..9b6aad06167b2 100644 --- a/boards/riscv/hifive1/hifive1_defconfig +++ b/boards/riscv/hifive1/hifive1_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_RISCV_SIFIVE_FREEDOM=y -CONFIG_SOC_RISCV_SIFIVE_FREEDOM=y -CONFIG_BOARD_HIFIVE1=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_SIFIVE_PORT_0=y diff --git a/boards/riscv/hifive1_revb/Kconfig.board b/boards/riscv/hifive1_revb/Kconfig.board deleted file mode 100644 index d4c5b99ce7269..0000000000000 --- a/boards/riscv/hifive1_revb/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2019 SiFive Inc. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_HIFIVE1_REVB - bool "HiFive1 Rev B target" - depends on SOC_RISCV_SIFIVE_FREEDOM diff --git a/boards/riscv/hifive1_revb/Kconfig.defconfig b/boards/riscv/hifive1_revb/Kconfig.defconfig index 22b33b3d960b7..3501ceaae09e8 100644 --- a/boards/riscv/hifive1_revb/Kconfig.defconfig +++ b/boards/riscv/hifive1_revb/Kconfig.defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2019 SiFive Inc. # SPDX-License-Identifier: Apache-2.0 -if BOARD_HIFIVE1_REVB - -config BOARD - default "hifive1_revb" - config HAS_FLASH_LOAD_OFFSET default y @@ -17,5 +12,3 @@ config FLASH_LOAD_OFFSET config SYS_CLOCK_TICKS_PER_SEC default 128 - -endif diff --git a/boards/riscv/hifive1_revb/Kconfig.hifive1_revb b/boards/riscv/hifive1_revb/Kconfig.hifive1_revb new file mode 100644 index 0000000000000..4b9fba18c3736 --- /dev/null +++ b/boards/riscv/hifive1_revb/Kconfig.hifive1_revb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HIFIVE1_REVB + bool + default y + select SOC_SERIES_RISCV_SIFIVE_FREEDOM + select SOC_RISCV_SIFIVE_FREEDOM diff --git a/boards/riscv/hifive1_revb/hifive1_revb_defconfig b/boards/riscv/hifive1_revb/hifive1_revb_defconfig index 4f691bd94354a..e5b40a8af97c9 100644 --- a/boards/riscv/hifive1_revb/hifive1_revb_defconfig +++ b/boards/riscv/hifive1_revb/hifive1_revb_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_RISCV_SIFIVE_FREEDOM=y -CONFIG_SOC_RISCV_SIFIVE_FREEDOM=y -CONFIG_BOARD_HIFIVE1_REVB=y CONFIG_GPIO=y CONFIG_PINCTRL=y CONFIG_CONSOLE=y diff --git a/boards/riscv/hifive_unleashed/Kconfig.board b/boards/riscv/hifive_unleashed/Kconfig.board deleted file mode 100644 index 4766e0ea7929e..0000000000000 --- a/boards/riscv/hifive_unleashed/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Katsuhiro Suzuki -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_HIFIVE_UNLEASHED - bool "HiFive Unleashed target" - depends on SOC_RISCV_SIFIVE_FU540 diff --git a/boards/riscv/hifive_unleashed/Kconfig.defconfig b/boards/riscv/hifive_unleashed/Kconfig.defconfig index 213aab0aab942..a272c6a127336 100644 --- a/boards/riscv/hifive_unleashed/Kconfig.defconfig +++ b/boards/riscv/hifive_unleashed/Kconfig.defconfig @@ -1,15 +1,8 @@ # Copyright (c) 2021 Katsuhiro Suzuki # SPDX-License-Identifier: Apache-2.0 -if BOARD_HIFIVE_UNLEASHED - -config BOARD - default "hifive_unleashed" - config SYS_CLOCK_TICKS_PER_SEC default 1000 config SYS_CLOCK_HW_CYCLES_PER_SEC default 1000000 - -endif diff --git a/boards/riscv/hifive_unleashed/Kconfig.hifive_unleashed b/boards/riscv/hifive_unleashed/Kconfig.hifive_unleashed new file mode 100644 index 0000000000000..bb292f3c38efe --- /dev/null +++ b/boards/riscv/hifive_unleashed/Kconfig.hifive_unleashed @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HIFIVE_UNLEASHED + bool + default y + select SOC_SERIES_RISCV_SIFIVE_FREEDOM + select SOC_RISCV_SIFIVE_FU540 diff --git a/boards/riscv/hifive_unleashed/hifive_unleashed_defconfig b/boards/riscv/hifive_unleashed/hifive_unleashed_defconfig index 15c9e60d5527c..5c8d5ad33c554 100644 --- a/boards/riscv/hifive_unleashed/hifive_unleashed_defconfig +++ b/boards/riscv/hifive_unleashed/hifive_unleashed_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_RISCV_SIFIVE_FREEDOM=y -CONFIG_SOC_RISCV_SIFIVE_FU540=y -CONFIG_BOARD_HIFIVE_UNLEASHED=y CONFIG_CONSOLE=y CONFIG_GPIO=y CONFIG_SERIAL=y diff --git a/boards/riscv/hifive_unmatched/Kconfig.board b/boards/riscv/hifive_unmatched/Kconfig.board deleted file mode 100644 index cf6ac1c839203..0000000000000 --- a/boards/riscv/hifive_unmatched/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Katsuhiro Suzuki -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_HIFIVE_UNMATCHED - bool "HiFive Unmatched target" - depends on SOC_RISCV_SIFIVE_FU740 diff --git a/boards/riscv/hifive_unmatched/Kconfig.defconfig b/boards/riscv/hifive_unmatched/Kconfig.defconfig index ee38da1c57917..a272c6a127336 100644 --- a/boards/riscv/hifive_unmatched/Kconfig.defconfig +++ b/boards/riscv/hifive_unmatched/Kconfig.defconfig @@ -1,15 +1,8 @@ # Copyright (c) 2021 Katsuhiro Suzuki # SPDX-License-Identifier: Apache-2.0 -if BOARD_HIFIVE_UNMATCHED - -config BOARD - default "hifive_unmatched" - config SYS_CLOCK_TICKS_PER_SEC default 1000 config SYS_CLOCK_HW_CYCLES_PER_SEC default 1000000 - -endif diff --git a/boards/riscv/hifive_unmatched/Kconfig.hifive_unmatched b/boards/riscv/hifive_unmatched/Kconfig.hifive_unmatched new file mode 100644 index 0000000000000..f80411193adeb --- /dev/null +++ b/boards/riscv/hifive_unmatched/Kconfig.hifive_unmatched @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HIFIVE_UNMATCHED + bool + default y + select SOC_SERIES_RISCV_SIFIVE_FREEDOM + select SOC_RISCV_SIFIVE_FU740 diff --git a/boards/riscv/hifive_unmatched/hifive_unmatched_defconfig b/boards/riscv/hifive_unmatched/hifive_unmatched_defconfig index 654fdc1bf2a61..c4cf571ed1681 100644 --- a/boards/riscv/hifive_unmatched/hifive_unmatched_defconfig +++ b/boards/riscv/hifive_unmatched/hifive_unmatched_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_SERIES_RISCV_SIFIVE_FREEDOM=y -CONFIG_SOC_RISCV_SIFIVE_FU740=y -CONFIG_BOARD_HIFIVE_UNMATCHED=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_SIFIVE_PORT_0=y diff --git a/boards/riscv/icev_wireless/Kconfig.board b/boards/riscv/icev_wireless/Kconfig.board deleted file mode 100644 index 21e7a72815ef2..0000000000000 --- a/boards/riscv/icev_wireless/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 Friedt Professional Engineering Services, Inc -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ICEV_WIRELESS - bool "ICE-V Wireless Board" - depends on SOC_ESP32C3 diff --git a/boards/riscv/icev_wireless/Kconfig.defconfig b/boards/riscv/icev_wireless/Kconfig.defconfig index fd718cdba4ce2..52c7389a52ddd 100644 --- a/boards/riscv/icev_wireless/Kconfig.defconfig +++ b/boards/riscv/icev_wireless/Kconfig.defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022 Friedt Professional Engineering Services, Inc # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "icev_wireless" - depends on BOARD_ICEV_WIRELESS - if BT config HEAP_MEM_POOL_SIZE diff --git a/boards/riscv/icev_wireless/Kconfig.icev_wireless b/boards/riscv/icev_wireless/Kconfig.icev_wireless new file mode 100644 index 0000000000000..4c1763209edd1 --- /dev/null +++ b/boards/riscv/icev_wireless/Kconfig.icev_wireless @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ICEV_WIRELESS + bool + default y + select SOC_ESP32C3 diff --git a/boards/riscv/icev_wireless/icev_wireless_defconfig b/boards/riscv/icev_wireless/icev_wireless_defconfig index cbb782442fa58..5fba412ddef27 100644 --- a/boards/riscv/icev_wireless/icev_wireless_defconfig +++ b/boards/riscv/icev_wireless/icev_wireless_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_ICEV_WIRELESS=y -CONFIG_SOC_ESP32C3=y CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 diff --git a/boards/riscv/it8xxx2_evb/Kconfig.board b/boards/riscv/it8xxx2_evb/Kconfig.board deleted file mode 100644 index 52040e4854c2e..0000000000000 --- a/boards/riscv/it8xxx2_evb/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2020 ITE Corporation. All Rights Reserved. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_IT8XXX2_EVB - bool "IT8XXX2 EV-board" - depends on SOC_IT8XXX2 diff --git a/boards/riscv/it8xxx2_evb/Kconfig.defconfig b/boards/riscv/it8xxx2_evb/Kconfig.defconfig deleted file mode 100644 index a207bafd0cc2b..0000000000000 --- a/boards/riscv/it8xxx2_evb/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2020 ITE Corporation. All Rights Reserved. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_IT8XXX2_EVB - -config BOARD - default "it8xxx2_evb" -endif diff --git a/boards/riscv/it8xxx2_evb/Kconfig.it8xxx2_evb b/boards/riscv/it8xxx2_evb/Kconfig.it8xxx2_evb new file mode 100644 index 0000000000000..9c2b6bef28a20 --- /dev/null +++ b/boards/riscv/it8xxx2_evb/Kconfig.it8xxx2_evb @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_IT8XXX2_EVB + bool + default y + select SOC_SERIES_RISCV32_IT8XXX2 + select SOC_IT8XXX2 diff --git a/boards/riscv/it8xxx2_evb/it8xxx2_evb_defconfig b/boards/riscv/it8xxx2_evb/it8xxx2_evb_defconfig index 9aa7deef842bc..670ad43717eb9 100644 --- a/boards/riscv/it8xxx2_evb/it8xxx2_evb_defconfig +++ b/boards/riscv/it8xxx2_evb/it8xxx2_evb_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2020 ITE Corporation. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_RISCV32_IT8XXX2=y -CONFIG_SOC_IT8XXX2=y -CONFIG_BOARD_IT8XXX2_EVB=y CONFIG_BOOT_DELAY=1 CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/riscv/litex_vexriscv/Kconfig.board b/boards/riscv/litex_vexriscv/Kconfig.board deleted file mode 100644 index de9d8026b6a00..0000000000000 --- a/boards/riscv/litex_vexriscv/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2018 - 2019 Antmicro -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LITEX_VEXRISCV - bool "Board with LiteX/VexRiscV CPU" - depends on SOC_RISCV32_LITEX_VEXRISCV diff --git a/boards/riscv/litex_vexriscv/Kconfig.defconfig b/boards/riscv/litex_vexriscv/Kconfig.defconfig index ef0440b9a37e9..c314a21871281 100644 --- a/boards/riscv/litex_vexriscv/Kconfig.defconfig +++ b/boards/riscv/litex_vexriscv/Kconfig.defconfig @@ -1,16 +1,9 @@ # Copyright (c) 2018 - 2019 Antmicro # SPDX-License-Identifier: Apache-2.0 -if BOARD_LITEX_VEXRISCV - -config BOARD - default "litex_vexriscv" - if NETWORKING config NET_L2_ETHERNET default y endif # NETWORKING - -endif # BOARD_LITEX_VEXRISCV diff --git a/boards/riscv/litex_vexriscv/Kconfig.litex_vexriscv b/boards/riscv/litex_vexriscv/Kconfig.litex_vexriscv new file mode 100644 index 0000000000000..f47e89a73ee02 --- /dev/null +++ b/boards/riscv/litex_vexriscv/Kconfig.litex_vexriscv @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LITEX_VEXRISCV + bool + default y + select SOC_RISCV32_LITEX_VEXRISCV diff --git a/boards/riscv/litex_vexriscv/litex_vexriscv_defconfig b/boards/riscv/litex_vexriscv/litex_vexriscv_defconfig index b8730d07d06fa..d51a5923ff8f0 100644 --- a/boards/riscv/litex_vexriscv/litex_vexriscv_defconfig +++ b/boards/riscv/litex_vexriscv/litex_vexriscv_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_RISCV32_LITEX_VEXRISCV=y -CONFIG_BOARD_LITEX_VEXRISCV=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y diff --git a/boards/riscv/longan_nano/Kconfig.board b/boards/riscv/longan_nano/Kconfig.board deleted file mode 100644 index f656bdbf67a01..0000000000000 --- a/boards/riscv/longan_nano/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2021 Tokita, Hiroshi -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LONGAN_NANO - bool "Sipeed Longan Nano target" - depends on SOC_GD32VF103 - -config BOARD_LONGAN_NANO_LITE - bool "Sipeed Longan Nano Lite target" - depends on SOC_GD32VF103 diff --git a/boards/riscv/longan_nano/Kconfig.defconfig b/boards/riscv/longan_nano/Kconfig.defconfig index af4f75cf89847..67e25abaccebf 100644 --- a/boards/riscv/longan_nano/Kconfig.defconfig +++ b/boards/riscv/longan_nano/Kconfig.defconfig @@ -2,13 +2,5 @@ # Copyright (c) 2021 Tokita, Hiroshi -if BOARD_LONGAN_NANO || BOARD_LONGAN_NANO_LITE - -config BOARD - default "longan_nano" if BOARD_LONGAN_NANO - default "longan_nano_lite" if BOARD_LONGAN_NANO_LITE - config DISK_DRIVER_SDMMC default y if DISK_DRIVERS - -endif # BOARD_LONGAN_NANO || BOARD_LONGAN_NANO_LITE diff --git a/boards/riscv/longan_nano/Kconfig.longan_nano b/boards/riscv/longan_nano/Kconfig.longan_nano new file mode 100644 index 0000000000000..f5f41c1f610af --- /dev/null +++ b/boards/riscv/longan_nano/Kconfig.longan_nano @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LONGAN_NANO + bool + default y + select SOC_SERIES_GD32VF103 + select SOC_GD32VF103 diff --git a/boards/riscv/longan_nano/Kconfig.longan_nano_lite b/boards/riscv/longan_nano/Kconfig.longan_nano_lite new file mode 100644 index 0000000000000..8740d86cbb3af --- /dev/null +++ b/boards/riscv/longan_nano/Kconfig.longan_nano_lite @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LONGAN_NANO_LITE + bool + default y + select SOC_SERIES_GD32VF103 + select SOC_GD32VF103 diff --git a/boards/riscv/longan_nano/longan_nano_defconfig b/boards/riscv/longan_nano/longan_nano_defconfig index fc2aa06f616f1..86e55b32d8257 100644 --- a/boards/riscv/longan_nano/longan_nano_defconfig +++ b/boards/riscv/longan_nano/longan_nano_defconfig @@ -4,9 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32VF103=y -CONFIG_SOC_GD32VF103=y -CONFIG_BOARD_LONGAN_NANO=y CONFIG_GD32_HXTAL_8MHZ=y diff --git a/boards/riscv/longan_nano/longan_nano_lite_defconfig b/boards/riscv/longan_nano/longan_nano_lite_defconfig index 2c3743c01629b..6389bc1627175 100644 --- a/boards/riscv/longan_nano/longan_nano_lite_defconfig +++ b/boards/riscv/longan_nano/longan_nano_lite_defconfig @@ -4,9 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32VF103=y -CONFIG_SOC_GD32VF103=y -CONFIG_BOARD_LONGAN_NANO_LITE=y CONFIG_GD32_HXTAL_8MHZ=y diff --git a/boards/riscv/m2gl025_miv/Kconfig.board b/boards/riscv/m2gl025_miv/Kconfig.board deleted file mode 100644 index 9154176ece6f1..0000000000000 --- a/boards/riscv/m2gl025_miv/Kconfig.board +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_M2GL025_MIV - bool "Microsemi M2GL025 IGLOO2 dev board with Mi-V CPU" - depends on SOC_RISCV32_MIV diff --git a/boards/riscv/m2gl025_miv/Kconfig.defconfig b/boards/riscv/m2gl025_miv/Kconfig.defconfig deleted file mode 100644 index 43f9c813c9a80..0000000000000 --- a/boards/riscv/m2gl025_miv/Kconfig.defconfig +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "m2gl025_miv" - depends on BOARD_M2GL025_MIV diff --git a/boards/riscv/m2gl025_miv/Kconfig.m2gl025_miv b/boards/riscv/m2gl025_miv/Kconfig.m2gl025_miv new file mode 100644 index 0000000000000..7c5155013adfd --- /dev/null +++ b/boards/riscv/m2gl025_miv/Kconfig.m2gl025_miv @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_M2GL025_MIV + bool + default y + select SOC_SERIES_RISCV32_MIV + select SOC_RISCV32_MIV diff --git a/boards/riscv/m2gl025_miv/m2gl025_miv_defconfig b/boards/riscv/m2gl025_miv/m2gl025_miv_defconfig index 8c944a10a7490..a00960e8ca074 100644 --- a/boards/riscv/m2gl025_miv/m2gl025_miv_defconfig +++ b/boards/riscv/m2gl025_miv/m2gl025_miv_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_RISCV32_MIV=y -CONFIG_SOC_RISCV32_MIV=y -CONFIG_BOARD_M2GL025_MIV=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y diff --git a/boards/riscv/mpfs_icicle/Kconfig.board b/boards/riscv/mpfs_icicle/Kconfig.board deleted file mode 100644 index ce35042e9064d..0000000000000 --- a/boards/riscv/mpfs_icicle/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021-2022 Microchip Technology Inc -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_MPFS_ICICLE - bool "Microsemi PolarFire SoC ICICLE kit" - depends on SOC_MPFS - select 64BIT - select SCHED_IPI_SUPPORTED - select CPU_HAS_FPU_DOUBLE_PRECISION diff --git a/boards/riscv/mpfs_icicle/Kconfig.defconfig b/boards/riscv/mpfs_icicle/Kconfig.defconfig deleted file mode 100644 index 5993e6878c9b9..0000000000000 --- a/boards/riscv/mpfs_icicle/Kconfig.defconfig +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2020-2021 Microchip Technology Inc -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "mpfs_icicle" - depends on BOARD_MPFS_ICICLE diff --git a/boards/riscv/mpfs_icicle/Kconfig.mpfs_icicle b/boards/riscv/mpfs_icicle/Kconfig.mpfs_icicle new file mode 100644 index 0000000000000..e79ca11b80464 --- /dev/null +++ b/boards/riscv/mpfs_icicle/Kconfig.mpfs_icicle @@ -0,0 +1,11 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MPFS_ICICLE + bool + default y + select SOC_SERIES_RISCV64_MIV + select SOC_MPFS + select 64BIT + select SCHED_IPI_SUPPORTED + select CPU_HAS_FPU_DOUBLE_PRECISION diff --git a/boards/riscv/mpfs_icicle/mpfs_icicle_defconfig b/boards/riscv/mpfs_icicle/mpfs_icicle_defconfig index 7604a660896bf..abac1ac13e559 100644 --- a/boards/riscv/mpfs_icicle/mpfs_icicle_defconfig +++ b/boards/riscv/mpfs_icicle/mpfs_icicle_defconfig @@ -1,12 +1,9 @@ # Copyright (c) 2020-2021 Microchip Technology Inc # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_RISCV64_MIV=y -CONFIG_SOC_MPFS=y CONFIG_MPFS_HAL=n CONFIG_BASE64=y CONFIG_INCLUDE_RESET_VECTOR=y -CONFIG_BOARD_MPFS_ICICLE=y CONFIG_NO_OPTIMIZATIONS=y CONFIG_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/riscv/neorv32/Kconfig.board b/boards/riscv/neorv32/Kconfig.board deleted file mode 100644 index eee37f4a8c399..0000000000000 --- a/boards/riscv/neorv32/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NEORV32 - bool "NEORV32 Processor (SoC)" - depends on SOC_SERIES_NEORV32 diff --git a/boards/riscv/neorv32/Kconfig.defconfig b/boards/riscv/neorv32/Kconfig.defconfig deleted file mode 100644 index 350255fb06a2a..0000000000000 --- a/boards/riscv/neorv32/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NEORV32 - -config BOARD - default "neorv32" - -endif # BOARD_NEORV32 diff --git a/boards/riscv/neorv32/Kconfig.neorv32 b/boards/riscv/neorv32/Kconfig.neorv32 new file mode 100644 index 0000000000000..ba733fdf41607 --- /dev/null +++ b/boards/riscv/neorv32/Kconfig.neorv32 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NEORV32 + bool + default y + select SOC_SERIES_NEORV32 + select SOC_NEORV32_ISA_C diff --git a/boards/riscv/neorv32/neorv32_defconfig b/boards/riscv/neorv32/neorv32_defconfig index 17e9b8038cec4..b95f95f7125f5 100644 --- a/boards/riscv/neorv32/neorv32_defconfig +++ b/boards/riscv/neorv32/neorv32_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2021 Henrik Brix Andersen # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NEORV32=y -CONFIG_SOC_NEORV32_ISA_C=y -CONFIG_BOARD_NEORV32=y CONFIG_SERIAL=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/riscv/qemu_riscv32/Kconfig.board b/boards/riscv/qemu_riscv32/Kconfig.board deleted file mode 100644 index 3277f94129af6..0000000000000 --- a/boards/riscv/qemu_riscv32/Kconfig.board +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_RISCV32 - bool "QEMU RISCV32 target" - depends on SOC_RISCV_VIRT - select QEMU_TARGET - select CPU_HAS_FPU - select RISCV_ISA_RV32I - select RISCV_ISA_EXT_ZICSR - select RISCV_ISA_EXT_ZIFENCEI - -config BOARD_QEMU_RISCV32_SMP - bool "QEMU RISCV32 SMP target" - depends on SOC_RISCV_VIRT - select QEMU_TARGET - select CPU_HAS_FPU - select RISCV_ISA_RV32I - select RISCV_ISA_EXT_ZICSR - select RISCV_ISA_EXT_ZIFENCEI - -config BOARD_QEMU_RISCV32_XIP - bool "QEMU RISCV32 XIP target" - depends on SOC_RISCV_SIFIVE_FREEDOM - select QEMU_TARGET - select CPU_HAS_FPU - select RISCV_ISA_RV32I - select RISCV_ISA_EXT_ZICSR - select RISCV_ISA_EXT_ZIFENCEI diff --git a/boards/riscv/qemu_riscv32/Kconfig.defconfig b/boards/riscv/qemu_riscv32/Kconfig.defconfig index f0e0768d08278..c12ade6dff1d3 100644 --- a/boards/riscv/qemu_riscv32/Kconfig.defconfig +++ b/boards/riscv/qemu_riscv32/Kconfig.defconfig @@ -3,11 +3,6 @@ config BUILD_OUTPUT_BIN default n -config BOARD - default "qemu_riscv32" if BOARD_QEMU_RISCV32 - default "qemu_riscv32_xip" if BOARD_QEMU_RISCV32_XIP - default "qemu_riscv32_smp" if BOARD_QEMU_RISCV32_SMP - # Use thread local storage by default so that # this feature gets more CI coverage. config THREAD_LOCAL_STORAGE diff --git a/boards/riscv/qemu_riscv32/Kconfig.qemu_riscv32 b/boards/riscv/qemu_riscv32/Kconfig.qemu_riscv32 new file mode 100644 index 0000000000000..35ce84f762852 --- /dev/null +++ b/boards/riscv/qemu_riscv32/Kconfig.qemu_riscv32 @@ -0,0 +1,13 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_RISCV32 + bool + default y + select SOC_SERIES_RISCV_VIRT + select SOC_RISCV_VIRT + select QEMU_TARGET + select CPU_HAS_FPU + select RISCV_ISA_RV32I + select RISCV_ISA_EXT_ZICSR + select RISCV_ISA_EXT_ZIFENCEI diff --git a/boards/riscv/qemu_riscv32/Kconfig.qemu_riscv32_smp b/boards/riscv/qemu_riscv32/Kconfig.qemu_riscv32_smp new file mode 100644 index 0000000000000..1de735f961c20 --- /dev/null +++ b/boards/riscv/qemu_riscv32/Kconfig.qemu_riscv32_smp @@ -0,0 +1,13 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_RISCV32_SMP + bool + default y + select SOC_SERIES_RISCV_VIRT + select SOC_RISCV_VIRT + select QEMU_TARGET + select CPU_HAS_FPU + select RISCV_ISA_RV32I + select RISCV_ISA_EXT_ZICSR + select RISCV_ISA_EXT_ZIFENCEI diff --git a/boards/riscv/qemu_riscv32/Kconfig.qemu_riscv32_xip b/boards/riscv/qemu_riscv32/Kconfig.qemu_riscv32_xip new file mode 100644 index 0000000000000..6a1f8ed65543b --- /dev/null +++ b/boards/riscv/qemu_riscv32/Kconfig.qemu_riscv32_xip @@ -0,0 +1,13 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_RISCV32_XIP + bool + default y + select SOC_SERIES_RISCV_SIFIVE_FREEDOM + select SOC_RISCV_SIFIVE_FREEDOM + select QEMU_TARGET + select CPU_HAS_FPU + select RISCV_ISA_RV32I + select RISCV_ISA_EXT_ZICSR + select RISCV_ISA_EXT_ZIFENCEI diff --git a/boards/riscv/qemu_riscv32/qemu_riscv32_defconfig b/boards/riscv/qemu_riscv32/qemu_riscv32_defconfig index f50d82dcb76c2..affc1eeffb740 100644 --- a/boards/riscv/qemu_riscv32/qemu_riscv32_defconfig +++ b/boards/riscv/qemu_riscv32/qemu_riscv32_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_RISCV_VIRT=y -CONFIG_SOC_RISCV_VIRT=y -CONFIG_BOARD_QEMU_RISCV32=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y diff --git a/boards/riscv/qemu_riscv32/qemu_riscv32_smp_defconfig b/boards/riscv/qemu_riscv32/qemu_riscv32_smp_defconfig index da0a1fb441bde..49dcc98241945 100644 --- a/boards/riscv/qemu_riscv32/qemu_riscv32_smp_defconfig +++ b/boards/riscv/qemu_riscv32/qemu_riscv32_smp_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_RISCV_VIRT=y -CONFIG_SOC_RISCV_VIRT=y -CONFIG_BOARD_QEMU_RISCV32_SMP=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y diff --git a/boards/riscv/qemu_riscv32/qemu_riscv32_xip_defconfig b/boards/riscv/qemu_riscv32/qemu_riscv32_xip_defconfig index 2cd0b2cbecbba..f9bc269d13f27 100644 --- a/boards/riscv/qemu_riscv32/qemu_riscv32_xip_defconfig +++ b/boards/riscv/qemu_riscv32/qemu_riscv32_xip_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_RISCV_SIFIVE_FREEDOM=y -CONFIG_SOC_RISCV_SIFIVE_FREEDOM=y -CONFIG_BOARD_QEMU_RISCV32_XIP=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_SIFIVE_PORT_0=y diff --git a/boards/riscv/qemu_riscv32e/Kconfig.board b/boards/riscv/qemu_riscv32e/Kconfig.board deleted file mode 100644 index 043be02bfbd73..0000000000000 --- a/boards/riscv/qemu_riscv32e/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2022 Carlo Caione -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_RISCV32E - bool "QEMU RISCV32E target" - depends on SOC_RISCV_VIRT - select QEMU_TARGET - select RISCV_ISA_RV32E - select RISCV_ISA_EXT_ZICSR - select RISCV_ISA_EXT_ZIFENCEI diff --git a/boards/riscv/qemu_riscv32e/Kconfig.defconfig b/boards/riscv/qemu_riscv32e/Kconfig.defconfig index 54d455ef540bf..c4bd81e4a70c1 100644 --- a/boards/riscv/qemu_riscv32e/Kconfig.defconfig +++ b/boards/riscv/qemu_riscv32e/Kconfig.defconfig @@ -4,9 +4,6 @@ config BUILD_OUTPUT_BIN default n -config BOARD - default "qemu_riscv32e" if BOARD_QEMU_RISCV32E - # Use thread local storage by default so that # this feature gets more CI coverage. config THREAD_LOCAL_STORAGE diff --git a/boards/riscv/qemu_riscv32e/Kconfig.qemu_riscv32e b/boards/riscv/qemu_riscv32e/Kconfig.qemu_riscv32e new file mode 100644 index 0000000000000..505b6752d9518 --- /dev/null +++ b/boards/riscv/qemu_riscv32e/Kconfig.qemu_riscv32e @@ -0,0 +1,12 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_RISCV32E + bool + default y + select SOC_SERIES_RISCV_VIRT + select SOC_RISCV_VIRT + select QEMU_TARGET + select RISCV_ISA_RV32E + select RISCV_ISA_EXT_ZICSR + select RISCV_ISA_EXT_ZIFENCEI diff --git a/boards/riscv/qemu_riscv32e/qemu_riscv32e_defconfig b/boards/riscv/qemu_riscv32e/qemu_riscv32e_defconfig index ef4d6273cfbda..affc1eeffb740 100644 --- a/boards/riscv/qemu_riscv32e/qemu_riscv32e_defconfig +++ b/boards/riscv/qemu_riscv32e/qemu_riscv32e_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_RISCV_VIRT=y -CONFIG_SOC_RISCV_VIRT=y -CONFIG_BOARD_QEMU_RISCV32E=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y diff --git a/boards/riscv/qemu_riscv64/Kconfig.board b/boards/riscv/qemu_riscv64/Kconfig.board deleted file mode 100644 index eb92cfef930c0..0000000000000 --- a/boards/riscv/qemu_riscv64/Kconfig.board +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2019 BayLibre SAS -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_RISCV64 - bool "QEMU RISCV64 target" - depends on SOC_RISCV_VIRT - select QEMU_TARGET - select 64BIT - select CPU_HAS_FPU_DOUBLE_PRECISION - select RISCV_ISA_RV64I - select RISCV_ISA_EXT_ZICSR - select RISCV_ISA_EXT_ZIFENCEI - -config BOARD_QEMU_RISCV64_SMP - bool "QEMU RISCV64 SMP target" - depends on SOC_RISCV_VIRT - select QEMU_TARGET - select 64BIT - select CPU_HAS_FPU_DOUBLE_PRECISION - select RISCV_ISA_RV64I - select RISCV_ISA_EXT_ZICSR - select RISCV_ISA_EXT_ZIFENCEI diff --git a/boards/riscv/qemu_riscv64/Kconfig.defconfig b/boards/riscv/qemu_riscv64/Kconfig.defconfig index 7b5d8bfbdcfb4..ca71076e5dfe1 100644 --- a/boards/riscv/qemu_riscv64/Kconfig.defconfig +++ b/boards/riscv/qemu_riscv64/Kconfig.defconfig @@ -3,7 +3,3 @@ config BUILD_OUTPUT_BIN default n - -config BOARD - default "qemu_riscv64" if BOARD_QEMU_RISCV64 - default "qemu_riscv64_smp" if BOARD_QEMU_RISCV64_SMP diff --git a/boards/riscv/qemu_riscv64/Kconfig.qemu_riscv64 b/boards/riscv/qemu_riscv64/Kconfig.qemu_riscv64 new file mode 100644 index 0000000000000..6b957324b497d --- /dev/null +++ b/boards/riscv/qemu_riscv64/Kconfig.qemu_riscv64 @@ -0,0 +1,14 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_RISCV64 + bool + default y + select SOC_SERIES_RISCV_VIRT + select SOC_RISCV_VIRT + select QEMU_TARGET + select 64BIT + select CPU_HAS_FPU_DOUBLE_PRECISION + select RISCV_ISA_RV64I + select RISCV_ISA_EXT_ZICSR + select RISCV_ISA_EXT_ZIFENCEI diff --git a/boards/riscv/qemu_riscv64/Kconfig.qemu_riscv64_smp b/boards/riscv/qemu_riscv64/Kconfig.qemu_riscv64_smp new file mode 100644 index 0000000000000..873f9002ee947 --- /dev/null +++ b/boards/riscv/qemu_riscv64/Kconfig.qemu_riscv64_smp @@ -0,0 +1,14 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_RISCV64_SMP + bool + default y + select SOC_SERIES_RISCV_VIRT + select SOC_RISCV_VIRT + select QEMU_TARGET + select 64BIT + select CPU_HAS_FPU_DOUBLE_PRECISION + select RISCV_ISA_RV64I + select RISCV_ISA_EXT_ZICSR + select RISCV_ISA_EXT_ZIFENCEI diff --git a/boards/riscv/qemu_riscv64/qemu_riscv64_defconfig b/boards/riscv/qemu_riscv64/qemu_riscv64_defconfig index 6f51da3c59249..7ae972e82e4ef 100644 --- a/boards/riscv/qemu_riscv64/qemu_riscv64_defconfig +++ b/boards/riscv/qemu_riscv64/qemu_riscv64_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_RISCV_VIRT=y -CONFIG_SOC_RISCV_VIRT=y -CONFIG_BOARD_QEMU_RISCV64=y CONFIG_PRIVILEGED_STACK_SIZE=2048 CONFIG_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/riscv/qemu_riscv64/qemu_riscv64_smp_defconfig b/boards/riscv/qemu_riscv64/qemu_riscv64_smp_defconfig index 279ea16273798..49dcc98241945 100644 --- a/boards/riscv/qemu_riscv64/qemu_riscv64_smp_defconfig +++ b/boards/riscv/qemu_riscv64/qemu_riscv64_smp_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_RISCV_VIRT=y -CONFIG_SOC_RISCV_VIRT=y -CONFIG_BOARD_QEMU_RISCV64=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y diff --git a/boards/riscv/rv32m1_vega/Kconfig.board b/boards/riscv/rv32m1_vega/Kconfig.board deleted file mode 100644 index 1c36ce9cd7e2f..0000000000000 --- a/boards/riscv/rv32m1_vega/Kconfig.board +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_RV32M1_VEGA - bool "RV32M1 RISC-V cores" - depends on SOC_OPENISA_RV32M1_RISCV32 diff --git a/boards/riscv/rv32m1_vega/Kconfig.defconfig b/boards/riscv/rv32m1_vega/Kconfig.defconfig index 9446ac4a9aed8..9a01545374e1a 100644 --- a/boards/riscv/rv32m1_vega/Kconfig.defconfig +++ b/boards/riscv/rv32m1_vega/Kconfig.defconfig @@ -1,11 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_RV32M1_VEGA - -config BOARD - default "rv32m1_vega_ri5cy" if SOC_OPENISA_RV32M1_RI5CY - default "rv32m1_vega_zero_riscy" if SOC_OPENISA_RV32M1_ZERO_RISCY - if BT config BT_CTLR @@ -28,5 +22,3 @@ config RV32M1_INTMUX_CHANNEL_3 default n endif # BT - -endif # BOARD_RV32M1_VEGA diff --git a/boards/riscv/rv32m1_vega/Kconfig.rv32m1_vega b/boards/riscv/rv32m1_vega/Kconfig.rv32m1_vega new file mode 100644 index 0000000000000..8995f93147bc3 --- /dev/null +++ b/boards/riscv/rv32m1_vega/Kconfig.rv32m1_vega @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RV32M1_VEGA + bool + default y + select SOC_OPENISA_RV32M1_RISCV32 + select SOC_OPENISA_RV32M1_RI5CY diff --git a/boards/riscv/rv32m1_vega/Kconfig.rv32m1_vega_ri5cy b/boards/riscv/rv32m1_vega/Kconfig.rv32m1_vega_ri5cy new file mode 100644 index 0000000000000..fd18104df8476 --- /dev/null +++ b/boards/riscv/rv32m1_vega/Kconfig.rv32m1_vega_ri5cy @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RV32M1_VEGA_RI5CY + bool + default y + select SOC_OPENISA_RV32M1_RISCV32 + select SOC_OPENISA_RV32M1_RI5CY diff --git a/boards/riscv/rv32m1_vega/Kconfig.rv32m1_vega_zero_riscy b/boards/riscv/rv32m1_vega/Kconfig.rv32m1_vega_zero_riscy new file mode 100644 index 0000000000000..eb1bc797b1cd5 --- /dev/null +++ b/boards/riscv/rv32m1_vega/Kconfig.rv32m1_vega_zero_riscy @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RV32M1_VEGA_ZERO_RISCY + bool + default y + select SOC_OPENISA_RV32M1_RISCV32 + select SOC_OPENISA_RV32M1_ZERO_RISCY diff --git a/boards/riscv/rv32m1_vega/rv32m1_vega_ri5cy_defconfig b/boards/riscv/rv32m1_vega/rv32m1_vega_ri5cy_defconfig index 51071efb902b1..ebde3f5cd378a 100644 --- a/boards/riscv/rv32m1_vega/rv32m1_vega_ri5cy_defconfig +++ b/boards/riscv/rv32m1_vega/rv32m1_vega_ri5cy_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_OPENISA_RV32M1_RISCV32=y -CONFIG_SOC_OPENISA_RV32M1_RI5CY=y -CONFIG_BOARD_RV32M1_VEGA=y CONFIG_GPIO=y CONFIG_PINCTRL=y CONFIG_SERIAL=y diff --git a/boards/riscv/rv32m1_vega/rv32m1_vega_zero_riscy_defconfig b/boards/riscv/rv32m1_vega/rv32m1_vega_zero_riscy_defconfig index 627ed311846eb..88b6e5aedb6c3 100644 --- a/boards/riscv/rv32m1_vega/rv32m1_vega_zero_riscy_defconfig +++ b/boards/riscv/rv32m1_vega/rv32m1_vega_zero_riscy_defconfig @@ -1,6 +1,3 @@ -CONFIG_SOC_OPENISA_RV32M1_RISCV32=y -CONFIG_SOC_OPENISA_RV32M1_ZERO_RISCY=y -CONFIG_BOARD_RV32M1_VEGA=y CONFIG_GPIO=y CONFIG_PINCTRL=y CONFIG_SERIAL=y diff --git a/boards/riscv/tlsr9518adk80d/Kconfig.board b/boards/riscv/tlsr9518adk80d/Kconfig.board deleted file mode 100644 index bd36cb0e481f3..0000000000000 --- a/boards/riscv/tlsr9518adk80d/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 Telink Semiconductor -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_TLSR9518ADK80D - bool "Telink B91 Platform" - depends on SOC_RISCV_TELINK_B91 diff --git a/boards/riscv/tlsr9518adk80d/Kconfig.defconfig b/boards/riscv/tlsr9518adk80d/Kconfig.defconfig index ce11f3aaabe2f..8f9e76936bd89 100644 --- a/boards/riscv/tlsr9518adk80d/Kconfig.defconfig +++ b/boards/riscv/tlsr9518adk80d/Kconfig.defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2021 Telink Semiconductor # SPDX-License-Identifier: Apache-2.0 -if BOARD_TLSR9518ADK80D - -config BOARD - default "tlsr9518adk80d" - config SOC_FLASH_TELINK_B91 default y if FLASH @@ -37,5 +32,3 @@ config FLASH_LOAD_OFFSET # maximum image writer buffer size for such kind of boards. config IMG_BLOCK_BUF_SIZE default 256 if MCUBOOT_IMG_MANAGER - -endif diff --git a/boards/riscv/tlsr9518adk80d/Kconfig.tlsr9518adk80d b/boards/riscv/tlsr9518adk80d/Kconfig.tlsr9518adk80d new file mode 100644 index 0000000000000..edfa01742795f --- /dev/null +++ b/boards/riscv/tlsr9518adk80d/Kconfig.tlsr9518adk80d @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_TLSR9518ADK80D + bool + default y + select SOC_SERIES_RISCV_TELINK_B91 + select SOC_RISCV_TELINK_B91 diff --git a/boards/riscv/tlsr9518adk80d/tlsr9518adk80d_defconfig b/boards/riscv/tlsr9518adk80d/tlsr9518adk80d_defconfig index fe5cfbe8c2eb3..881ec1fdbefc0 100644 --- a/boards/riscv/tlsr9518adk80d/tlsr9518adk80d_defconfig +++ b/boards/riscv/tlsr9518adk80d/tlsr9518adk80d_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2021 Telink Semiconductor # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_RISCV_TELINK_B91=y -CONFIG_SOC_RISCV_TELINK_B91=y -CONFIG_BOARD_TLSR9518ADK80D=y CONFIG_GPIO=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 CONFIG_HEAP_MEM_POOL_SIZE=4096 diff --git a/boards/shields/x_nucleo_iks02a1/boards/nucleo_f411re.defconfig b/boards/shields/x_nucleo_iks02a1/boards/nucleo_f411re.defconfig index e0578796c150a..a625bbc3a56ef 100644 --- a/boards/shields/x_nucleo_iks02a1/boards/nucleo_f411re.defconfig +++ b/boards/shields/x_nucleo_iks02a1/boards/nucleo_f411re.defconfig @@ -2,8 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_NUCLEO_F411RE - if I2S # The I2S should be configured in such a way it generates a 2MHz @@ -41,5 +39,3 @@ config I2S_STM32_PLLI2S_PLLR default 3 endif # I2S - -endif # BOARD_NUCLEO_F411RE diff --git a/boards/sparc/generic_leon3/Kconfig.board b/boards/sparc/generic_leon3/Kconfig.board deleted file mode 100644 index 9ba65374a3cd8..0000000000000 --- a/boards/sparc/generic_leon3/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2019-2020 Cobham Gaisler AB -# -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GENERIC_LEON3 - bool "Generic LEON3 system" - depends on SOC_LEON3 diff --git a/boards/sparc/generic_leon3/Kconfig.defconfig b/boards/sparc/generic_leon3/Kconfig.defconfig index 97a92b57df5b3..6ae5450102666 100644 --- a/boards/sparc/generic_leon3/Kconfig.defconfig +++ b/boards/sparc/generic_leon3/Kconfig.defconfig @@ -2,11 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_GENERIC_LEON3 - -config BOARD - default "generic_leon3" - config SPARC_CASA default n @@ -15,5 +10,3 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC config UART_INTERRUPT_DRIVEN default y - -endif diff --git a/boards/sparc/generic_leon3/Kconfig.generic_leon3 b/boards/sparc/generic_leon3/Kconfig.generic_leon3 new file mode 100644 index 0000000000000..f418a92207ee2 --- /dev/null +++ b/boards/sparc/generic_leon3/Kconfig.generic_leon3 @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GENERIC_LEON3 + bool + default y + select SOC_LEON3 diff --git a/boards/sparc/generic_leon3/generic_leon3_defconfig b/boards/sparc/generic_leon3/generic_leon3_defconfig index 8ec49d62baf05..d7eb0842fa7ec 100644 --- a/boards/sparc/generic_leon3/generic_leon3_defconfig +++ b/boards/sparc/generic_leon3/generic_leon3_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_LEON3=y -CONFIG_BOARD_GENERIC_LEON3=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y diff --git a/boards/sparc/gr716a_mini/Kconfig.board b/boards/sparc/gr716a_mini/Kconfig.board deleted file mode 100644 index e200d6160c0cc..0000000000000 --- a/boards/sparc/gr716a_mini/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2019-2020 Cobham Gaisler AB -# -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GR716A_MINI - bool "GR716-MINI Development Board" - depends on SOC_GR716A diff --git a/boards/sparc/gr716a_mini/Kconfig.defconfig b/boards/sparc/gr716a_mini/Kconfig.defconfig index 08132736348b4..9272bf169dca6 100644 --- a/boards/sparc/gr716a_mini/Kconfig.defconfig +++ b/boards/sparc/gr716a_mini/Kconfig.defconfig @@ -2,15 +2,8 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_GR716A_MINI - -config BOARD - default "gr716a_mini" - config SYS_CLOCK_HW_CYCLES_PER_SEC default 20000000 config UART_INTERRUPT_DRIVEN default y - -endif diff --git a/boards/sparc/gr716a_mini/Kconfig.gr716a_mini b/boards/sparc/gr716a_mini/Kconfig.gr716a_mini new file mode 100644 index 0000000000000..18a90829f8452 --- /dev/null +++ b/boards/sparc/gr716a_mini/Kconfig.gr716a_mini @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GR716A_MINI + bool + default y + select SOC_GR716A diff --git a/boards/sparc/gr716a_mini/gr716a_mini_defconfig b/boards/sparc/gr716a_mini/gr716a_mini_defconfig index 4f30129d3b28d..101f819969b27 100644 --- a/boards/sparc/gr716a_mini/gr716a_mini_defconfig +++ b/boards/sparc/gr716a_mini/gr716a_mini_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_GR716A=y -CONFIG_BOARD_GR716A_MINI=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y diff --git a/boards/sparc/qemu_leon3/Kconfig.board b/boards/sparc/qemu_leon3/Kconfig.board deleted file mode 100644 index 6ba0234a17a45..0000000000000 --- a/boards/sparc/qemu_leon3/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2019-2020 Cobham Gaisler AB -# -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_LEON3 - bool "QEMU LEON3 target" - depends on SOC_LEON3 - select QEMU_TARGET - select CPU_HAS_FPU diff --git a/boards/sparc/qemu_leon3/Kconfig.defconfig b/boards/sparc/qemu_leon3/Kconfig.defconfig index 0a48c2a4752f0..444320721d116 100644 --- a/boards/sparc/qemu_leon3/Kconfig.defconfig +++ b/boards/sparc/qemu_leon3/Kconfig.defconfig @@ -2,12 +2,5 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_QEMU_LEON3 - -config BOARD - default "qemu_leon3" - config UART_INTERRUPT_DRIVEN default y - -endif diff --git a/boards/sparc/qemu_leon3/Kconfig.qemu_leon3 b/boards/sparc/qemu_leon3/Kconfig.qemu_leon3 new file mode 100644 index 0000000000000..093e0d96665c2 --- /dev/null +++ b/boards/sparc/qemu_leon3/Kconfig.qemu_leon3 @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_LEON3 + bool + default y + select SOC_LEON3 + select QEMU_TARGET + select CPU_HAS_FPU diff --git a/boards/sparc/qemu_leon3/qemu_leon3_defconfig b/boards/sparc/qemu_leon3/qemu_leon3_defconfig index 7f57d930478e9..72f7285f6087d 100644 --- a/boards/sparc/qemu_leon3/qemu_leon3_defconfig +++ b/boards/sparc/qemu_leon3/qemu_leon3_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_LEON3=y -CONFIG_BOARD_QEMU_LEON3=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y diff --git a/boards/x86/acrn/Kconfig.acrn b/boards/x86/acrn/Kconfig.acrn new file mode 100644 index 0000000000000..c4bb9bb2778c7 --- /dev/null +++ b/boards/x86/acrn/Kconfig.acrn @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACRN_EHL_CRB + bool + default y + select SOC_IA32 + select CPU_HAS_FPU + select X86_64 diff --git a/boards/x86/acrn/Kconfig.acrn_ehl_crb b/boards/x86/acrn/Kconfig.acrn_ehl_crb new file mode 100644 index 0000000000000..c4bb9bb2778c7 --- /dev/null +++ b/boards/x86/acrn/Kconfig.acrn_ehl_crb @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACRN_EHL_CRB + bool + default y + select SOC_IA32 + select CPU_HAS_FPU + select X86_64 diff --git a/boards/x86/acrn/Kconfig.board b/boards/x86/acrn/Kconfig.board deleted file mode 100644 index e8fa3f429877a..0000000000000 --- a/boards/x86/acrn/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2019 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ACRN - bool "ACRN User OS" - depends on SOC_IA32 - select CPU_HAS_FPU - select X86_64 diff --git a/boards/x86/acrn/Kconfig.defconfig b/boards/x86/acrn/Kconfig.defconfig index f4cc6d20bcb96..5fa40b2bcb225 100644 --- a/boards/x86/acrn/Kconfig.defconfig +++ b/boards/x86/acrn/Kconfig.defconfig @@ -1,13 +1,5 @@ # Copyright (c) 2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -if BOARD_ACRN - -config BOARD - default "acrn" - depends on BOARD_ACRN - config MP_NUM_CPUS default 2 - -endif diff --git a/boards/x86/acrn/acrn_defconfig b/boards/x86/acrn/acrn_defconfig index 2f72c30dce8e5..486a57e3b58a5 100644 --- a/boards/x86/acrn/acrn_defconfig +++ b/boards/x86/acrn/acrn_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_ACRN=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_APIC_TSC_DEADLINE_TIMER=y diff --git a/boards/x86/acrn/acrn_ehl_crb_defconfig b/boards/x86/acrn/acrn_ehl_crb_defconfig index 5e3af1f8be36f..93270fddb4eea 100644 --- a/boards/x86/acrn/acrn_ehl_crb_defconfig +++ b/boards/x86/acrn/acrn_ehl_crb_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_ACRN=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_X2APIC=y diff --git a/boards/x86/ehl_crb/Kconfig.board b/boards/x86/ehl_crb/Kconfig.board deleted file mode 100644 index e90d582a08534..0000000000000 --- a/boards/x86/ehl_crb/Kconfig.board +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2020 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_EHL_CRB - bool "Elkhart Lake CRB" - depends on SOC_ELKHART_LAKE - select X86_64 - select HAS_COVERAGE_SUPPORT - -config BOARD_EHL_CRB_SBL - bool "Elkhart Lake CRB (with Slim Bootloader)" - depends on SOC_ELKHART_LAKE - select X86_64 diff --git a/boards/x86/ehl_crb/Kconfig.defconfig b/boards/x86/ehl_crb/Kconfig.defconfig index ea9d49be8ac07..f9188c9a3a190 100644 --- a/boards/x86/ehl_crb/Kconfig.defconfig +++ b/boards/x86/ehl_crb/Kconfig.defconfig @@ -1,12 +1,6 @@ # Copyright (c) 2020 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -if BOARD_EHL_CRB || BOARD_EHL_CRB_SBL - -config BOARD - default "ehl_crb_sbl" if BOARD_EHL_CRB_SBL - default "ehl_crb" - config BUILD_OUTPUT_STRIPPED default y @@ -33,5 +27,3 @@ config APIC_TIMER_TSC_M config APIC_TIMER_TSC_N default 249 endif - -endif # BOARD_EHL_CRB || BOARD_EHL_CRB_SBL diff --git a/boards/x86/ehl_crb/Kconfig.ehl_crb b/boards/x86/ehl_crb/Kconfig.ehl_crb new file mode 100644 index 0000000000000..1569ec1a14a52 --- /dev/null +++ b/boards/x86/ehl_crb/Kconfig.ehl_crb @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EHL_CRB + bool + default y + select SOC_ELKHART_LAKE + select X86_64 + select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/ehl_crb/Kconfig.ehl_crb_sbl b/boards/x86/ehl_crb/Kconfig.ehl_crb_sbl new file mode 100644 index 0000000000000..988fcf8511892 --- /dev/null +++ b/boards/x86/ehl_crb/Kconfig.ehl_crb_sbl @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_EHL_CRB_SBL + bool + default y + select SOC_ELKHART_LAKE + select X86_64 diff --git a/boards/x86/ehl_crb/ehl_crb_defconfig b/boards/x86/ehl_crb/ehl_crb_defconfig index 6f2e949ed01eb..e384b1a5813ba 100644 --- a/boards/x86/ehl_crb/ehl_crb_defconfig +++ b/boards/x86/ehl_crb/ehl_crb_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ELKHART_LAKE=y -CONFIG_BOARD_EHL_CRB=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/ehl_crb/ehl_crb_sbl_defconfig b/boards/x86/ehl_crb/ehl_crb_sbl_defconfig index 00d7ba100f7fd..8f9ea331c35da 100644 --- a/boards/x86/ehl_crb/ehl_crb_sbl_defconfig +++ b/boards/x86/ehl_crb/ehl_crb_sbl_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ELKHART_LAKE=y -CONFIG_BOARD_EHL_CRB_SBL=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/qemu_x86/Kconfig.board b/boards/x86/qemu_x86/Kconfig.board deleted file mode 100644 index 275d1c69757e8..0000000000000 --- a/boards/x86/qemu_x86/Kconfig.board +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_X86 - bool "QEMU x86" - depends on SOC_IA32 - select QEMU_TARGET - select CPU_HAS_FPU - select HAS_COVERAGE_SUPPORT - -config BOARD_QEMU_X86_64 - bool "QEMU x86_64" - depends on SOC_IA32 - select QEMU_TARGET - select X86_64 - select HAS_COVERAGE_SUPPORT - -config BOARD_QEMU_X86_LAKEMONT - bool "QEMU x86 (Lakemont)" - depends on SOC_LAKEMONT - select QEMU_TARGET - select CPU_HAS_FPU - select HAS_COVERAGE_SUPPORT - -config BOARD_QEMU_X86_TINY - bool "QEMU x86 (tiny memory)" - depends on SOC_IA32 - select QEMU_TARGET - select CPU_HAS_FPU - select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/qemu_x86/Kconfig.defconfig b/boards/x86/qemu_x86/Kconfig.defconfig index 78b665c834069..ecbeea3b29322 100644 --- a/boards/x86/qemu_x86/Kconfig.defconfig +++ b/boards/x86/qemu_x86/Kconfig.defconfig @@ -1,13 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_QEMU_X86 +if BOARD_QEMU_X86 || BOARD_QEMU_X86_XIP || BOARD_QEMU_X86_VIRT || BOARD_QEMU_X86_NOPAE || BOARD_QEMU_X86_NOMMU || BOARD_QEMU_X86_NOKPTI config BUILD_OUTPUT_BIN default n -config BOARD - default "qemu_x86" - config FLASH_SIMULATOR default y depends on FLASH @@ -30,26 +27,20 @@ config QEMU_ICOUNT config QEMU_ICOUNT_SHIFT default 5 -endif # BOARD_QEMU_X86 - -if BOARD_QEMU_X86_64 +endif # BOARD_QEMU_X86 || BOARD_QEMU_X86_XIP || BOARD_QEMU_X86_VIRT || BOARD_QEMU_X86_NOPAE || BOARD_QEMU_X86_NOMMU || BOARD_QEMU_X86_NOKPTI -config BOARD - default "qemu_x86_64" +if BOARD_QEMU_X86_64 || BOARD_QEMU_X86_64_NOKPTI config KERNEL_VM_SIZE default 0x10000000 if ACPI -endif # BOARD_QEMU_X86_64 +endif # BOARD_QEMU_X86_64 || BOARD_QEMU_X86_64_NOKPTI if BOARD_QEMU_X86_LAKEMONT config BUILD_OUTPUT_BIN default n -config BOARD - default "qemu_x86_lakemont" - config KERNEL_VM_SIZE default 0x400000 @@ -77,9 +68,6 @@ if BOARD_QEMU_X86_TINY config BUILD_OUTPUT_BIN default n -config BOARD - default "qemu_x86_tiny" - config KERNEL_VM_SIZE default 0x400000 diff --git a/boards/x86/qemu_x86/Kconfig.qemu_x86 b/boards/x86/qemu_x86/Kconfig.qemu_x86 new file mode 100644 index 0000000000000..ca947154a4bae --- /dev/null +++ b/boards/x86/qemu_x86/Kconfig.qemu_x86 @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_X86 + bool + default y + select SOC_IA32 + select QEMU_TARGET + select CPU_HAS_FPU + select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/qemu_x86/Kconfig.qemu_x86_64 b/boards/x86/qemu_x86/Kconfig.qemu_x86_64 new file mode 100644 index 0000000000000..5b2ccd2e616a0 --- /dev/null +++ b/boards/x86/qemu_x86/Kconfig.qemu_x86_64 @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_X86_64 + bool + default y + select SOC_IA32 + select QEMU_TARGET + select X86_64 + select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/qemu_x86/Kconfig.qemu_x86_64_nokpti b/boards/x86/qemu_x86/Kconfig.qemu_x86_64_nokpti new file mode 100644 index 0000000000000..6b039316c9e9e --- /dev/null +++ b/boards/x86/qemu_x86/Kconfig.qemu_x86_64_nokpti @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_X86_64_NOKPTI + bool + default y + select SOC_IA32 + select QEMU_TARGET + select X86_64 + select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/qemu_x86/Kconfig.qemu_x86_lakemont b/boards/x86/qemu_x86/Kconfig.qemu_x86_lakemont new file mode 100644 index 0000000000000..6aa7a7f36b6f6 --- /dev/null +++ b/boards/x86/qemu_x86/Kconfig.qemu_x86_lakemont @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_X86_LAKEMONT + bool + default y + select SOC_LAKEMONT + select QEMU_TARGET + select CPU_HAS_FPU + select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/qemu_x86/Kconfig.qemu_x86_nokpti b/boards/x86/qemu_x86/Kconfig.qemu_x86_nokpti new file mode 100644 index 0000000000000..21a9cc268ad1c --- /dev/null +++ b/boards/x86/qemu_x86/Kconfig.qemu_x86_nokpti @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_X86_NOKPTI + bool + default y + select SOC_IA32 + select QEMU_TARGET + select CPU_HAS_FPU + select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/qemu_x86/Kconfig.qemu_x86_nommu b/boards/x86/qemu_x86/Kconfig.qemu_x86_nommu new file mode 100644 index 0000000000000..21b6e642e194f --- /dev/null +++ b/boards/x86/qemu_x86/Kconfig.qemu_x86_nommu @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_X86_NOMMU + bool + default y + select SOC_IA32 + select QEMU_TARGET + select CPU_HAS_FPU + select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/qemu_x86/Kconfig.qemu_x86_nopae b/boards/x86/qemu_x86/Kconfig.qemu_x86_nopae new file mode 100644 index 0000000000000..2ffb488ad56ff --- /dev/null +++ b/boards/x86/qemu_x86/Kconfig.qemu_x86_nopae @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_X86_NOPAE + bool + default y + select SOC_IA32 + select QEMU_TARGET + select CPU_HAS_FPU + select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/qemu_x86/Kconfig.qemu_x86_tiny b/boards/x86/qemu_x86/Kconfig.qemu_x86_tiny new file mode 100644 index 0000000000000..168ef46afb9ac --- /dev/null +++ b/boards/x86/qemu_x86/Kconfig.qemu_x86_tiny @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_X86_TINY + bool + default y + select SOC_IA32 + select QEMU_TARGET + select CPU_HAS_FPU + select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/qemu_x86/Kconfig.qemu_x86_virt b/boards/x86/qemu_x86/Kconfig.qemu_x86_virt new file mode 100644 index 0000000000000..dfb04af1df96e --- /dev/null +++ b/boards/x86/qemu_x86/Kconfig.qemu_x86_virt @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_X86_VIRT + bool + default y + select SOC_IA32 + select QEMU_TARGET + select CPU_HAS_FPU + select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/qemu_x86/Kconfig.qemu_x86_xip b/boards/x86/qemu_x86/Kconfig.qemu_x86_xip new file mode 100644 index 0000000000000..0914f4b7b12db --- /dev/null +++ b/boards/x86/qemu_x86/Kconfig.qemu_x86_xip @@ -0,0 +1,10 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_X86_XIP + bool + default y + select SOC_IA32 + select QEMU_TARGET + select CPU_HAS_FPU + select HAS_COVERAGE_SUPPORT diff --git a/boards/x86/qemu_x86/qemu_x86_64_defconfig b/boards/x86/qemu_x86/qemu_x86_64_defconfig index 3426b44862d11..20c2c156fefd1 100644 --- a/boards/x86/qemu_x86/qemu_x86_64_defconfig +++ b/boards/x86/qemu_x86/qemu_x86_64_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_QEMU_X86_64=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/qemu_x86/qemu_x86_64_nokpti_defconfig b/boards/x86/qemu_x86/qemu_x86_64_nokpti_defconfig index 055a3699c9b51..7362d8c3109d2 100644 --- a/boards/x86/qemu_x86/qemu_x86_64_nokpti_defconfig +++ b/boards/x86/qemu_x86/qemu_x86_64_nokpti_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_QEMU_X86_64=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/qemu_x86/qemu_x86_defconfig b/boards/x86/qemu_x86/qemu_x86_defconfig index 75320082a68f3..84a5f04dc3ff1 100644 --- a/boards/x86/qemu_x86/qemu_x86_defconfig +++ b/boards/x86/qemu_x86/qemu_x86_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_QEMU_X86=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/qemu_x86/qemu_x86_lakemont_defconfig b/boards/x86/qemu_x86/qemu_x86_lakemont_defconfig index c4902a34a6c50..84a5f04dc3ff1 100644 --- a/boards/x86/qemu_x86/qemu_x86_lakemont_defconfig +++ b/boards/x86/qemu_x86/qemu_x86_lakemont_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_LAKEMONT=y -CONFIG_BOARD_QEMU_X86_LAKEMONT=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/qemu_x86/qemu_x86_nokpti_defconfig b/boards/x86/qemu_x86/qemu_x86_nokpti_defconfig index 5423b62b67927..c358872a2282e 100644 --- a/boards/x86/qemu_x86/qemu_x86_nokpti_defconfig +++ b/boards/x86/qemu_x86/qemu_x86_nokpti_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_QEMU_X86=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/qemu_x86/qemu_x86_nommu_defconfig b/boards/x86/qemu_x86/qemu_x86_nommu_defconfig index d485369c6cb1b..049f30ace6425 100644 --- a/boards/x86/qemu_x86/qemu_x86_nommu_defconfig +++ b/boards/x86/qemu_x86/qemu_x86_nommu_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_QEMU_X86=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/qemu_x86/qemu_x86_nopae_defconfig b/boards/x86/qemu_x86/qemu_x86_nopae_defconfig index 15a109c056f31..a6a6b7b21beae 100644 --- a/boards/x86/qemu_x86/qemu_x86_nopae_defconfig +++ b/boards/x86/qemu_x86/qemu_x86_nopae_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_QEMU_X86=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/qemu_x86/qemu_x86_tiny_defconfig b/boards/x86/qemu_x86/qemu_x86_tiny_defconfig index 8b8111746f600..442e6880c6c35 100644 --- a/boards/x86/qemu_x86/qemu_x86_tiny_defconfig +++ b/boards/x86/qemu_x86/qemu_x86_tiny_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_QEMU_X86_TINY=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/qemu_x86/qemu_x86_virt_defconfig b/boards/x86/qemu_x86/qemu_x86_virt_defconfig index eabfab7a591ca..34aa8765385c8 100644 --- a/boards/x86/qemu_x86/qemu_x86_virt_defconfig +++ b/boards/x86/qemu_x86/qemu_x86_virt_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_QEMU_X86=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/qemu_x86/qemu_x86_xip_defconfig b/boards/x86/qemu_x86/qemu_x86_xip_defconfig index 42fd2677785f3..9ccb326513f22 100644 --- a/boards/x86/qemu_x86/qemu_x86_xip_defconfig +++ b/boards/x86/qemu_x86/qemu_x86_xip_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_QEMU_X86=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/up_squared/Kconfig.board b/boards/x86/up_squared/Kconfig.board deleted file mode 100644 index c25c3e2857d46..0000000000000 --- a/boards/x86/up_squared/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2018 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UP_SQUARED - bool "UP Squared (x86_64)" - depends on SOC_APOLLO_LAKE - select X86_64 diff --git a/boards/x86/up_squared/Kconfig.defconfig b/boards/x86/up_squared/Kconfig.defconfig index 19d78aa32de8d..f9fd43b03f704 100644 --- a/boards/x86/up_squared/Kconfig.defconfig +++ b/boards/x86/up_squared/Kconfig.defconfig @@ -1,10 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_UP_SQUARED - -config BOARD - default "up_squared" - config MP_NUM_CPUS default 2 if BOARD_UP_SQUARED @@ -28,5 +23,3 @@ config APIC_TIMER_TSC_M config APIC_TIMER_TSC_N default 249 endif - -endif # BOARD_UP_SQUARED diff --git a/boards/x86/up_squared/Kconfig.up_squared b/boards/x86/up_squared/Kconfig.up_squared new file mode 100644 index 0000000000000..5301b44516697 --- /dev/null +++ b/boards/x86/up_squared/Kconfig.up_squared @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UP_SQUARED + bool + default y + select SOC_APOLLO_LAKE + select X86_64 diff --git a/boards/x86/up_squared/up_squared_defconfig b/boards/x86/up_squared/up_squared_defconfig index dfc5db7d395bb..360d0cc1b0b9c 100644 --- a/boards/x86/up_squared/up_squared_defconfig +++ b/boards/x86/up_squared/up_squared_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_APOLLO_LAKE=y -CONFIG_BOARD_UP_SQUARED=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/xtensa/esp32/Kconfig.board b/boards/xtensa/esp32/Kconfig.board deleted file mode 100644 index c6b85318c7c24..0000000000000 --- a/boards/xtensa/esp32/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# ESP32 board configuration - -# Copyright (c) 2017 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ESP32 - bool "ESP32 Development Board" - depends on SOC_ESP32 diff --git a/boards/xtensa/esp32/Kconfig.defconfig b/boards/xtensa/esp32/Kconfig.defconfig index bfa5de5fad2a3..04ec6752d2110 100644 --- a/boards/xtensa/esp32/Kconfig.defconfig +++ b/boards/xtensa/esp32/Kconfig.defconfig @@ -3,10 +3,6 @@ # Copyright (c) 2017 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "esp32" - depends on BOARD_ESP32 - if BT config HEAP_MEM_POOL_SIZE diff --git a/boards/xtensa/esp32/Kconfig.esp32 b/boards/xtensa/esp32/Kconfig.esp32 new file mode 100644 index 0000000000000..12bfbc62b6fcc --- /dev/null +++ b/boards/xtensa/esp32/Kconfig.esp32 @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ESP32 + bool + default y + select SOC_ESP32 diff --git a/boards/xtensa/esp32/esp32_defconfig b/boards/xtensa/esp32/esp32_defconfig index 924b7f84dc1a0..7fd4cddd0bd74 100644 --- a/boards/xtensa/esp32/esp32_defconfig +++ b/boards/xtensa/esp32/esp32_defconfig @@ -2,8 +2,6 @@ CONFIG_XTENSA_RESET_VECTOR=n -CONFIG_BOARD_ESP32=y -CONFIG_SOC_ESP32=y CONFIG_MAIN_STACK_SIZE=2048 diff --git a/boards/xtensa/esp32_net/Kconfig.board b/boards/xtensa/esp32_net/Kconfig.board deleted file mode 100644 index e7405295d4093..0000000000000 --- a/boards/xtensa/esp32_net/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# ESP32 board configuration - -# Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ESP32_NET - bool "ESP32 Board configuration for APP_CPU" - depends on SOC_ESP32_NET diff --git a/boards/xtensa/esp32_net/Kconfig.defconfig b/boards/xtensa/esp32_net/Kconfig.defconfig index 26430ae475823..463d68ea21b5f 100644 --- a/boards/xtensa/esp32_net/Kconfig.defconfig +++ b/boards/xtensa/esp32_net/Kconfig.defconfig @@ -3,10 +3,6 @@ # Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "esp32_net" - depends on BOARD_ESP32_NET - config ENTROPY_ESP32_RNG default y if ENTROPY_GENERATOR diff --git a/boards/xtensa/esp32_net/Kconfig.esp32_net b/boards/xtensa/esp32_net/Kconfig.esp32_net new file mode 100644 index 0000000000000..e6974450aea15 --- /dev/null +++ b/boards/xtensa/esp32_net/Kconfig.esp32_net @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ESP32_NET + bool + default y + select SOC_ESP32_NET diff --git a/boards/xtensa/esp32_net/esp32_net_defconfig b/boards/xtensa/esp32_net/esp32_net_defconfig index 2df29a04d31f1..52c58a2a95efc 100644 --- a/boards/xtensa/esp32_net/esp32_net_defconfig +++ b/boards/xtensa/esp32_net/esp32_net_defconfig @@ -2,8 +2,6 @@ CONFIG_XTENSA_RESET_VECTOR=n -CONFIG_BOARD_ESP32_NET=y -CONFIG_SOC_ESP32_NET=y CONFIG_MAIN_STACK_SIZE=2048 diff --git a/boards/xtensa/esp32s2_saola/Kconfig.board b/boards/xtensa/esp32s2_saola/Kconfig.board deleted file mode 100644 index 5accd94308af7..0000000000000 --- a/boards/xtensa/esp32s2_saola/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# ESP32S2 saola board configuration - -# Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ESP32S2_SAOLA - bool "ESP32S2 Saola Board" - depends on SOC_ESP32S2 diff --git a/boards/xtensa/esp32s2_saola/Kconfig.defconfig b/boards/xtensa/esp32s2_saola/Kconfig.defconfig index 3f0a949df2466..ffa2b0d832cc4 100644 --- a/boards/xtensa/esp32s2_saola/Kconfig.defconfig +++ b/boards/xtensa/esp32s2_saola/Kconfig.defconfig @@ -3,9 +3,5 @@ # Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd. # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "esp32s2_saola" - depends on BOARD_ESP32S2_SAOLA - config ENTROPY_GENERATOR default y diff --git a/boards/xtensa/esp32s2_saola/Kconfig.esp32s2_saola b/boards/xtensa/esp32s2_saola/Kconfig.esp32s2_saola new file mode 100644 index 0000000000000..7bc1f9e3fb299 --- /dev/null +++ b/boards/xtensa/esp32s2_saola/Kconfig.esp32s2_saola @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ESP32S2_SAOLA + bool + default y + select SOC_ESP32S2 diff --git a/boards/xtensa/esp32s2_saola/esp32s2_saola_defconfig b/boards/xtensa/esp32s2_saola/esp32s2_saola_defconfig index 9e2fd5bb49f7e..9009cb1d8f1fe 100644 --- a/boards/xtensa/esp32s2_saola/esp32s2_saola_defconfig +++ b/boards/xtensa/esp32s2_saola/esp32s2_saola_defconfig @@ -2,8 +2,6 @@ CONFIG_XTENSA_RESET_VECTOR=n -CONFIG_BOARD_ESP32S2_SAOLA=y -CONFIG_SOC_ESP32S2=y CONFIG_MAIN_STACK_SIZE=2048 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=240000000 diff --git a/boards/xtensa/esp_wrover_kit/Kconfig.board b/boards/xtensa/esp_wrover_kit/Kconfig.board deleted file mode 100644 index 7067d53cd5cd7..0000000000000 --- a/boards/xtensa/esp_wrover_kit/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# ESP-WROVER-KIT board configuration - -# Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ESP_WROVER_KIT - bool "ESP-WROVER-KIT Development Board" - depends on SOC_ESP32 diff --git a/boards/xtensa/esp_wrover_kit/Kconfig.defconfig b/boards/xtensa/esp_wrover_kit/Kconfig.defconfig index eb544fe328fb2..29644f67b163c 100644 --- a/boards/xtensa/esp_wrover_kit/Kconfig.defconfig +++ b/boards/xtensa/esp_wrover_kit/Kconfig.defconfig @@ -3,10 +3,6 @@ # Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd. # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "esp_wrover_kit" - depends on BOARD_ESP_WROVER_KIT - if BT config HEAP_MEM_POOL_SIZE diff --git a/boards/xtensa/esp_wrover_kit/Kconfig.esp_wrover_kit b/boards/xtensa/esp_wrover_kit/Kconfig.esp_wrover_kit new file mode 100644 index 0000000000000..f62a210988b38 --- /dev/null +++ b/boards/xtensa/esp_wrover_kit/Kconfig.esp_wrover_kit @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ESP_WROVER_KIT + bool + default y + select SOC_ESP32 diff --git a/boards/xtensa/esp_wrover_kit/esp_wrover_kit_defconfig b/boards/xtensa/esp_wrover_kit/esp_wrover_kit_defconfig index 20bd5f0ba94f2..7fd4cddd0bd74 100644 --- a/boards/xtensa/esp_wrover_kit/esp_wrover_kit_defconfig +++ b/boards/xtensa/esp_wrover_kit/esp_wrover_kit_defconfig @@ -2,8 +2,6 @@ CONFIG_XTENSA_RESET_VECTOR=n -CONFIG_BOARD_ESP_WROVER_KIT=y -CONFIG_SOC_ESP32=y CONFIG_MAIN_STACK_SIZE=2048 diff --git a/boards/xtensa/heltec_wifi_lora32_v2/Kconfig.board b/boards/xtensa/heltec_wifi_lora32_v2/Kconfig.board deleted file mode 100644 index bd176b9508928..0000000000000 --- a/boards/xtensa/heltec_wifi_lora32_v2/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# HELTEC ESP32 board configuration - -# Copyright (c) 2021 Instituto de Pesquisas Eldorado (eldorado.org.br) -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_HELTEC_WIFI_LORA32 - bool "HELTEC WiFi LoRa 32 (V2) Board" - depends on SOC_ESP32 diff --git a/boards/xtensa/heltec_wifi_lora32_v2/Kconfig.defconfig b/boards/xtensa/heltec_wifi_lora32_v2/Kconfig.defconfig deleted file mode 100644 index fa3a25aac0ec5..0000000000000 --- a/boards/xtensa/heltec_wifi_lora32_v2/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# HELTEC board configuration - -# Copyright (c) 2021 Instituto de Pesquisas Eldorado (eldorado.org.br) -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "heltec_wifi_lora32" - depends on BOARD_HELTEC_WIFI_LORA32 diff --git a/boards/xtensa/heltec_wifi_lora32_v2/Kconfig.heltec_wifi_lora32_v2 b/boards/xtensa/heltec_wifi_lora32_v2/Kconfig.heltec_wifi_lora32_v2 new file mode 100644 index 0000000000000..9d4b476713d2a --- /dev/null +++ b/boards/xtensa/heltec_wifi_lora32_v2/Kconfig.heltec_wifi_lora32_v2 @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HELTEC_WIFI_LORA32_V2 + bool + default y + select SOC_ESP32 diff --git a/boards/xtensa/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_defconfig b/boards/xtensa/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_defconfig index fe987cb7d98c2..7fd4cddd0bd74 100644 --- a/boards/xtensa/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_defconfig +++ b/boards/xtensa/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_defconfig @@ -2,8 +2,6 @@ CONFIG_XTENSA_RESET_VECTOR=n -CONFIG_BOARD_HELTEC_WIFI_LORA32=y -CONFIG_SOC_ESP32=y CONFIG_MAIN_STACK_SIZE=2048 diff --git a/boards/xtensa/intel_adsp_ace15_mtpm/Kconfig.board b/boards/xtensa/intel_adsp_ace15_mtpm/Kconfig.board deleted file mode 100644 index d51735c9caa0b..0000000000000 --- a/boards/xtensa/intel_adsp_ace15_mtpm/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_ACE15_MTPM - bool "Intel ADSP ACE 1.5 Meteor PCH M" - depends on SOC_SERIES_INTEL_ACE diff --git a/boards/xtensa/intel_adsp_ace15_mtpm/Kconfig.defconfig b/boards/xtensa/intel_adsp_ace15_mtpm/Kconfig.defconfig index ca7aa07cd95e2..1c4242a7869d3 100644 --- a/boards/xtensa/intel_adsp_ace15_mtpm/Kconfig.defconfig +++ b/boards/xtensa/intel_adsp_ace15_mtpm/Kconfig.defconfig @@ -2,16 +2,9 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_INTEL_ADSP_ACE15_MTPM - -config BOARD - default "intel_adsp_ace15_mtpm" - if DAI_INTEL_SSP config DAI_SSP_HAS_POWER_CONTROL def_bool y endif - -endif # BOARD_INTEL_ADSP_ACE15_MTPM diff --git a/boards/xtensa/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm b/boards/xtensa/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm new file mode 100644 index 0000000000000..c51e71ca72ad9 --- /dev/null +++ b/boards/xtensa/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_ACE15_MTPM + bool + default y + select SOC_SERIES_INTEL_ACE + select SOC_INTEL_ACE15_MTPM diff --git a/boards/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig b/boards/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig index 0f01d20faeda7..3e827c4b82970 100644 --- a/boards/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig +++ b/boards/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig @@ -2,10 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_SERIES_INTEL_ACE=y -CONFIG_SOC_INTEL_ACE15_MTPM=y -CONFIG_BOARD_INTEL_ADSP_ACE15_MTPM=y - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/xtensa/intel_adsp_cavs15/Kconfig.board b/boards/xtensa/intel_adsp_cavs15/Kconfig.board deleted file mode 100644 index 01888a693b86e..0000000000000 --- a/boards/xtensa/intel_adsp_cavs15/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2019 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_CAVS15 - bool "Intel ADSP CAVS 1.5" - depends on SOC_SERIES_INTEL_ADSP_CAVS diff --git a/boards/xtensa/intel_adsp_cavs15/Kconfig.defconfig b/boards/xtensa/intel_adsp_cavs15/Kconfig.defconfig index 69a86b1674bfc..043000528a0f8 100644 --- a/boards/xtensa/intel_adsp_cavs15/Kconfig.defconfig +++ b/boards/xtensa/intel_adsp_cavs15/Kconfig.defconfig @@ -2,11 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_INTEL_ADSP_CAVS15 - -config BOARD - default "intel_adsp_cavs15" - config CAVS_ICTL_0_OFFSET default 6 config CAVS_ICTL_1_OFFSET @@ -34,5 +29,3 @@ config 2ND_LVL_ISR_TBL_OFFSET config CAVS_ISR_TBL_OFFSET default 2ND_LVL_ISR_TBL_OFFSET - -endif # BOARD_INTEL_ADSP_CAVS15 diff --git a/boards/xtensa/intel_adsp_cavs15/Kconfig.intel_adsp_cavs15 b/boards/xtensa/intel_adsp_cavs15/Kconfig.intel_adsp_cavs15 new file mode 100644 index 0000000000000..b6dff92e47603 --- /dev/null +++ b/boards/xtensa/intel_adsp_cavs15/Kconfig.intel_adsp_cavs15 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_CAVS15 + bool + default y + select SOC_INTEL_CAVS_V15 + select SOC_SERIES_INTEL_ADSP_CAVS diff --git a/boards/xtensa/intel_adsp_cavs15/intel_adsp_cavs15_defconfig b/boards/xtensa/intel_adsp_cavs15/intel_adsp_cavs15_defconfig index f297c280a9a64..c86ba93a2110d 100644 --- a/boards/xtensa/intel_adsp_cavs15/intel_adsp_cavs15_defconfig +++ b/boards/xtensa/intel_adsp_cavs15/intel_adsp_cavs15_defconfig @@ -2,9 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_INTEL_CAVS_V15=y -CONFIG_SOC_SERIES_INTEL_ADSP_CAVS=y -CONFIG_BOARD_INTEL_ADSP_CAVS15=y CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/xtensa/intel_adsp_cavs18/Kconfig.board b/boards/xtensa/intel_adsp_cavs18/Kconfig.board deleted file mode 100644 index 07b6bdcea7fad..0000000000000 --- a/boards/xtensa/intel_adsp_cavs18/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2020 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_CAVS18 - bool "Intel ADSP CAVS 1.8" - depends on SOC_SERIES_INTEL_ADSP_CAVS diff --git a/boards/xtensa/intel_adsp_cavs18/Kconfig.defconfig b/boards/xtensa/intel_adsp_cavs18/Kconfig.defconfig index 07790005c8790..42a50a2e5f6d7 100644 --- a/boards/xtensa/intel_adsp_cavs18/Kconfig.defconfig +++ b/boards/xtensa/intel_adsp_cavs18/Kconfig.defconfig @@ -2,11 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_INTEL_ADSP_CAVS18 - -config BOARD - default "intel_adsp_cavs18" - config CAVS_ICTL_0_OFFSET default 6 config CAVS_ICTL_1_OFFSET @@ -34,5 +29,3 @@ config 2ND_LVL_ISR_TBL_OFFSET config CAVS_ISR_TBL_OFFSET default 2ND_LVL_ISR_TBL_OFFSET - -endif # BOARD_INTEL_ADSP_CAVS18 diff --git a/boards/xtensa/intel_adsp_cavs18/Kconfig.intel_adsp_cavs18 b/boards/xtensa/intel_adsp_cavs18/Kconfig.intel_adsp_cavs18 new file mode 100644 index 0000000000000..1e8787b6b4cfa --- /dev/null +++ b/boards/xtensa/intel_adsp_cavs18/Kconfig.intel_adsp_cavs18 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_CAVS18 + bool + default y + select SOC_INTEL_CAVS_V18 + select SOC_SERIES_INTEL_ADSP_CAVS diff --git a/boards/xtensa/intel_adsp_cavs18/intel_adsp_cavs18_defconfig b/boards/xtensa/intel_adsp_cavs18/intel_adsp_cavs18_defconfig index 4162fc810b866..c86ba93a2110d 100644 --- a/boards/xtensa/intel_adsp_cavs18/intel_adsp_cavs18_defconfig +++ b/boards/xtensa/intel_adsp_cavs18/intel_adsp_cavs18_defconfig @@ -2,9 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_INTEL_CAVS_V18=y -CONFIG_BOARD_INTEL_ADSP_CAVS18=y -CONFIG_SOC_SERIES_INTEL_ADSP_CAVS=y CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/xtensa/intel_adsp_cavs20/Kconfig.board b/boards/xtensa/intel_adsp_cavs20/Kconfig.board deleted file mode 100644 index db1cf9e7648fd..0000000000000 --- a/boards/xtensa/intel_adsp_cavs20/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2020,2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_CAVS20 - bool "Intel ADSP CAVS 2.0 for Ice Lake" - depends on SOC_SERIES_INTEL_ADSP_CAVS - -config BOARD_INTEL_ADSP_CAVS20_JSL - bool "Intel ADSP CAVS 2.0 for Jasper Lake" - depends on SOC_SERIES_INTEL_ADSP_CAVS diff --git a/boards/xtensa/intel_adsp_cavs20/Kconfig.defconfig b/boards/xtensa/intel_adsp_cavs20/Kconfig.defconfig index 6333bee5f3538..944dd7ac41ace 100644 --- a/boards/xtensa/intel_adsp_cavs20/Kconfig.defconfig +++ b/boards/xtensa/intel_adsp_cavs20/Kconfig.defconfig @@ -2,12 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_INTEL_ADSP_CAVS20 || BOARD_INTEL_ADSP_CAVS20_JSL - -config BOARD - default "intel_adsp_cavs20" if BOARD_INTEL_ADSP_CAVS20 - default "intel_adsp_cavs20_jsl" if BOARD_INTEL_ADSP_CAVS20_JSL - config CAVS_ICTL_0_OFFSET default 6 config CAVS_ICTL_1_OFFSET @@ -35,5 +29,3 @@ config 2ND_LVL_ISR_TBL_OFFSET config CAVS_ISR_TBL_OFFSET default 2ND_LVL_ISR_TBL_OFFSET - -endif # BOARD_INTEL_ADSP_CAVS20 || BOARD_INTEL_ADSP_CAVS20_JSL diff --git a/boards/xtensa/intel_adsp_cavs20/Kconfig.intel_adsp_cavs20 b/boards/xtensa/intel_adsp_cavs20/Kconfig.intel_adsp_cavs20 new file mode 100644 index 0000000000000..262fd7e5af860 --- /dev/null +++ b/boards/xtensa/intel_adsp_cavs20/Kconfig.intel_adsp_cavs20 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_CAVS20 + bool + default y + select SOC_INTEL_CAVS_V20 + select SOC_SERIES_INTEL_ADSP_CAVS diff --git a/boards/xtensa/intel_adsp_cavs20/Kconfig.intel_adsp_cavs20_jsl b/boards/xtensa/intel_adsp_cavs20/Kconfig.intel_adsp_cavs20_jsl new file mode 100644 index 0000000000000..01adc2a753f9c --- /dev/null +++ b/boards/xtensa/intel_adsp_cavs20/Kconfig.intel_adsp_cavs20_jsl @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_CAVS20_JSL + bool + default y + select SOC_INTEL_CAVS_V20 + select SOC_SERIES_INTEL_ADSP_CAVS diff --git a/boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20_defconfig b/boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20_defconfig index c7b81a44ce2a7..c86ba93a2110d 100644 --- a/boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20_defconfig +++ b/boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20_defconfig @@ -2,9 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_INTEL_CAVS_V20=y -CONFIG_BOARD_INTEL_ADSP_CAVS20=y -CONFIG_SOC_SERIES_INTEL_ADSP_CAVS=y CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20_jsl_defconfig b/boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20_jsl_defconfig index fc1aba94ded0f..c5a7f5d92519b 100644 --- a/boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20_jsl_defconfig +++ b/boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20_jsl_defconfig @@ -2,9 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_INTEL_CAVS_V20=y -CONFIG_BOARD_INTEL_ADSP_CAVS20_JSL=y -CONFIG_SOC_SERIES_INTEL_ADSP_CAVS=y CONFIG_GEN_ISR_TABLES=y diff --git a/boards/xtensa/intel_adsp_cavs25/Kconfig.board b/boards/xtensa/intel_adsp_cavs25/Kconfig.board deleted file mode 100644 index 275d43b3c778a..0000000000000 --- a/boards/xtensa/intel_adsp_cavs25/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2020 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_CAVS25 - bool "Intel ADSP CAVS 2.5" - depends on SOC_SERIES_INTEL_ADSP_CAVS - -config BOARD_INTEL_ADSP_CAVS25_TGPH - bool "Intel ADSP CAVS 2.5 for Tiger Lake H PCH" - depends on SOC_SERIES_INTEL_ADSP_CAVS diff --git a/boards/xtensa/intel_adsp_cavs25/Kconfig.defconfig b/boards/xtensa/intel_adsp_cavs25/Kconfig.defconfig index 03d5c7a1ad359..b0e7e8e9ca41f 100644 --- a/boards/xtensa/intel_adsp_cavs25/Kconfig.defconfig +++ b/boards/xtensa/intel_adsp_cavs25/Kconfig.defconfig @@ -2,19 +2,9 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_INTEL_ADSP_CAVS25 || BOARD_INTEL_ADSP_CAVS25_TGPH - -config BOARD - default "intel_adsp_cavs25" if BOARD_INTEL_ADSP_CAVS25 - default "intel_adsp_cavs25_tgph" if BOARD_INTEL_ADSP_CAVS25_TGPH - - - if DAI_INTEL_SSP config DAI_SSP_HAS_POWER_CONTROL def_bool y endif - -endif # BOARD_INTEL_ADSP_CAVS25 || BOARD_INTEL_ADSP_CAVS25_TGPH diff --git a/boards/xtensa/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25 b/boards/xtensa/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25 new file mode 100644 index 0000000000000..06ee411538e76 --- /dev/null +++ b/boards/xtensa/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25 @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_CAVS25 + bool + default y + select SOC_SERIES_INTEL_ADSP_CAVS + select SOC_INTEL_CAVS_V25 diff --git a/boards/xtensa/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph b/boards/xtensa/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph new file mode 100644 index 0000000000000..f4bb38629f654 --- /dev/null +++ b/boards/xtensa/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_CAVS25_TGPH + bool + default y + select SOC_INTEL_CAVS_V25 + select SOC_SERIES_INTEL_ADSP_CAVS diff --git a/boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_defconfig b/boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_defconfig index 8235b4a365cd5..cf659aab394bb 100644 --- a/boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_defconfig +++ b/boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_defconfig @@ -2,9 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_SERIES_INTEL_ADSP_CAVS=y -CONFIG_SOC_INTEL_CAVS_V25=y -CONFIG_BOARD_INTEL_ADSP_CAVS25=y CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig b/boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig index a49bf91f45763..06d902409a925 100644 --- a/boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig +++ b/boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig @@ -2,9 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_INTEL_CAVS_V25=y -CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH=y -CONFIG_SOC_SERIES_INTEL_ADSP_CAVS=y CONFIG_GEN_ISR_TABLES=y diff --git a/boards/xtensa/nxp_adsp_imx8/Kconfig.board b/boards/xtensa/nxp_adsp_imx8/Kconfig.board deleted file mode 100644 index e24c0a453169e..0000000000000 --- a/boards/xtensa/nxp_adsp_imx8/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2021 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NXP_ADSP_IMX8 - bool "NXP ADSP i.MX8" diff --git a/boards/xtensa/nxp_adsp_imx8/Kconfig.defconfig b/boards/xtensa/nxp_adsp_imx8/Kconfig.defconfig index f72d1a4e11f9f..a78931142b4f5 100644 --- a/boards/xtensa/nxp_adsp_imx8/Kconfig.defconfig +++ b/boards/xtensa/nxp_adsp_imx8/Kconfig.defconfig @@ -2,11 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_NXP_ADSP_IMX8 - -config BOARD - default "nxp_adsp_imx8" - config DUMMY_DMA bool default y @@ -16,6 +11,3 @@ config IMX_EDMA bool default y depends on DMA - - -endif # BOARD_NXP_ADSP_IMX8 diff --git a/boards/xtensa/nxp_adsp_imx8/Kconfig.nxp_adsp_imx8 b/boards/xtensa/nxp_adsp_imx8/Kconfig.nxp_adsp_imx8 new file mode 100644 index 0000000000000..60e17028660cc --- /dev/null +++ b/boards/xtensa/nxp_adsp_imx8/Kconfig.nxp_adsp_imx8 @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NXP_ADSP_IMX8 + bool + default y + select SOC_SERIES_NXP_IMX8 diff --git a/boards/xtensa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig b/boards/xtensa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig index 4b73513c85498..7cb01a0c54cb7 100644 --- a/boards/xtensa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig +++ b/boards/xtensa/nxp_adsp_imx8/nxp_adsp_imx8_defconfig @@ -2,8 +2,6 @@ CONFIG_MAIN_STACK_SIZE=3072 -CONFIG_SOC_SERIES_NXP_IMX8=y -CONFIG_BOARD_NXP_ADSP_IMX8=y CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/xtensa/nxp_adsp_imx8m/Kconfig.board b/boards/xtensa/nxp_adsp_imx8m/Kconfig.board deleted file mode 100644 index 6efc104fd2120..0000000000000 --- a/boards/xtensa/nxp_adsp_imx8m/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2021 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NXP_ADSP_IMX8M - bool "NXP ADSP i.MX8M" diff --git a/boards/xtensa/nxp_adsp_imx8m/Kconfig.defconfig b/boards/xtensa/nxp_adsp_imx8m/Kconfig.defconfig index be0f9c3efd4ca..f79594bdad227 100644 --- a/boards/xtensa/nxp_adsp_imx8m/Kconfig.defconfig +++ b/boards/xtensa/nxp_adsp_imx8m/Kconfig.defconfig @@ -2,11 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_NXP_ADSP_IMX8M - -config BOARD - default "nxp_adsp_imx8m" - config DUMMY_DMA bool default y @@ -16,6 +11,3 @@ config IMX_SDMA bool default y depends on DMA - - -endif # BOARD_NXP_ADSP_IMX8M diff --git a/boards/xtensa/nxp_adsp_imx8m/Kconfig.nxp_adsp_imx8m b/boards/xtensa/nxp_adsp_imx8m/Kconfig.nxp_adsp_imx8m new file mode 100644 index 0000000000000..55b16c54873b6 --- /dev/null +++ b/boards/xtensa/nxp_adsp_imx8m/Kconfig.nxp_adsp_imx8m @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NXP_ADSP_IMX8M + bool + default y + select SOC_SERIES_NXP_IMX8M diff --git a/boards/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig b/boards/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig index f6fe5a5256d02..7cb01a0c54cb7 100644 --- a/boards/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig +++ b/boards/xtensa/nxp_adsp_imx8m/nxp_adsp_imx8m_defconfig @@ -2,8 +2,6 @@ CONFIG_MAIN_STACK_SIZE=3072 -CONFIG_SOC_SERIES_NXP_IMX8M=y -CONFIG_BOARD_NXP_ADSP_IMX8M=y CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/xtensa/nxp_adsp_imx8x/Kconfig.board b/boards/xtensa/nxp_adsp_imx8x/Kconfig.board deleted file mode 100644 index 7f4f7e0e3f90e..0000000000000 --- a/boards/xtensa/nxp_adsp_imx8x/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2021 NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NXP_ADSP_IMX8X - bool "NXP ADSP i.MX8X" diff --git a/boards/xtensa/nxp_adsp_imx8x/Kconfig.defconfig b/boards/xtensa/nxp_adsp_imx8x/Kconfig.defconfig index 31d4239550396..a78931142b4f5 100644 --- a/boards/xtensa/nxp_adsp_imx8x/Kconfig.defconfig +++ b/boards/xtensa/nxp_adsp_imx8x/Kconfig.defconfig @@ -2,11 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -if BOARD_NXP_ADSP_IMX8X - -config BOARD - default "nxp_adsp_imx8x" - config DUMMY_DMA bool default y @@ -16,5 +11,3 @@ config IMX_EDMA bool default y depends on DMA - -endif # BOARD_NXP_ADSP_IMX8X diff --git a/boards/xtensa/nxp_adsp_imx8x/Kconfig.nxp_adsp_imx8x b/boards/xtensa/nxp_adsp_imx8x/Kconfig.nxp_adsp_imx8x new file mode 100644 index 0000000000000..9cc9df448fdbc --- /dev/null +++ b/boards/xtensa/nxp_adsp_imx8x/Kconfig.nxp_adsp_imx8x @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NXP_ADSP_IMX8X + bool + default y + select SOC_SERIES_NXP_IMX8 diff --git a/boards/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig b/boards/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig index f47e0830dbbe5..7cb01a0c54cb7 100644 --- a/boards/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig +++ b/boards/xtensa/nxp_adsp_imx8x/nxp_adsp_imx8x_defconfig @@ -2,8 +2,6 @@ CONFIG_MAIN_STACK_SIZE=3072 -CONFIG_SOC_SERIES_NXP_IMX8=y -CONFIG_BOARD_NXP_ADSP_IMX8X=y CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/xtensa/odroid_go/Kconfig.board b/boards/xtensa/odroid_go/Kconfig.board deleted file mode 100644 index ad5a4838ba698..0000000000000 --- a/boards/xtensa/odroid_go/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# ODROID-GO Game Kit configuration - -# Copyright (c) 2019 Yannis Damigos -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ODROID_GO - bool "ODROID-GO Game Kit" - depends on SOC_ESP32 diff --git a/boards/xtensa/odroid_go/Kconfig.defconfig b/boards/xtensa/odroid_go/Kconfig.defconfig index 79d0147f565cf..2943d7a1b492e 100644 --- a/boards/xtensa/odroid_go/Kconfig.defconfig +++ b/boards/xtensa/odroid_go/Kconfig.defconfig @@ -3,10 +3,6 @@ # Copyright (c) 2019 Yannis Damigos # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "odroid_go" - depends on BOARD_ODROID_GO - config DISK_DRIVER_SDMMC default y if DISK_ACCESS diff --git a/boards/xtensa/odroid_go/Kconfig.odroid_go b/boards/xtensa/odroid_go/Kconfig.odroid_go new file mode 100644 index 0000000000000..2515a19f5da82 --- /dev/null +++ b/boards/xtensa/odroid_go/Kconfig.odroid_go @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ODROID_GO + bool + default y + select SOC_ESP32 diff --git a/boards/xtensa/odroid_go/odroid_go_defconfig b/boards/xtensa/odroid_go/odroid_go_defconfig index 84f21a0423b5f..574ce3c862c61 100644 --- a/boards/xtensa/odroid_go/odroid_go_defconfig +++ b/boards/xtensa/odroid_go/odroid_go_defconfig @@ -2,8 +2,6 @@ CONFIG_XTENSA_RESET_VECTOR=n -CONFIG_BOARD_ODROID_GO=y -CONFIG_SOC_ESP32=y CONFIG_MAIN_STACK_SIZE=2048 diff --git a/boards/xtensa/olimex_esp32_evb/Kconfig.board b/boards/xtensa/olimex_esp32_evb/Kconfig.board deleted file mode 100644 index 2b230816edc77..0000000000000 --- a/boards/xtensa/olimex_esp32_evb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Olimex ESP32-EVB board configuration - -# Copyright (c) 2022 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_OLIMEX_ESP32_EVB - bool "Olimex ESP32-EVB" - depends on SOC_ESP32 diff --git a/boards/xtensa/olimex_esp32_evb/Kconfig.defconfig b/boards/xtensa/olimex_esp32_evb/Kconfig.defconfig deleted file mode 100644 index 78c9506be198e..0000000000000 --- a/boards/xtensa/olimex_esp32_evb/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Olimex ESP32-EVB board configuration - -# Copyright (c) 2022 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_OLIMEX_ESP32_EVB - -config BOARD - default "olimex_esp32_evb" - -endif # BOARD_OLIMEX_ESP32_EVB diff --git a/boards/xtensa/olimex_esp32_evb/Kconfig.olimex_esp32_evb b/boards/xtensa/olimex_esp32_evb/Kconfig.olimex_esp32_evb new file mode 100644 index 0000000000000..d03e2669b9edf --- /dev/null +++ b/boards/xtensa/olimex_esp32_evb/Kconfig.olimex_esp32_evb @@ -0,0 +1,7 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_OLIMEX_ESP32_EVB + bool + default y + select SOC_ESP32 diff --git a/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb_defconfig b/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb_defconfig index 034074ed37103..7fd4cddd0bd74 100644 --- a/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb_defconfig +++ b/boards/xtensa/olimex_esp32_evb/olimex_esp32_evb_defconfig @@ -2,8 +2,6 @@ CONFIG_XTENSA_RESET_VECTOR=n -CONFIG_BOARD_OLIMEX_ESP32_EVB=y -CONFIG_SOC_ESP32=y CONFIG_MAIN_STACK_SIZE=2048 diff --git a/boards/xtensa/qemu_xtensa/Kconfig.board b/boards/xtensa/qemu_xtensa/Kconfig.board deleted file mode 100644 index 72b5c1a91c83d..0000000000000 --- a/boards/xtensa/qemu_xtensa/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# XTENSA board configuration - -# Copyright (c) 2017 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_XTENSA - bool "Xtensa emulation using QEMU" - depends on SOC_XTENSA_SAMPLE_CONTROLLER - select QEMU_TARGET diff --git a/boards/xtensa/qemu_xtensa/Kconfig.defconfig b/boards/xtensa/qemu_xtensa/Kconfig.defconfig index 91e577806f018..0da20cd60bff8 100644 --- a/boards/xtensa/qemu_xtensa/Kconfig.defconfig +++ b/boards/xtensa/qemu_xtensa/Kconfig.defconfig @@ -1,15 +1,8 @@ # Copyright (c) 2017 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -if BOARD_QEMU_XTENSA - config BUILD_OUTPUT_BIN default n -config BOARD - default "qemu_xtensa" - config IPM_CONSOLE_STACK_SIZE default 2048 if IPM_CONSOLE_RECEIVER - -endif # BOARD_QEMU_XTENSA diff --git a/boards/xtensa/qemu_xtensa/Kconfig.qemu_xtensa b/boards/xtensa/qemu_xtensa/Kconfig.qemu_xtensa new file mode 100644 index 0000000000000..36f5dd7c86997 --- /dev/null +++ b/boards/xtensa/qemu_xtensa/Kconfig.qemu_xtensa @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_XTENSA + bool + default y + select SOC_XTENSA_SAMPLE_CONTROLLER + select QEMU_TARGET diff --git a/boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig b/boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig index 08e8295cc8034..d23b5a9f174f7 100644 --- a/boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig +++ b/boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig @@ -1,9 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_BOARD_QEMU_XTENSA=y CONFIG_CONSOLE=y -CONFIG_SOC_XTENSA_SAMPLE_CONTROLLER=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=10000000 CONFIG_STACK_SENTINEL=y CONFIG_GEN_ISR_TABLES=y diff --git a/boards/xtensa/xt-sim/Kconfig.board b/boards/xtensa/xt-sim/Kconfig.board deleted file mode 100644 index d67c68417a92a..0000000000000 --- a/boards/xtensa/xt-sim/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# XTENSA board configuration - -# Copyright (c) 2016 Cadence Design Systems, Inc. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_XT_SIM - bool "Xtensa Development ISS" - depends on SIMULATOR_XTENSA diff --git a/boards/xtensa/xt-sim/Kconfig.defconfig b/boards/xtensa/xt-sim/Kconfig.defconfig index ab2d5e9f13bf3..98be6f9e997fa 100644 --- a/boards/xtensa/xt-sim/Kconfig.defconfig +++ b/boards/xtensa/xt-sim/Kconfig.defconfig @@ -1,8 +1,5 @@ # Copyright (c) 2016 Cadence Design Systems, Inc. # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "xt-sim" - config IPM_CONSOLE_STACK_SIZE default 2048 if IPM_CONSOLE_RECEIVER diff --git a/boards/xtensa/xt-sim/Kconfig.xt_sim b/boards/xtensa/xt-sim/Kconfig.xt_sim new file mode 100644 index 0000000000000..1af094631dca4 --- /dev/null +++ b/boards/xtensa/xt-sim/Kconfig.xt_sim @@ -0,0 +1,8 @@ +# Copyright (c) 2022 Zephyr Project members and individual contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_XT_SIM + bool + default y + select SOC_XTENSA_SAMPLE_CONTROLLER + select SIMULATOR_XTENSA diff --git a/boards/xtensa/xt-sim/xt-sim_defconfig b/boards/xtensa/xt-sim/xt-sim_defconfig index ae3d7a6cd9173..220d593744fdf 100644 --- a/boards/xtensa/xt-sim/xt-sim_defconfig +++ b/boards/xtensa/xt-sim/xt-sim_defconfig @@ -1,8 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_XTENSA_SAMPLE_CONTROLLER=y -CONFIG_BOARD_XT_SIM=y CONFIG_CONSOLE=y CONFIG_GEN_ISR_TABLES=y diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake index 4316f2e42d285..f62a5ad98d8c5 100644 --- a/cmake/modules/kconfig.cmake +++ b/cmake/modules/kconfig.cmake @@ -122,6 +122,7 @@ set(COMMON_KCONFIG_ENV_SETTINGS ARCH=${ARCH} ARCH_DIR=${ARCH_DIR} BOARD_DIR=${BOARD_DIR} + BOARD=${BOARD} BOARD_REVISION=${BOARD_REVISION} KCONFIG_BINARY_DIR=${KCONFIG_BINARY_DIR} ZEPHYR_TOOLCHAIN_VARIANT=${ZEPHYR_TOOLCHAIN_VARIANT} diff --git a/doc/_extensions/zephyr/kconfig/__init__.py b/doc/_extensions/zephyr/kconfig/__init__.py index 1e7f4097f4cb2..5ae93df23f47c 100644 --- a/doc/_extensions/zephyr/kconfig/__init__.py +++ b/doc/_extensions/zephyr/kconfig/__init__.py @@ -97,6 +97,7 @@ def kconfig_load(app: Sphinx) -> Tuple[kconfiglib.Kconfig, Dict[str, str]]: os.environ["ARCH_DIR"] = "arch" os.environ["ARCH"] = "*" os.environ["BOARD_DIR"] = "boards/*/*" + os.environ["BOARD"] = "*" # insert external Kconfigs to the environment module_paths = dict() diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt index 901f6fc966889..d264e053b61b7 100644 --- a/drivers/CMakeLists.txt +++ b/drivers/CMakeLists.txt @@ -69,7 +69,7 @@ add_subdirectory_ifdef(CONFIG_BBRAM bbram) add_subdirectory_ifdef(CONFIG_FPGA fpga) add_subdirectory_ifdef(CONFIG_PINCTRL pinctrl) add_subdirectory_ifdef(CONFIG_MBOX mbox) -add_subdirectory_ifdef(CONFIG_BOARD_XENVM xen) +add_subdirectory_ifdef(CONFIG_SOC_XENVM xen) add_subdirectory_ifdef(CONFIG_MM_DRV mm) add_subdirectory_ifdef(CONFIG_RESET reset) add_subdirectory_ifdef(CONFIG_COREDUMP_DEVICE coredump) diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig index abc3ec92d19aa..433152ade73f2 100644 --- a/drivers/bluetooth/hci/Kconfig +++ b/drivers/bluetooth/hci/Kconfig @@ -58,7 +58,7 @@ config BT_STM32_IPM config BT_USERCHAN bool "HCI User Channel based driver" - depends on BOARD_NATIVE_POSIX + depends on (BOARD_NATIVE_POSIX || BOARD_NATIVE_POSIX_64) help This driver provides access to the local Linux host's Bluetooth adapter using a User Channel HCI socket to the Linux kernel. It diff --git a/drivers/ieee802154/Kconfig.uart_pipe b/drivers/ieee802154/Kconfig.uart_pipe index 066bdccecb2d5..d23113175ef53 100644 --- a/drivers/ieee802154/Kconfig.uart_pipe +++ b/drivers/ieee802154/Kconfig.uart_pipe @@ -4,7 +4,7 @@ menuconfig IEEE802154_UPIPE bool "UART PIPE fake radio driver support for QEMU" default y - depends on (BOARD_QEMU_X86 || BOARD_QEMU_CORTEX_M3) && \ + depends on ((X86 && QEMU_TARGET) || BOARD_QEMU_CORTEX_M3) && \ DT_HAS_ZEPHYR_IEEE802154_UART_PIPE_ENABLED select UART_PIPE diff --git a/drivers/interrupt_controller/Kconfig.intel_vtd b/drivers/interrupt_controller/Kconfig.intel_vtd index 6dcbd9644ca9e..b4f4d7e09414b 100644 --- a/drivers/interrupt_controller/Kconfig.intel_vtd +++ b/drivers/interrupt_controller/Kconfig.intel_vtd @@ -7,7 +7,7 @@ menuconfig INTEL_VTD_ICTL bool "Intel VT-D interrupt remapping controller" default y depends on DT_HAS_INTEL_VT_D_ENABLED - depends on !BOARD_QEMU_X86_64 && ACPI && X86 && 64BIT && PCIE_MSI_MULTI_VECTOR + depends on !QEMU_TARGET && ACPI && X86 && 64BIT && PCIE_MSI_MULTI_VECTOR select CACHE_MANAGEMENT help Such interrupt remapping hardware is provided through Intel VT-D diff --git a/drivers/serial/Kconfig.xen b/drivers/serial/Kconfig.xen index 010541f77d137..219c380e53b43 100644 --- a/drivers/serial/Kconfig.xen +++ b/drivers/serial/Kconfig.xen @@ -18,7 +18,7 @@ config UART_XEN_HVC config UART_XEN_HVC_CONSOLEIO bool "Xen hypervisor Dom0 console UART driver" select SERIAL_HAS_DRIVER - depends on BOARD_XENVM + depends on SOC_XENVM depends on XEN_INITIAL_DOMAIN default y help @@ -35,7 +35,7 @@ config XEN_HVC_INIT_PRIORITY config XEN_EARLY_CONSOLEIO bool "Early printk/stdout through console_io Xen interface" - depends on BOARD_XENVM + depends on SOC_XENVM depends on UART_XEN_HVC help Enable setting of console_io symbol hook for stdout and printk. diff --git a/drivers/timer/Kconfig.native_posix b/drivers/timer/Kconfig.native_posix index 6fe1c3bde4df3..be930c1075015 100644 --- a/drivers/timer/Kconfig.native_posix +++ b/drivers/timer/Kconfig.native_posix @@ -6,7 +6,7 @@ config NATIVE_POSIX_TIMER bool "(POSIX) native_posix timer driver" default y - depends on BOARD_NATIVE_POSIX + depends on (BOARD_NATIVE_POSIX || BOARD_NATIVE_POSIX_64) select TICKLESS_CAPABLE select TIMER_HAS_64BIT_CYCLE_COUNTER select SYSTEM_TIMER_HAS_DISABLE_SUPPORT diff --git a/drivers/timer/apic_tsc.c b/drivers/timer/apic_tsc.c index dcae6e3775f2f..bb6a1a7a15423 100644 --- a/drivers/timer/apic_tsc.c +++ b/drivers/timer/apic_tsc.c @@ -129,7 +129,7 @@ static void clear_tsc_adjust(void) * confuses the APIC emulation and deadline interrupts don't * arrive. */ -#ifndef CONFIG_BOARD_ACRN +#ifndef CONFIG_BOARD_ACRN_EHL_CRB wrmsr(IA32_TSC_ADJUST_MSR, 0); #endif } diff --git a/include/zephyr/rtio/rtio.h b/include/zephyr/rtio/rtio.h index fdff8d1c1557e..e30e01a96d35c 100644 --- a/include/zephyr/rtio/rtio.h +++ b/include/zephyr/rtio/rtio.h @@ -490,11 +490,11 @@ static inline int rtio_submit(struct rtio *r, uint32_t wait_count) } #else while (rtio_spsc_consumable(r->cq) < wait_count) { -#ifdef CONFIG_BOARD_NATIVE_POSIX +#if defined(CONFIG_BOARD_NATIVE_POSIX) || defined(CONFIG_BOARD_NATIVE_POSIX_64) k_busy_wait(1); #else k_yield(); -#endif /* CONFIG_BOARD_NATIVE_POSIX */ +#endif /* CONFIG_BOARD_NATIVE_POSIX || CONFIG_BOARD_NATIVE_POSIX_64 */ } #endif diff --git a/lib/posix/CMakeLists.txt b/lib/posix/CMakeLists.txt index 1bb9f8467cb5f..2ce914c3607e8 100644 --- a/lib/posix/CMakeLists.txt +++ b/lib/posix/CMakeLists.txt @@ -26,7 +26,7 @@ zephyr_library_sources_ifdef(CONFIG_POSIX_FS fs.c) zephyr_library_sources_ifdef(CONFIG_EVENTFD eventfd.c) add_subdirectory_ifdef(CONFIG_GETOPT getopt) -if(NOT (CONFIG_BOARD_NATIVE_POSIX OR CONFIG_BOARD_NATIVE_POSIX_64BIT)) +if(NOT (CONFIG_BOARD_NATIVE_POSIX OR CONFIG_BOARD_NATIVE_POSIX_64)) zephyr_library_sources(nanosleep.c) endif() diff --git a/modules/trusted-firmware-m/CMakeLists.txt b/modules/trusted-firmware-m/CMakeLists.txt index 36e36c9f8417d..df71b0df2921f 100644 --- a/modules/trusted-firmware-m/CMakeLists.txt +++ b/modules/trusted-firmware-m/CMakeLists.txt @@ -241,7 +241,7 @@ if (CONFIG_BUILD_WITH_TFM) message(FATAL_ERROR "Unsupported ZEPHYR_TOOLCHAIN_VARIANT: ${ZEPHYR_TOOLCHAIN_VARIANT}") endif() - if(CONFIG_BOARD_LPCXPRESSO55S69_CPU0) + if(CONFIG_SOC_LPC55S69_CPU0) # Supply path to NXP HAL sources used for TF-M build set(TFM_PLATFORM_NXP_HAL_FILE_PATH ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/platform/ext/target/nxp/) list(APPEND TFM_CMAKE_ARGS -DTFM_PLATFORM_NXP_HAL_FILE_PATH=${TFM_PLATFORM_NXP_HAL_FILE_PATH}) diff --git a/modules/trusted-firmware-m/Kconfig.tfm b/modules/trusted-firmware-m/Kconfig.tfm index eeb5cdef00f6e..38c03dfdf9504 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm +++ b/modules/trusted-firmware-m/Kconfig.tfm @@ -11,14 +11,14 @@ config TFM_BOARD string default "nordic_nrf/nrf9160dk_nrf9160" if BOARD_NRF9160DK_NRF9160_NS default "nordic_nrf/nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPP_NS - default "nxp/lpcxpresso55s69" if BOARD_LPCXPRESSO55S69_CPU0 - default "arm/mps2/an521" if BOARD_MPS2_AN521_CPU0_NS - default "arm/mps3/an547" if BOARD_MPS3_AN547 - default "stm/b_u585i_iot02a" if BOARD_B_U585I_IOT02A - default "stm/nucleo_l552ze_q" if BOARD_NUCLEO_L552ZE_Q - default "stm/stm32l562e_dk" if BOARD_STM32L562E_DK - default "arm/musca_b1/sse_200" if BOARD_MUSCA_B1 - default "arm/musca_s1" if BOARD_MUSCA_S1 + default "nxp/lpcxpresso55s69" if BOARD_LPCXPRESSO55S69_NS + default "arm/mps2/an521" if BOARD_MPS2_AN521_NS + default "arm/mps3/an547" if BOARD_MPS3_AN547_NS + default "stm/b_u585i_iot02a" if BOARD_B_U585I_IOT02A_NS + default "stm/nucleo_l552ze_q" if BOARD_NUCLEO_L552ZE_Q_NS + default "stm/stm32l562e_dk" if BOARD_STM32L562E_DK_NS + default "arm/musca_b1/sse_200" if BOARD_V2M_MUSCA_B1_NS + default "arm/musca_s1" if BOARD_V2M_MUSCA_S1_NS default "lairdconnectivity/bl5340_dvk_cpuapp" if BOARD_BL5340_DVK_CPUAPP_NS help The board name used for building TFM. Building with TFM requires that diff --git a/samples/boards/arc_secure_services/nsim_sem_normal_defconfig b/samples/boards/arc_secure_services/nsim_sem_normal_defconfig index 98b3d6edca0be..a96cb8bf1042e 100644 --- a/samples/boards/arc_secure_services/nsim_sem_normal_defconfig +++ b/samples/boards/arc_secure_services/nsim_sem_normal_defconfig @@ -1,6 +1,5 @@ CONFIG_SOC_NSIM=y CONFIG_SOC_NSIM_SEM=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n diff --git a/samples/net/sockets/socketpair/src/socketpair_example.c b/samples/net/sockets/socketpair/src/socketpair_example.c index cf098f229dea9..d544c44df0dda 100644 --- a/samples/net/sockets/socketpair/src/socketpair_example.c +++ b/samples/net/sockets/socketpair/src/socketpair_example.c @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#if defined(__ZEPHYR__) && !(defined(CONFIG_BOARD_NATIVE_POSIX_32BIT) \ - || defined(CONFIG_BOARD_NATIVE_POSIX_64BIT) \ +#if defined(__ZEPHYR__) && !(defined(CONFIG_BOARD_NATIVE_POSIX) \ + || defined(CONFIG_BOARD_NATIVE_POSIX_64) \ || defined(CONFIG_SOC_SERIES_BSIM_NRFXX)) #include @@ -44,8 +44,8 @@ static const char *const names[] = { "Charlie", }; -#if defined(__ZEPHYR__) && !(defined(CONFIG_BOARD_NATIVE_POSIX_32BIT) \ - || defined(CONFIG_BOARD_NATIVE_POSIX_64BIT) \ +#if defined(__ZEPHYR__) && !(defined(CONFIG_BOARD_NATIVE_POSIX) \ + || defined(CONFIG_BOARD_NATIVE_POSIX_64) \ || defined(CONFIG_SOC_SERIES_BSIM_NRFXX)) #define STACK_SIZE (1024) @@ -126,8 +126,8 @@ int main(int argc, char *argv[]) goto out; } -#if defined(__ZEPHYR__) && !(defined(CONFIG_BOARD_NATIVE_POSIX_32BIT) \ - || defined(CONFIG_BOARD_NATIVE_POSIX_64BIT) \ +#if defined(__ZEPHYR__) && !(defined(CONFIG_BOARD_NATIVE_POSIX) \ + || defined(CONFIG_BOARD_NATIVE_POSIX_64) \ || defined(CONFIG_SOC_SERIES_BSIM_NRFXX)) /* Zephyr requires a non-NULL attribute for pthread_create */ attrp = &attr[i]; diff --git a/samples/tfm_integration/psa_firmware/Kconfig b/samples/tfm_integration/psa_firmware/Kconfig index 73bcb43ca4f7c..1342b4e9b829e 100644 --- a/samples/tfm_integration/psa_firmware/Kconfig +++ b/samples/tfm_integration/psa_firmware/Kconfig @@ -18,7 +18,7 @@ config APP_FIRMWARE_UPDATE_IMAGE help This required option specifies the path to an image that this exapmle will update to. - default "$(shell, dirname $(filename))/boards/hello-an547.hex" if BOARD_MPS3_AN547 + default "$(shell, dirname $(filename))/boards/hello-an547.hex" if BOARD_MPS3_AN547_NS config APP_FIRMWARE_UPDATE_IMAGE_VERSION string "Version of the new image to update to" diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py index 088e331dade3d..2ee2e4c74a8cd 100755 --- a/scripts/ci/check_compliance.py +++ b/scripts/ci/check_compliance.py @@ -321,6 +321,7 @@ def parse_kconfig(self): os.environ["SOC_DIR"] = "soc/" os.environ["ARCH_DIR"] = "arch/" os.environ["BOARD_DIR"] = "boards/*/*" + os.environ["BOARD"] = "*" os.environ["ARCH"] = "*" os.environ["KCONFIG_BINARY_DIR"] = tempfile.gettempdir() os.environ['DEVICETREE_CONF'] = "dummy" diff --git a/soc/Kconfig b/soc/Kconfig index da9febef2ce7c..92e7a79f2e18f 100644 --- a/soc/Kconfig +++ b/soc/Kconfig @@ -1,15 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 -choice - prompt "SoC/CPU/Configuration Selection" - # This loads custom SoC root Kconfig (only available if custom SoC root are defined) osource "$(KCONFIG_BINARY_DIR)/Kconfig.soc" # This loads Zephyr base SoC root Kconfig osource "soc/$(ARCH)/*/Kconfig.soc" -endchoice - menu "Hardware Configuration" # This loads custom SoC root Kconfig (only available if custom SoC root are defined) osource "$(KCONFIG_BINARY_DIR)/Kconfig.soc.arch" diff --git a/soc/arc/snps_emsdp/Kconfig b/soc/arc/snps_emsdp/Kconfig index b8f6888433ff5..89af5019a1f9f 100644 --- a/soc/arc/snps_emsdp/Kconfig +++ b/soc/arc/snps_emsdp/Kconfig @@ -1,43 +1,50 @@ # Copyright (c) 2019 Synopsys, Inc. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARC EM Software Development Platform Core Selection" - default SOC_EMSDP_EM11D - depends on SOC_ARC_EMSDP - config SOC_EMSDP_EM4 - bool "Synopsys ARC EM4 of EMSDP" + bool select CPU_HAS_MPU + help + Synopsys ARC EM4 of EMSDP config SOC_EMSDP_EM6 - bool "Synopsys ARC EM6 of EMSDP" + bool select CPU_HAS_MPU + help + Synopsys ARC EM6 of EMSDP config SOC_EMSDP_EM5D - bool "Synopsys ARC EM5D of EMSDP" + bool select CPU_HAS_MPU select CPU_HAS_FPU + help + Synopsys ARC EM5D of EMSDP config SOC_EMSDP_EM7D - bool "Synopsys ARC EM7D of EMSDP" + bool select CPU_HAS_MPU select CPU_HAS_FPU + help + Synopsys ARC EM7D of EMSDP config SOC_EMSDP_EM7D_ESP - bool "Synopsys ARC EM7D+ESP of EMSDP" + bool select CPU_HAS_MPU select CPU_HAS_FPU select ARC_HAS_SECURE + help + Synopsys ARC EM7D+ESP of EMSDP" config SOC_EMSDP_EM9D - bool "Synopsys ARC EM9D of EMSDP" + bool select CPU_HAS_MPU select CPU_HAS_FPU + help + Synopsys ARC EM9D of EMSDP config SOC_EMSDP_EM11D - bool "Synopsys ARC EM11D of EMSDP" + bool select CPU_HAS_MPU select CPU_HAS_FPU - -endchoice + help + Synopsys ARC EM11D of EMSDP diff --git a/soc/arc/snps_emsk/Kconfig b/soc/arc/snps_emsk/Kconfig index b1f0f7e54aac9..61bbba067a5f4 100644 --- a/soc/arc/snps_emsk/Kconfig +++ b/soc/arc/snps_emsk/Kconfig @@ -2,21 +2,20 @@ # Copyright (c) 2018 Synopsys, Inc. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARC EM Starter Kit Core Selection" - default SOC_EMSK_EM7D - depends on SOC_EMSK - config SOC_EMSK_EM7D - bool "Synopsys ARC EM7D of EMSK" + bool select CPU_HAS_MPU + help + Synopsys ARC EM7D of EMSK config SOC_EMSK_EM11D - bool "Synopsys ARC EM11D of EMSK" + bool select CPU_HAS_FPU + help + Synopsys ARC EM11D of EMSK config SOC_EMSK_EM9D - bool "Synopsys ARC EM9D of EMSK" + bool select CPU_HAS_FPU - -endchoice + help + Synopsys ARC EM9D of EMSK diff --git a/soc/arc/snps_nsim/Kconfig b/soc/arc/snps_nsim/Kconfig index 4c02e9c278b0b..2d4f9c277dc50 100644 --- a/soc/arc/snps_nsim/Kconfig +++ b/soc/arc/snps_nsim/Kconfig @@ -1,49 +1,62 @@ # Copyright (c) 2018 Synopsys, Inc. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARC nSIM SoC Selection" - default SOC_NSIM_EM - depends on SOC_NSIM - config SOC_NSIM_EM - bool "Synopsys ARC EM in nSIM" + bool select CPU_HAS_MPU + help + Synopsys ARC EM in nSIM config SOC_NSIM_EM7D_V22 - bool "Synopsys ARC EM7D_V22 in nSIM" + bool select CPU_HAS_MPU select CPU_HAS_FPU + help + Synopsys ARC EM7D_V22 in nSIM config SOC_NSIM_SEM - bool "Synopsys ARC SEM in nSIM" + bool select CPU_HAS_MPU select CPU_HAS_FPU select ARC_HAS_SECURE + help + Synopsys ARC SEM in nSIM config SOC_NSIM_HS - bool "Synopsys ARC HS in nSIM" + bool select CPU_HAS_FPU + help + Synopsys ARC HS in nSIM config SOC_NSIM_HS_SMP - bool "Multi-core Synopsys ARC HS in nSIM" + bool select CPU_HAS_FPU + help + Multi-core Synopsys ARC HS in nSIM config SOC_NSIM_HS_MPUV6 - bool "Synopsys ARC HS with MPU v6 in nSIM" + bool select CPU_HAS_MPU select CPU_HAS_FPU + help + Synopsys ARC HS with MPU v6 in nSIM config SOC_NSIM_HS6X - bool "Synopsys ARC HS6x in nSIM" + bool + help + Synopsys ARC HS6x in nSIM config SOC_NSIM_HS6X_SMP - bool "Multi-core Synopsys ARC HS6x in nSIM" + bool + help + Multi-core Synopsys ARC HS6x in nSIM config SOC_NSIM_HS5X - bool "Synopsys ARC HS5x in nSIM" + bool + help + Synopsys ARC HS5x in nSIM config SOC_NSIM_HS5X_SMP - bool "Multi-core Synopsys ARC HS5x in nSIM" - -endchoice + bool + help + Multi-core Synopsys ARC HS5x in nSIM diff --git a/soc/arc/snps_qemu/Kconfig b/soc/arc/snps_qemu/Kconfig index 3146c6c5e9134..29b30897f14ff 100644 --- a/soc/arc/snps_qemu/Kconfig +++ b/soc/arc/snps_qemu/Kconfig @@ -1,21 +1,22 @@ # Copyright (c) 2020 Synopsys, Inc. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARC QEMU SoC Selection" - default SOC_QEMU_ARC_HS - depends on SOC_QEMU_ARC - config SOC_QEMU_ARC_EM - bool "Synopsys ARC EM in QEMU" + bool + help + Synopsys ARC EM in QEMU config SOC_QEMU_ARC_HS - bool "Synopsys ARC HS in QEMU" + bool + help + Synopsys ARC HS in QEMU config SOC_QEMU_ARC_HS6X - bool "Synopsys ARC HS6x in QEMU" + bool + help + Synopsys ARC HS6x in QEMU config SOC_QEMU_ARC_HS5X - bool "Synopsys ARC HS5x in QEMU" - -endchoice + bool + help + Synopsys ARC HS5x in QEMU diff --git a/soc/arm/arm/beetle/Kconfig.series b/soc/arm/arm/beetle/Kconfig.series index 2217f282cf06f..9befa7fc62b4a 100644 --- a/soc/arm/arm/beetle/Kconfig.series +++ b/soc/arm/arm/beetle/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_BEETLE - bool "Arm Beetle MCU Series" + bool select ARM select CPU_CORTEX_M3 select SOC_FAMILY_ARM diff --git a/soc/arm/arm/beetle/Kconfig.soc b/soc/arm/arm/beetle/Kconfig.soc index e577ee7060e12..42ccde45cab00 100644 --- a/soc/arm/arm/beetle/Kconfig.soc +++ b/soc/arm/arm/beetle/Kconfig.soc @@ -3,11 +3,7 @@ # Copyright (c) 2016 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARM Beetle SoC" - depends on SOC_SERIES_BEETLE - config SOC_BEETLE_R0 - bool "ARM BEETLE R0" - -endchoice + bool + help + ARM BEETLE R0 diff --git a/soc/arm/arm/designstart/Kconfig.series b/soc/arm/arm/designstart/Kconfig.series index 23c49edc8c6ed..dd7d8319bb321 100644 --- a/soc/arm/arm/designstart/Kconfig.series +++ b/soc/arm/arm/designstart/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_ARM_DESIGNSTART - bool "Arm DesignStart SoC Series" + bool select ARM select SOC_FAMILY_ARM help diff --git a/soc/arm/arm/designstart/Kconfig.soc b/soc/arm/arm/designstart/Kconfig.soc index 9e336e596b696..ce33eba80ed3f 100644 --- a/soc/arm/arm/designstart/Kconfig.soc +++ b/soc/arm/arm/designstart/Kconfig.soc @@ -1,20 +1,18 @@ # Copyright (c) 2020 Henrik Brix Andersen # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARM DesignStart SoCs" - depends on SOC_SERIES_ARM_DESIGNSTART - config SOC_ARM_DESIGNSTART_FPGA_CORTEX_M1 - bool "ARM Cortex-M1 DesignStart FPGA" + bool select CPU_CORTEX_M1 imply XIP select HAS_SEGGER_RTT + help + ARM Cortex-M1 DesignStart FPGA config SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3 - bool "ARM Cortex-M3 DesignStart FPGA" + bool select CPU_CORTEX_M3 imply XIP select HAS_SEGGER_RTT - -endchoice + help + ARM Cortex-M3 DesignStart FPGA diff --git a/soc/arm/arm/fvp_aemv8r_aarch32/Kconfig.series b/soc/arm/arm/fvp_aemv8r_aarch32/Kconfig.series index 2479afe413090..b9ec21373a944 100644 --- a/soc/arm/arm/fvp_aemv8r_aarch32/Kconfig.series +++ b/soc/arm/arm/fvp_aemv8r_aarch32/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_FVP_AEMV8R_AARCH32 - bool "ARM FVP AEMv8R AArch32 Series" + bool select ARM select SOC_FAMILY_ARM help diff --git a/soc/arm/arm/fvp_aemv8r_aarch32/Kconfig.soc b/soc/arm/arm/fvp_aemv8r_aarch32/Kconfig.soc index 28929d1ee6c68..58df85911015e 100644 --- a/soc/arm/arm/fvp_aemv8r_aarch32/Kconfig.soc +++ b/soc/arm/arm/fvp_aemv8r_aarch32/Kconfig.soc @@ -1,16 +1,12 @@ # Copyright (c) 2022 IoT.bzh # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARM FVP AEMv8R AArch32 SoCs" - depends on SOC_SERIES_FVP_AEMV8R_AARCH32 - config SOC_FVP_AEMV8R_AARCH32 - bool "ARM FVP AEMv8R aarch32 simulation" + bool select CPU_CORTEX_R52 select CPU_HAS_ARM_MPU select CPU_HAS_MPU select GIC_V3 select GIC_SINGLE_SECURITY_STATE - -endchoice + help + ARM FVP AEMv8R aarch32 simulation diff --git a/soc/arm/arm/mps2/Kconfig.series b/soc/arm/arm/mps2/Kconfig.series index c8715c21c8304..56a9e86beba2b 100644 --- a/soc/arm/arm/mps2/Kconfig.series +++ b/soc/arm/arm/mps2/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_MPS2 - bool "Arm MPS2 MCU Series" + bool select ARM select SOC_FAMILY_ARM select GPIO_MMIO32 if GPIO diff --git a/soc/arm/arm/mps2/Kconfig.soc b/soc/arm/arm/mps2/Kconfig.soc index 6a01c0d27fa76..576cc7dcfca72 100644 --- a/soc/arm/arm/mps2/Kconfig.soc +++ b/soc/arm/arm/mps2/Kconfig.soc @@ -6,24 +6,24 @@ config SOC_MPS2_AN521 select CPU_CORTEX_M33 select CPU_HAS_ARM_MPU -choice - prompt "ARM MPS2 SoCs" - depends on SOC_SERIES_MPS2 - config SOC_MPS2_AN385 - bool "ARM Cortex-M3 SMM on V2M-MPS2 (Application Note AN385)" + bool select CPU_CORTEX_M3 select CPU_HAS_ARM_MPU + help + ARM Cortex-M3 SMM on V2M-MPS2 (Application Note AN385) config SOC_MPS2_AN521_CPU0 - bool "ARM Cortex-M33 SMM-SSE-200 on V2M-MPS2+ (AN521) CPU0" + bool select SOC_MPS2_AN521 select CPU_HAS_ARM_SAU + help + ARM Cortex-M33 SMM-SSE-200 on V2M-MPS2+ (AN521) CPU0 config SOC_MPS2_AN521_CPU1 - bool "ARM Cortex-M33 SMM-SSE-200 on V2M-MPS2+ (AN521) CPU1" + bool select SOC_MPS2_AN521 select CPU_HAS_FPU select ARMV8_M_DSP - -endchoice + help + ARM Cortex-M33 SMM-SSE-200 on V2M-MPS2+ (AN521) CPU1 diff --git a/soc/arm/arm/mps3/Kconfig.series b/soc/arm/arm/mps3/Kconfig.series index 2b73ade4a69f2..45f0f2205cd5b 100644 --- a/soc/arm/arm/mps3/Kconfig.series +++ b/soc/arm/arm/mps3/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_MPS3 - bool "Arm MPS3 MCU Series" + bool select ARM select SOC_FAMILY_ARM select GPIO_MMIO32 if GPIO diff --git a/soc/arm/arm/mps3/Kconfig.soc b/soc/arm/arm/mps3/Kconfig.soc index 86970e288cc8d..6560906e2d262 100644 --- a/soc/arm/arm/mps3/Kconfig.soc +++ b/soc/arm/arm/mps3/Kconfig.soc @@ -1,12 +1,8 @@ # Copyright (c) 2017-2021 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Arm MPS3 SoCs" - depends on SOC_SERIES_MPS3 - config SOC_MPS3_AN547 - bool "Arm Cortex-M55 SSE-300 on MPS3 (AN547)" + bool select CPU_CORTEX_M55 select CPU_HAS_ARM_SAU select CPU_HAS_ARM_MPU @@ -14,5 +10,5 @@ config SOC_MPS3_AN547 select ARMV8_M_DSP select ARMV8_1_M_MVEI select ARMV8_1_M_MVEF - -endchoice + help + Arm Cortex-M55 SSE-300 on MPS3 (AN547) diff --git a/soc/arm/arm/musca_b1/Kconfig.series b/soc/arm/arm/musca_b1/Kconfig.series index 1a74a623f8d42..6e4569e422b67 100644 --- a/soc/arm/arm/musca_b1/Kconfig.series +++ b/soc/arm/arm/musca_b1/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_MUSCA_B1 - bool "Arm v2m MUSCA B1 MCU Series" + bool select ARM select SOC_FAMILY_ARM select BUILD_OUTPUT_HEX diff --git a/soc/arm/arm/musca_b1/Kconfig.soc b/soc/arm/arm/musca_b1/Kconfig.soc index da7ae30698a0a..e5701b3bc7e53 100644 --- a/soc/arm/arm/musca_b1/Kconfig.soc +++ b/soc/arm/arm/musca_b1/Kconfig.soc @@ -1,15 +1,11 @@ # Copyright (c) 2019 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARM Musca B1 SoCs" - depends on SOC_SERIES_MUSCA_B1 - config SOC_V2M_MUSCA_B1 - bool "ARM Cortex-M33 SMM-SSE-200 on V2M-MUSCA-B1" + bool select CPU_CORTEX_M33 select CPU_HAS_ARM_SAU select CPU_HAS_ARM_MPU select CPU_CORTEX_M_HAS_DWT - -endchoice + help + ARM Cortex-M33 SMM-SSE-200 on V2M-MUSCA-B1 diff --git a/soc/arm/arm/musca_s1/Kconfig.series b/soc/arm/arm/musca_s1/Kconfig.series index 95b054e3d8a5c..1afa84364ecf5 100644 --- a/soc/arm/arm/musca_s1/Kconfig.series +++ b/soc/arm/arm/musca_s1/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_MUSCA_S1 - bool "Arm v2m MUSCA-S1 MCU Series" + bool select ARM select SOC_FAMILY_ARM select BUILD_OUTPUT_HEX diff --git a/soc/arm/arm/musca_s1/Kconfig.soc b/soc/arm/arm/musca_s1/Kconfig.soc index 9bf02614308bc..a87afca668512 100644 --- a/soc/arm/arm/musca_s1/Kconfig.soc +++ b/soc/arm/arm/musca_s1/Kconfig.soc @@ -1,15 +1,11 @@ # Copyright (c) 2019-2020 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARM Musca-S1 SoCs" - depends on SOC_SERIES_MUSCA_S1 - config SOC_V2M_MUSCA_S1 - bool "ARM Cortex-M33 SMM-SSE-200 on V2M-MUSCA-S1" + bool select CPU_CORTEX_M33 select CPU_HAS_ARM_SAU select CPU_HAS_ARM_MPU select CPU_CORTEX_M_HAS_DWT - -endchoice + help + ARM Cortex-M33 SMM-SSE-200 on V2M-MUSCA-S1 diff --git a/soc/arm/aspeed/ast10x0/Kconfig.series b/soc/arm/aspeed/ast10x0/Kconfig.series index e4d0fdcd0561e..9cbea46502dab 100644 --- a/soc/arm/aspeed/ast10x0/Kconfig.series +++ b/soc/arm/aspeed/ast10x0/Kconfig.series @@ -3,7 +3,7 @@ # Copyright (c) 2021 ASPEED Technology Inc. config SOC_SERIES_AST10X0 - bool "Aspeed AST10X0 Series" + bool select ARM select CPU_CORTEX_M4 select CPU_HAS_FPU diff --git a/soc/arm/aspeed/ast10x0/Kconfig.soc b/soc/arm/aspeed/ast10x0/Kconfig.soc index 844362576259d..e9fa51a891a84 100644 --- a/soc/arm/aspeed/ast10x0/Kconfig.soc +++ b/soc/arm/aspeed/ast10x0/Kconfig.soc @@ -2,14 +2,10 @@ # # Copyright (c) 2021 ASPEED Technology Inc. -choice - prompt "ASPEED AST10X0 Selection" - depends on SOC_SERIES_AST10X0 - config SOC_AST1030 - bool "AST1030" - -endchoice + bool + help + AST1030 config SRAM_NC_SIZE int "noncached SRAM Size in kB" diff --git a/soc/arm/atmel_sam/sam3x/Kconfig.series b/soc/arm/atmel_sam/sam3x/Kconfig.series index a193493a29c22..f67b665471ad6 100644 --- a/soc/arm/atmel_sam/sam3x/Kconfig.series +++ b/soc/arm/atmel_sam/sam3x/Kconfig.series @@ -6,7 +6,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAM3X - bool "Atmel SAM3X MCU" + bool select ARM select CPU_CORTEX_M3 select SOC_FAMILY_SAM diff --git a/soc/arm/atmel_sam/sam3x/Kconfig.soc b/soc/arm/atmel_sam/sam3x/Kconfig.soc index 1e9a203396a30..cbfef7706c271 100644 --- a/soc/arm/atmel_sam/sam3x/Kconfig.soc +++ b/soc/arm/atmel_sam/sam3x/Kconfig.soc @@ -5,21 +5,30 @@ # Copyright (c) 2014-2015 Wind River Systems, Inc. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAM3X MCU Selection" - depends on SOC_SERIES_SAM3X - - config SOC_PART_NUMBER_SAM3X4C - bool "SAM3X4C" - config SOC_PART_NUMBER_SAM3X4E - bool "SAM3X4E" - config SOC_PART_NUMBER_SAM3X8C - bool "SAM3X8C" - config SOC_PART_NUMBER_SAM3X8E - bool "SAM3X8E" - config SOC_PART_NUMBER_SAM3X8H - bool "SAM3X8H" -endchoice +config SOC_PART_NUMBER_SAM3X4C + bool + help + SAM3X4C + +config SOC_PART_NUMBER_SAM3X4E + bool + help + SAM3X4E + +config SOC_PART_NUMBER_SAM3X8C + bool + help + SAM3X8C + +config SOC_PART_NUMBER_SAM3X8E + bool + help + SAM3X8E + +config SOC_PART_NUMBER_SAM3X8H + bool + help + SAM3X8H if SOC_SERIES_SAM3X diff --git a/soc/arm/atmel_sam/sam4e/Kconfig.series b/soc/arm/atmel_sam/sam4e/Kconfig.series index 3d35b821d917a..f2441b2725e88 100644 --- a/soc/arm/atmel_sam/sam4e/Kconfig.series +++ b/soc/arm/atmel_sam/sam4e/Kconfig.series @@ -6,7 +6,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAM4E - bool "Atmel SAM4E MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/atmel_sam/sam4e/Kconfig.soc b/soc/arm/atmel_sam/sam4e/Kconfig.soc index e48e8de017087..b9663bb88f08d 100644 --- a/soc/arm/atmel_sam/sam4e/Kconfig.soc +++ b/soc/arm/atmel_sam/sam4e/Kconfig.soc @@ -5,23 +5,25 @@ # Copyright (c) 2019 Gerson Fernando Budke # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAM4E MCU Selection" - depends on SOC_SERIES_SAM4E - - config SOC_PART_NUMBER_SAM4E16E - bool "SAM4E16E" - - config SOC_PART_NUMBER_SAM4E16C - bool "SAM4E16C" +config SOC_PART_NUMBER_SAM4E16E + bool + help + SAM4E16E - config SOC_PART_NUMBER_SAM4E8E - bool "SAM4E8E" +config SOC_PART_NUMBER_SAM4E16C + bool + help + SAM4E16C - config SOC_PART_NUMBER_SAM4E8C - bool "SAM4E8C" +config SOC_PART_NUMBER_SAM4E8E + bool + help + SAM4E8E -endchoice +config SOC_PART_NUMBER_SAM4E8C + bool + help + SAM4E8C if SOC_SERIES_SAM4E diff --git a/soc/arm/atmel_sam/sam4l/Kconfig.series b/soc/arm/atmel_sam/sam4l/Kconfig.series index 6201d662dc7d0..78711d7a9c856 100644 --- a/soc/arm/atmel_sam/sam4l/Kconfig.series +++ b/soc/arm/atmel_sam/sam4l/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAM4L - bool "Atmel SAM4L MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/atmel_sam/sam4l/Kconfig.soc b/soc/arm/atmel_sam/sam4l/Kconfig.soc index 358cfc76042c1..e3fb1cf27401b 100644 --- a/soc/arm/atmel_sam/sam4l/Kconfig.soc +++ b/soc/arm/atmel_sam/sam4l/Kconfig.soc @@ -1,61 +1,92 @@ # Copyright (c) 2020 Gerson Fernando Budke # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAM4L MCU Selection" - depends on SOC_SERIES_SAM4L - - config SOC_PART_NUMBER_SAM4LS8C - bool "SAM4LS8C" - - config SOC_PART_NUMBER_SAM4LS8B - bool "SAM4LS8B" - - config SOC_PART_NUMBER_SAM4LS8A - bool "SAM4LS8A" - - config SOC_PART_NUMBER_SAM4LS4C - bool "SAM4LS4C" - - config SOC_PART_NUMBER_SAM4LS4B - bool "SAM4LS4B" - - config SOC_PART_NUMBER_SAM4LS4A - bool "SAM4LS4A" - - config SOC_PART_NUMBER_SAM4LS2C - bool "SAM4LS2C" - - config SOC_PART_NUMBER_SAM4LS2B - bool "SAM4LS2B" - - config SOC_PART_NUMBER_SAM4LS2A - bool "SAM4LS2A" - - config SOC_PART_NUMBER_SAM4LC8C - bool "SAM4LC8C" - - config SOC_PART_NUMBER_SAM4LC8B - bool "SAM4LC8B" - - config SOC_PART_NUMBER_SAM4LC8A - bool "SAM4LC8A" - - config SOC_PART_NUMBER_SAM4LC4C - bool "SAM4LC4C" - - config SOC_PART_NUMBER_SAM4LC4B - bool "SAM4LC4B" - - config SOC_PART_NUMBER_SAM4LC4A - bool "SAM4LC4A" - - config SOC_PART_NUMBER_SAM4LC2C - bool "SAM4LC2C" - - config SOC_PART_NUMBER_SAM4LC2B - bool "SAM4LC2B" - - config SOC_PART_NUMBER_SAM4LC2A - bool "SAM4LC2A" -endchoice +config SOC_PART_NUMBER_SAM4LS8C + bool + help + SAM4LS8C + +config SOC_PART_NUMBER_SAM4LS8B + bool + help + SAM4LS8B + +config SOC_PART_NUMBER_SAM4LS8A + bool + help + SAM4LS8A + +config SOC_PART_NUMBER_SAM4LS4C + bool + help + SAM4LS4C + +config SOC_PART_NUMBER_SAM4LS4B + bool + help + SAM4LS4B + +config SOC_PART_NUMBER_SAM4LS4A + bool + help + SAM4LS4A + +config SOC_PART_NUMBER_SAM4LS2C + bool + help + SAM4LS2C + +config SOC_PART_NUMBER_SAM4LS2B + bool + help + SAM4LS2B + +config SOC_PART_NUMBER_SAM4LS2A + bool + help + SAM4LS2A + +config SOC_PART_NUMBER_SAM4LC8C + bool + help + SAM4LC8C + +config SOC_PART_NUMBER_SAM4LC8B + bool + help + SAM4LC8B + +config SOC_PART_NUMBER_SAM4LC8A + bool + help + SAM4LC8A + +config SOC_PART_NUMBER_SAM4LC4C + bool + help + SAM4LC4C + +config SOC_PART_NUMBER_SAM4LC4B + bool + help + SAM4LC4B + +config SOC_PART_NUMBER_SAM4LC4A + bool + help + SAM4LC4A + +config SOC_PART_NUMBER_SAM4LC2C + bool + help + SAM4LC2C + +config SOC_PART_NUMBER_SAM4LC2B + bool + help + SAM4LC2B + +config SOC_PART_NUMBER_SAM4LC2A + bool + help + SAM4LC2A diff --git a/soc/arm/atmel_sam/sam4s/Kconfig.series b/soc/arm/atmel_sam/sam4s/Kconfig.series index c7ea2b88e979b..1d6b7d1225e97 100644 --- a/soc/arm/atmel_sam/sam4s/Kconfig.series +++ b/soc/arm/atmel_sam/sam4s/Kconfig.series @@ -6,7 +6,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAM4S - bool "Atmel SAM4S MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/atmel_sam/sam4s/Kconfig.soc b/soc/arm/atmel_sam/sam4s/Kconfig.soc index c8c9dd9e21e4a..3e5ad9f7f214c 100644 --- a/soc/arm/atmel_sam/sam4s/Kconfig.soc +++ b/soc/arm/atmel_sam/sam4s/Kconfig.soc @@ -4,44 +4,60 @@ # Copyright (c) 2018 Vincent van der Locht # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAM4S MCU Selection" - depends on SOC_SERIES_SAM4S - - config SOC_PART_NUMBER_SAM4S16C - bool "SAM4S16C" - - config SOC_PART_NUMBER_SAM4SA16C - bool "SAM4SA16C" +config SOC_PART_NUMBER_SAM4S16C + bool + help + SAM4S16C - config SOC_PART_NUMBER_SAM4S16B - bool "SAM4S16B" +config SOC_PART_NUMBER_SAM4SA16C + bool + help + SAM4SA16C - config SOC_PART_NUMBER_SAM4S8C - bool "SAM4S8C" +config SOC_PART_NUMBER_SAM4S16B + bool + help + SAM4S16B - config SOC_PART_NUMBER_SAM4S8B - bool "SAM4S8B" +config SOC_PART_NUMBER_SAM4S8C + bool + help + SAM4S8C - config SOC_PART_NUMBER_SAM4S4C - bool "SAM4S4C" +config SOC_PART_NUMBER_SAM4S8B + bool + help + SAM4S8B - config SOC_PART_NUMBER_SAM4S4B - bool "SAM4S4B" +config SOC_PART_NUMBER_SAM4S4C + bool + help + SAM4S4C - config SOC_PART_NUMBER_SAM4S4A - bool "SAM4S4A" +config SOC_PART_NUMBER_SAM4S4B + bool + help + SAM4S4B - config SOC_PART_NUMBER_SAM4S2C - bool "SAM4S2C" +config SOC_PART_NUMBER_SAM4S4A + bool + help + SAM4S4A - config SOC_PART_NUMBER_SAM4S2B - bool "SAM4S2B" +config SOC_PART_NUMBER_SAM4S2C + bool + help + SAM4S2C - config SOC_PART_NUMBER_SAM4S2A - bool "SAM4S2A" +config SOC_PART_NUMBER_SAM4S2B + bool + help + SAM4S2B -endchoice +config SOC_PART_NUMBER_SAM4S2A + bool + help + SAM4S2A if SOC_SERIES_SAM4S diff --git a/soc/arm/atmel_sam/same70/Kconfig.series b/soc/arm/atmel_sam/same70/Kconfig.series index f8f5402ed8b5b..62df433a83766 100644 --- a/soc/arm/atmel_sam/same70/Kconfig.series +++ b/soc/arm/atmel_sam/same70/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAME70 - bool "Atmel SAME70 MCU" + bool select ARM select CPU_CORTEX_M7 select SOC_FAMILY_SAM diff --git a/soc/arm/atmel_sam/same70/Kconfig.soc b/soc/arm/atmel_sam/same70/Kconfig.soc index c396e1e59d725..192608bbca9a2 100644 --- a/soc/arm/atmel_sam/same70/Kconfig.soc +++ b/soc/arm/atmel_sam/same70/Kconfig.soc @@ -3,73 +3,104 @@ # Copyright (c) 2016 Piotr Mienkowski # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAME70 MCU Selection" - depends on SOC_SERIES_SAME70 - - config SOC_PART_NUMBER_SAME70Q21 - bool "SAME70Q21" +config SOC_PART_NUMBER_SAME70Q21 + bool + help + SAME70Q21 - config SOC_PART_NUMBER_SAME70Q20 - bool "SAME70Q20" +config SOC_PART_NUMBER_SAME70Q20 + bool + help + SAME70Q20 - config SOC_PART_NUMBER_SAME70Q19 - bool "SAME70Q19" +config SOC_PART_NUMBER_SAME70Q19 + bool + help + SAME70Q19 - config SOC_PART_NUMBER_SAME70N21 - bool "SAME70N21" +config SOC_PART_NUMBER_SAME70N21 + bool + help + SAME70N21 - config SOC_PART_NUMBER_SAME70N20 - bool "SAME70N20" +config SOC_PART_NUMBER_SAME70N20 + bool + help + SAME70N20 - config SOC_PART_NUMBER_SAME70N19 - bool "SAME70N19" +config SOC_PART_NUMBER_SAME70N19 + bool + help + SAME70N19 - config SOC_PART_NUMBER_SAME70J21 - bool "SAME70J21" +config SOC_PART_NUMBER_SAME70J21 + bool + help + SAME70J21 - config SOC_PART_NUMBER_SAME70J20 - bool "SAME70J20" +config SOC_PART_NUMBER_SAME70J20 + bool + help + SAME70J20 - config SOC_PART_NUMBER_SAME70J19 - bool "SAME70J19" +config SOC_PART_NUMBER_SAME70J19 + bool + help + SAME70J19 - config SOC_PART_NUMBER_SAME70Q21B - bool "SAME70Q21B" - select SOC_ATMEL_SAME70_REVB +config SOC_PART_NUMBER_SAME70Q21B + bool + select SOC_ATMEL_SAME70_REVB + help + SAME70Q21B - config SOC_PART_NUMBER_SAME70Q20B - bool "SAME70Q20B" - select SOC_ATMEL_SAME70_REVB +config SOC_PART_NUMBER_SAME70Q20B + bool + select SOC_ATMEL_SAME70_REVB + help + SAME70Q20B - config SOC_PART_NUMBER_SAME70Q19B - bool "SAME70Q19B" - select SOC_ATMEL_SAME70_REVB +config SOC_PART_NUMBER_SAME70Q19B + bool + select SOC_ATMEL_SAME70_REVB + help + SAME70Q19B - config SOC_PART_NUMBER_SAME70N21B - bool "SAME70N21B" - select SOC_ATMEL_SAME70_REVB +config SOC_PART_NUMBER_SAME70N21B + bool + select SOC_ATMEL_SAME70_REVB + help + SAME70N21B - config SOC_PART_NUMBER_SAME70N20B - bool "SAME70N20B" - select SOC_ATMEL_SAME70_REVB +config SOC_PART_NUMBER_SAME70N20B + bool + select SOC_ATMEL_SAME70_REVB + help + SAME70N20B - config SOC_PART_NUMBER_SAME70N19B - bool "SAME70N19B" - select SOC_ATMEL_SAME70_REVB +config SOC_PART_NUMBER_SAME70N19B + bool + select SOC_ATMEL_SAME70_REVB + help + SAME70N19B - config SOC_PART_NUMBER_SAME70J21B - bool "SAME70J21B" - select SOC_ATMEL_SAME70_REVB +config SOC_PART_NUMBER_SAME70J21B + bool + select SOC_ATMEL_SAME70_REVB + help + SAME70J21B - config SOC_PART_NUMBER_SAME70J20B - bool "SAME70J20B" - select SOC_ATMEL_SAME70_REVB +config SOC_PART_NUMBER_SAME70J20B + bool + select SOC_ATMEL_SAME70_REVB + help + SAME70J20B - config SOC_PART_NUMBER_SAME70J19B - bool "SAME70J19B" - select SOC_ATMEL_SAME70_REVB -endchoice +config SOC_PART_NUMBER_SAME70J19B + bool + select SOC_ATMEL_SAME70_REVB + help + SAME70J19B if SOC_SERIES_SAME70 diff --git a/soc/arm/atmel_sam/samv71/Kconfig.series b/soc/arm/atmel_sam/samv71/Kconfig.series index 5f765fb1dfba6..64eb4c95c1147 100644 --- a/soc/arm/atmel_sam/samv71/Kconfig.series +++ b/soc/arm/atmel_sam/samv71/Kconfig.series @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAMV71 - bool "Atmel SAMV71 MCU" + bool select ARM select CPU_CORTEX_M7 select SOC_FAMILY_SAM diff --git a/soc/arm/atmel_sam/samv71/Kconfig.soc b/soc/arm/atmel_sam/samv71/Kconfig.soc index c8e7d60438c72..90b051788f9c0 100644 --- a/soc/arm/atmel_sam/samv71/Kconfig.soc +++ b/soc/arm/atmel_sam/samv71/Kconfig.soc @@ -4,73 +4,104 @@ # Copyright (c) 2016 Piotr Mienkowski # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAMV71 MCU Selection" - depends on SOC_SERIES_SAMV71 - - config SOC_PART_NUMBER_SAMV71Q21 - bool "SAMV71Q21" +config SOC_PART_NUMBER_SAMV71Q21 + bool + help + SAMV71Q21 - config SOC_PART_NUMBER_SAMV71Q20 - bool "SAMV71Q20" +config SOC_PART_NUMBER_SAMV71Q20 + bool + help + SAMV71Q20 - config SOC_PART_NUMBER_SAMV71Q19 - bool "SAMV71Q19" +config SOC_PART_NUMBER_SAMV71Q19 + bool + help + SAMV71Q19 - config SOC_PART_NUMBER_SAMV71N21 - bool "SAMV71N21" +config SOC_PART_NUMBER_SAMV71N21 + bool + help + SAMV71N21 - config SOC_PART_NUMBER_SAMV71N20 - bool "SAMV71N20" +config SOC_PART_NUMBER_SAMV71N20 + bool + help + SAMV71N20 - config SOC_PART_NUMBER_SAMV71N19 - bool "SAMV71N19" +config SOC_PART_NUMBER_SAMV71N19 + bool + help + SAMV71N19 - config SOC_PART_NUMBER_SAMV71J21 - bool "SAMV71J21" +config SOC_PART_NUMBER_SAMV71J21 + bool + help + SAMV71J21 - config SOC_PART_NUMBER_SAMV71J20 - bool "SAMV71J20" +config SOC_PART_NUMBER_SAMV71J20 + bool + help + SAMV71J20 - config SOC_PART_NUMBER_SAMV71J19 - bool "SAMV71J19" +config SOC_PART_NUMBER_SAMV71J19 + bool + help + SAMV71J19 - config SOC_PART_NUMBER_SAMV71Q21B - bool "SAMV71Q21B" - select SOC_ATMEL_SAMV71_REVB +config SOC_PART_NUMBER_SAMV71Q21B + bool + select SOC_ATMEL_SAMV71_REVB + help + SAMV71Q21B - config SOC_PART_NUMBER_SAMV71Q20B - bool "SAMV71Q20B" - select SOC_ATMEL_SAMV71_REVB +config SOC_PART_NUMBER_SAMV71Q20B + bool + select SOC_ATMEL_SAMV71_REVB + help + SAMV71Q20B - config SOC_PART_NUMBER_SAMV71Q19B - bool "SAMV71Q19B" - select SOC_ATMEL_SAMV71_REVB +config SOC_PART_NUMBER_SAMV71Q19B + bool + select SOC_ATMEL_SAMV71_REVB + help + SAMV71Q19B - config SOC_PART_NUMBER_SAMV71N21B - bool "SAMV71N21B" - select SOC_ATMEL_SAMV71_REVB +config SOC_PART_NUMBER_SAMV71N21B + bool + select SOC_ATMEL_SAMV71_REVB + help + SAMV71N21B - config SOC_PART_NUMBER_SAMV71N20B - bool "SAMV71N20B" - select SOC_ATMEL_SAMV71_REVB +config SOC_PART_NUMBER_SAMV71N20B + bool + select SOC_ATMEL_SAMV71_REVB + help + SAMV71N20B - config SOC_PART_NUMBER_SAMV71N19B - bool "SAMV71N19B" - select SOC_ATMEL_SAMV71_REVB +config SOC_PART_NUMBER_SAMV71N19B + bool + select SOC_ATMEL_SAMV71_REVB + help + SAMV71N19B - config SOC_PART_NUMBER_SAMV71J21B - bool "SAMV71J21B" - select SOC_ATMEL_SAMV71_REVB +config SOC_PART_NUMBER_SAMV71J21B + bool + select SOC_ATMEL_SAMV71_REVB + help + SAMV71J21B - config SOC_PART_NUMBER_SAMV71J20B - bool "SAMV71J20B" - select SOC_ATMEL_SAMV71_REVB +config SOC_PART_NUMBER_SAMV71J20B + bool + select SOC_ATMEL_SAMV71_REVB + help + SAMV71J20B - config SOC_PART_NUMBER_SAMV71J19B - bool "SAMV71J19B" - select SOC_ATMEL_SAMV71_REVB -endchoice +config SOC_PART_NUMBER_SAMV71J19B + bool + select SOC_ATMEL_SAMV71_REVB + help + SAMV71J19B if SOC_SERIES_SAMV71 diff --git a/soc/arm/atmel_sam0/samd20/Kconfig.series b/soc/arm/atmel_sam0/samd20/Kconfig.series index c90e9bb6c75fa..f75e6b7bcfafc 100644 --- a/soc/arm/atmel_sam0/samd20/Kconfig.series +++ b/soc/arm/atmel_sam0/samd20/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAMD20 - bool "Atmel SAMD20 MCU" + bool select ARM select CPU_CORTEX_M0PLUS select SOC_FAMILY_SAM0 diff --git a/soc/arm/atmel_sam0/samd20/Kconfig.soc b/soc/arm/atmel_sam0/samd20/Kconfig.soc index 6cfc12f1f02cb..cccf7639689fd 100644 --- a/soc/arm/atmel_sam0/samd20/Kconfig.soc +++ b/soc/arm/atmel_sam0/samd20/Kconfig.soc @@ -3,59 +3,87 @@ # Copyright (c) 2018 Sean Nyekjaer # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAMD20 MCU Selection" - depends on SOC_SERIES_SAMD20 - config SOC_PART_NUMBER_SAMD20E14 - bool "SAMD20E14" + bool + help + SAMD20E14 config SOC_PART_NUMBER_SAMD20E15 - bool "SAMD20E15" + bool + help + SAMD20E15 config SOC_PART_NUMBER_SAMD20E16 - bool "SAMD20E16" + bool + help + SAMD20E16 config SOC_PART_NUMBER_SAMD20E17 - bool "SAMD20E17" + bool + help + SAMD20E17 config SOC_PART_NUMBER_SAMD20E18 - bool "SAMD20E18" + bool + help + SAMD20E18 config SOC_PART_NUMBER_SAMD20G14 - bool "SAMD20G14" + bool + help + SAMD20G14 config SOC_PART_NUMBER_SAMD20G15 - bool "SAMD20G15" + bool + help + SAMD20G15 config SOC_PART_NUMBER_SAMD20G16 - bool "SAMD20G16" + bool + help + SAMD20G16 config SOC_PART_NUMBER_SAMD20G17 - bool "SAMD20G17" + bool + help + SAMD20G17 config SOC_PART_NUMBER_SAMD20G17U - bool "SAMD20G17U" + bool + help + SAMD20G17U config SOC_PART_NUMBER_SAMD20G18 - bool "SAMD20G18" + bool + help + SAMD20G18 config SOC_PART_NUMBER_SAMD20G18U - bool "SAMD20G18U" + bool + help + SAMD20G18U config SOC_PART_NUMBER_SAMD20J14 - bool "SAMD20J14" + bool + help + SAMD20J14 config SOC_PART_NUMBER_SAMD20J15 - bool "SAMD20J15" + bool + help + SAMD20J15 config SOC_PART_NUMBER_SAMD20J16 - bool "SAMD20J16" + bool + help + SAMD20J16 config SOC_PART_NUMBER_SAMD20J17 - bool "SAMD20J17" + bool + help + SAMD20J17 config SOC_PART_NUMBER_SAMD20J18 - bool "SAMD20J18" - -endchoice + bool + help + SAMD20J18 diff --git a/soc/arm/atmel_sam0/samd21/Kconfig.series b/soc/arm/atmel_sam0/samd21/Kconfig.series index 443f969da9fa1..65e90fac5157d 100644 --- a/soc/arm/atmel_sam0/samd21/Kconfig.series +++ b/soc/arm/atmel_sam0/samd21/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAMD21 - bool "Atmel SAMD21 MCU" + bool select ARM select CPU_CORTEX_M0PLUS select SOC_FAMILY_SAM0 diff --git a/soc/arm/atmel_sam0/samd21/Kconfig.soc b/soc/arm/atmel_sam0/samd21/Kconfig.soc index 51ffa5d6322d8..5ad70e22c62b8 100644 --- a/soc/arm/atmel_sam0/samd21/Kconfig.soc +++ b/soc/arm/atmel_sam0/samd21/Kconfig.soc @@ -3,50 +3,72 @@ # Copyright (c) 2017 Google LLC. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAMD21 MCU Selection" - depends on SOC_SERIES_SAMD21 - config SOC_PART_NUMBER_SAMD21E15A - bool "SAMD21E15A" + bool + help + SAMD21E15A config SOC_PART_NUMBER_SAMD21E16A - bool "SAMD21E16A" + bool + help + SAMD21E16A config SOC_PART_NUMBER_SAMD21E17A - bool "SAMD21E17A" + bool + help + SAMD21E17A config SOC_PART_NUMBER_SAMD21E18A - bool "SAMD21E18A" + bool + help + SAMD21E18A config SOC_PART_NUMBER_SAMD21G15A - bool "SAMD21G15A" + bool + help + SAMD21G15A config SOC_PART_NUMBER_SAMD21G16A - bool "SAMD21G16A" + bool + help + SAMD21G16A config SOC_PART_NUMBER_SAMD21G17A - bool "SAMD21G17A" + bool + help + SAMD21G17A config SOC_PART_NUMBER_SAMD21G17AU - bool "SAMD21G17AU" + bool + help + SAMD21G17AU config SOC_PART_NUMBER_SAMD21G18A - bool "SAMD21G18A" + bool + help + SAMD21G18A config SOC_PART_NUMBER_SAMD21G18AU - bool "SAMD21G18AU" + bool + help + SAMD21G18AU config SOC_PART_NUMBER_SAMD21J15A - bool "SAMD21J15A" + bool + help + SAMD21J15A config SOC_PART_NUMBER_SAMD21J16A - bool "SAMD21J16A" + bool + help + SAMD21J16A config SOC_PART_NUMBER_SAMD21J17A - bool "SAMD21J17A" + bool + help + SAMD21J17A config SOC_PART_NUMBER_SAMD21J18A - bool "SAMD21J18A" - -endchoice + bool + help + SAMD21J18A diff --git a/soc/arm/atmel_sam0/samd51/Kconfig.series b/soc/arm/atmel_sam0/samd51/Kconfig.series index 8eff94a687b8f..05e20e0ca0c1d 100644 --- a/soc/arm/atmel_sam0/samd51/Kconfig.series +++ b/soc/arm/atmel_sam0/samd51/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAMD51 - bool "Atmel SAMD51 MCU" + bool select ARM select CPU_CORTEX_M4 select SOC_FAMILY_SAM0 diff --git a/soc/arm/atmel_sam0/samd51/Kconfig.soc b/soc/arm/atmel_sam0/samd51/Kconfig.soc index 043ccdcab1aef..fb90ded987e6b 100644 --- a/soc/arm/atmel_sam0/samd51/Kconfig.soc +++ b/soc/arm/atmel_sam0/samd51/Kconfig.soc @@ -3,35 +3,47 @@ # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAMD51 MCU Selection" - depends on SOC_SERIES_SAMD51 - config SOC_PART_NUMBER_SAMD51G18A - bool "SAMD51G18A" + bool + help + SAMD51G18A config SOC_PART_NUMBER_SAMD51G19A - bool "SAMD51G19A" + bool + help + SAMD51G19A config SOC_PART_NUMBER_SAMD51J18A - bool "SAMD51J18A" + bool + help + SAMD51J18A config SOC_PART_NUMBER_SAMD51J19A - bool "SAMD51J19A" + bool + help + SAMD51J19A config SOC_PART_NUMBER_SAMD51J20A - bool "SAMD51J20A" + bool + help + SAMD51J20A config SOC_PART_NUMBER_SAMD51N19A - bool "SAMD51N19A" + bool + help + SAMD51N19A config SOC_PART_NUMBER_SAMD51N20A - bool "SAMD51N20A" + bool + help + SAMD51N20A config SOC_PART_NUMBER_SAMD51P19A - bool "SAMD51P19A" + bool + help + SAMD51P19A config SOC_PART_NUMBER_SAMD51P20A - bool "SAMD51P20A" - -endchoice + bool + help + SAMD51P20A diff --git a/soc/arm/atmel_sam0/same51/Kconfig.series b/soc/arm/atmel_sam0/same51/Kconfig.series index 44d20c4b85a8b..e87bc1a6fd539 100644 --- a/soc/arm/atmel_sam0/same51/Kconfig.series +++ b/soc/arm/atmel_sam0/same51/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAME51 - bool "Atmel SAME51 MCU" + bool select ARM select CPU_CORTEX_M4 select SOC_FAMILY_SAM0 diff --git a/soc/arm/atmel_sam0/same51/Kconfig.soc b/soc/arm/atmel_sam0/same51/Kconfig.soc index 08b3db89456fe..05a954a6e8275 100644 --- a/soc/arm/atmel_sam0/same51/Kconfig.soc +++ b/soc/arm/atmel_sam0/same51/Kconfig.soc @@ -3,23 +3,27 @@ # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAME51 MCU Selection" - depends on SOC_SERIES_SAME51 - config SOC_PART_NUMBER_SAME51J18A - bool "SAME51J18A" + bool + help + SAME51J18A config SOC_PART_NUMBER_SAME51J19A - bool "SAME51J19A" + bool + help + SAME51J19A config SOC_PART_NUMBER_SAME51J20A - bool "SAME51J20A" + bool + help + SAME51J20A config SOC_PART_NUMBER_SAME51N19A - bool "SAME51N19A" + bool + help + SAME51N19A config SOC_PART_NUMBER_SAME51N20A - bool "SAME51N20A" - -endchoice + bool + help + SAME51N20A diff --git a/soc/arm/atmel_sam0/same53/Kconfig.series b/soc/arm/atmel_sam0/same53/Kconfig.series index fa15d190ff4eb..bba0a2b0a7949 100644 --- a/soc/arm/atmel_sam0/same53/Kconfig.series +++ b/soc/arm/atmel_sam0/same53/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAME53 - bool "Atmel SAME53 MCU" + bool select ARM select CPU_CORTEX_M4 select SOC_FAMILY_SAM0 diff --git a/soc/arm/atmel_sam0/same53/Kconfig.soc b/soc/arm/atmel_sam0/same53/Kconfig.soc index f59797204fee4..5bbd59faaf41e 100644 --- a/soc/arm/atmel_sam0/same53/Kconfig.soc +++ b/soc/arm/atmel_sam0/same53/Kconfig.soc @@ -3,23 +3,27 @@ # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAME53 MCU Selection" - depends on SOC_SERIES_SAME53 - config SOC_PART_NUMBER_SAME53J18A - bool "SAME53J18A" + bool + help + SAME53J18A config SOC_PART_NUMBER_SAME53J19A - bool "SAME53J19A" + bool + help + SAME53J19A config SOC_PART_NUMBER_SAME53J20A - bool "SAME53J20A" + bool + help + SAME53J20A config SOC_PART_NUMBER_SAME53N19A - bool "SAME53N19A" + bool + help + SAME53N19A config SOC_PART_NUMBER_SAME53N20A - bool "SAME53N20A" - -endchoice + bool + help + SAME53N20A diff --git a/soc/arm/atmel_sam0/same54/Kconfig.series b/soc/arm/atmel_sam0/same54/Kconfig.series index ab321bdd2686b..4ad2c2e83528c 100644 --- a/soc/arm/atmel_sam0/same54/Kconfig.series +++ b/soc/arm/atmel_sam0/same54/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAME54 - bool "Atmel SAME54 MCU" + bool select ARM select CPU_CORTEX_M4 select SOC_FAMILY_SAM0 diff --git a/soc/arm/atmel_sam0/same54/Kconfig.soc b/soc/arm/atmel_sam0/same54/Kconfig.soc index 35db63eab805a..e5eaf958be9d5 100644 --- a/soc/arm/atmel_sam0/same54/Kconfig.soc +++ b/soc/arm/atmel_sam0/same54/Kconfig.soc @@ -3,20 +3,22 @@ # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAME54 MCU Selection" - depends on SOC_SERIES_SAME54 - config SOC_PART_NUMBER_SAME54N19A - bool "SAME54N19A" + bool + help + SAME54N19A config SOC_PART_NUMBER_SAME54N20A - bool "SAME54N20A" + bool + help + SAME54N20A config SOC_PART_NUMBER_SAME54P19A - bool "SAME54P19A" + bool + help + SAME54P19A config SOC_PART_NUMBER_SAME54P20A - bool "SAME54P20A" - -endchoice + bool + help + SAME54P20A diff --git a/soc/arm/atmel_sam0/saml21/Kconfig.series b/soc/arm/atmel_sam0/saml21/Kconfig.series index 57ec9b5558eeb..514c4cb209f20 100644 --- a/soc/arm/atmel_sam0/saml21/Kconfig.series +++ b/soc/arm/atmel_sam0/saml21/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAML21 - bool "Atmel SAML21 MCU" + bool select ARM select CPU_CORTEX_M0PLUS select SOC_FAMILY_SAM0 diff --git a/soc/arm/atmel_sam0/saml21/Kconfig.soc b/soc/arm/atmel_sam0/saml21/Kconfig.soc index f6ab97367a93d..dba17f2f3262a 100644 --- a/soc/arm/atmel_sam0/saml21/Kconfig.soc +++ b/soc/arm/atmel_sam0/saml21/Kconfig.soc @@ -3,44 +3,62 @@ # Copyright (c) 2021 Argentum Systems Ltd. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAML21 MCU Selection" - depends on SOC_SERIES_SAML21 - config SOC_PART_NUMBER_SAML21E15B - bool "SAML21E15B" + bool + help + SAML21E15B config SOC_PART_NUMBER_SAML21E16B - bool "SAML21E16B" + bool + help + SAML21E16B config SOC_PART_NUMBER_SAML21E17B - bool "SAML21E17B" + bool + help + SAML21E17B config SOC_PART_NUMBER_SAML21E18B - bool "SAML21E18B" + bool + help + SAML21E18B config SOC_PART_NUMBER_SAML21G16B - bool "SAML21G16B" + bool + help + SAML21G16B config SOC_PART_NUMBER_SAML21G17B - bool "SAML21G17B" + bool + help + SAML21G17B config SOC_PART_NUMBER_SAML21G18B - bool "SAML21G18B" + bool + help + SAML21G18B config SOC_PART_NUMBER_SAML21J16B - bool "SAML21J16B" + bool + help + SAML21J16B config SOC_PART_NUMBER_SAML21J17B - bool "SAML21J17B" + bool + help + SAML21J17B config SOC_PART_NUMBER_SAML21J17BU - bool "SAML21J17BU" + bool + help + SAML21J17BU config SOC_PART_NUMBER_SAML21J18B - bool "SAML21J18B" + bool + help + SAML21J18B config SOC_PART_NUMBER_SAML21J18BU - bool "SAML21J18BU" - -endchoice + bool + help + SAML21J18BU diff --git a/soc/arm/atmel_sam0/samr21/Kconfig.series b/soc/arm/atmel_sam0/samr21/Kconfig.series index 55920618dc534..cb56b86bd9e8d 100644 --- a/soc/arm/atmel_sam0/samr21/Kconfig.series +++ b/soc/arm/atmel_sam0/samr21/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAMR21 - bool "Atmel SAMR21 MCU" + bool select ARM select CPU_CORTEX_M0PLUS select SOC_FAMILY_SAM0 diff --git a/soc/arm/atmel_sam0/samr21/Kconfig.soc b/soc/arm/atmel_sam0/samr21/Kconfig.soc index 98fb2781818ac..d38d3dd2f3c8c 100644 --- a/soc/arm/atmel_sam0/samr21/Kconfig.soc +++ b/soc/arm/atmel_sam0/samr21/Kconfig.soc @@ -3,29 +3,37 @@ # Copyright (c) 2017 Google LLC. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAMR21 MCU Selection" - depends on SOC_SERIES_SAMR21 - config SOC_PART_NUMBER_SAMR21E16A - bool "SAMR21E16A" + bool + help + SAMR21E16A config SOC_PART_NUMBER_SAMR21E17A - bool "SAMR21E17A" + bool + help + SAMR21E17A config SOC_PART_NUMBER_SAMR21E18A - bool "SAMR21E18A" + bool + help + SAMR21E18A config SOC_PART_NUMBER_SAMR21E19A - bool "SAMR21E19A" + bool + help + SAMR21E19A config SOC_PART_NUMBER_SAMR21G16A - bool "SAMR21G16A" + bool + help + SAMR21G16A config SOC_PART_NUMBER_SAMR21G17A - bool "SAMR21G17A" + bool + help + SAMR21G17A config SOC_PART_NUMBER_SAMR21G18A - bool "SAMR21G18A" - -endchoice + bool + help + SAMR21G18A diff --git a/soc/arm/atmel_sam0/samr34/Kconfig.series b/soc/arm/atmel_sam0/samr34/Kconfig.series index 8e6de6c6fa8bd..0c38399d6bf10 100644 --- a/soc/arm/atmel_sam0/samr34/Kconfig.series +++ b/soc/arm/atmel_sam0/samr34/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAMR34 - bool "Atmel SAMR34 MCU" + bool select ARM select CPU_CORTEX_M0PLUS select SOC_FAMILY_SAM0 diff --git a/soc/arm/atmel_sam0/samr34/Kconfig.soc b/soc/arm/atmel_sam0/samr34/Kconfig.soc index 088d56b710913..006f51402cb81 100644 --- a/soc/arm/atmel_sam0/samr34/Kconfig.soc +++ b/soc/arm/atmel_sam0/samr34/Kconfig.soc @@ -3,17 +3,17 @@ # Copyright (c) 2021 Argentum Systems Ltd. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAMR34 MCU Selection" - depends on SOC_SERIES_SAMR34 - config SOC_PART_NUMBER_SAMR34J16B - bool "SAMR34J16B" + bool + help + SAMR34J16B config SOC_PART_NUMBER_SAMR34J17B - bool "SAMR34J17B" + bool + help + SAMR34J17B config SOC_PART_NUMBER_SAMR34J18B - bool "SAMR34J18B" - -endchoice + bool + help + SAMR34J18B diff --git a/soc/arm/atmel_sam0/samr35/Kconfig.series b/soc/arm/atmel_sam0/samr35/Kconfig.series index cc6aef2200fe2..172a725c1dd75 100644 --- a/soc/arm/atmel_sam0/samr35/Kconfig.series +++ b/soc/arm/atmel_sam0/samr35/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_SAMR35 - bool "Atmel SAMR35 MCU" + bool select ARM select CPU_CORTEX_M0PLUS select SOC_FAMILY_SAM0 diff --git a/soc/arm/atmel_sam0/samr35/Kconfig.soc b/soc/arm/atmel_sam0/samr35/Kconfig.soc index ceb95243806ee..8efaa2ceac3a1 100644 --- a/soc/arm/atmel_sam0/samr35/Kconfig.soc +++ b/soc/arm/atmel_sam0/samr35/Kconfig.soc @@ -3,17 +3,17 @@ # Copyright (c) 2021 Argentum Systems Ltd. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Atmel SAM35 MCU Selection" - depends on SOC_SERIES_SAMR35 - config SOC_PART_NUMBER_SAMR35J16B - bool "SAMR35J16B" + bool + help + SAMR35J16B config SOC_PART_NUMBER_SAMR35J17B - bool "SAMR35J17B" + bool + help + SAMR35J17B config SOC_PART_NUMBER_SAMR35J18B - bool "SAMR35J18B" - -endchoice + bool + help + SAMR35J18B diff --git a/soc/arm/bcm_vk/valkyrie/Kconfig.series b/soc/arm/bcm_vk/valkyrie/Kconfig.series index ca4542b5e89ba..53324bdfba5e0 100644 --- a/soc/arm/bcm_vk/valkyrie/Kconfig.series +++ b/soc/arm/bcm_vk/valkyrie/Kconfig.series @@ -4,7 +4,7 @@ # config SOC_SERIES_VALKYRIE - bool "Broadcom Valkyrie Series" + bool select ARM select CPU_CORTEX_M7 select SOC_FAMILY_BCMVK diff --git a/soc/arm/bcm_vk/valkyrie/Kconfig.soc b/soc/arm/bcm_vk/valkyrie/Kconfig.soc index 76f3ac196eef1..754066e66ea4e 100644 --- a/soc/arm/bcm_vk/valkyrie/Kconfig.soc +++ b/soc/arm/bcm_vk/valkyrie/Kconfig.soc @@ -3,10 +3,7 @@ # Copyright 2020 Broadcom. # -choice -prompt "Broadcom Valkyrie SoC" -depends on SOC_SERIES_VALKYRIE - config SOC_BCM58400 - bool "Broadcom BCM58400" -endchoice + bool + help + Broadcom BCM58400 diff --git a/soc/arm/bcm_vk/viper/Kconfig.series b/soc/arm/bcm_vk/viper/Kconfig.series index 90a9c162e2f25..bf0194bcc39d3 100644 --- a/soc/arm/bcm_vk/viper/Kconfig.series +++ b/soc/arm/bcm_vk/viper/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_VIPER - bool "Broadcom Viper Series" + bool select ARM select SOC_FAMILY_BCMVK help diff --git a/soc/arm/bcm_vk/viper/Kconfig.soc b/soc/arm/bcm_vk/viper/Kconfig.soc index b72e9dd736a80..7d8dd3a9e259f 100644 --- a/soc/arm/bcm_vk/viper/Kconfig.soc +++ b/soc/arm/bcm_vk/viper/Kconfig.soc @@ -1,14 +1,10 @@ # Copyright 2020 Broadcom # SPDX-License-Identifier: Apache-2.0 -choice -prompt "Broadcom Viper SoC" -depends on SOC_SERIES_VIPER - config SOC_BCM58402_M7 - bool "Broadcom BCM58402 M7" + bool select CPU_CORTEX_M7 select CPU_CORTEX_M_HAS_SYSTICK select CPU_HAS_ARM_MPU - -endchoice + help + Broadcom BCM58402 M7 diff --git a/soc/arm/cypress/Kconfig b/soc/arm/cypress/Kconfig index 352c66b4e7616..51ae3fd23cfbf 100644 --- a/soc/arm/cypress/Kconfig +++ b/soc/arm/cypress/Kconfig @@ -2,24 +2,21 @@ # Copyright (c) 2020, ATL Electronics # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Cypress PSoC6 MCU Selection" - depends on SOC_SERIES_PSOC62 || \ - SOC_SERIES_PSOC63 - config SOC_PSOC6_M0 - bool "SOC_PSOC6_M0" + bool select CPU_CORTEX_M0PLUS select CPU_CORTEX_M_HAS_SYSTICK select CPU_CORTEX_M_HAS_VTOR + help + SOC_PSOC6_M0 config SOC_PSOC6_M4 - bool "SOC_PSOC6_M4" + bool select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT select CPU_CORTEX_M_HAS_SYSTICK - -endchoice + help + SOC_PSOC6_M4 config SOC_PSOC6_M0_ENABLES_M4 bool "Dual-core support [activate Cortex-M4]" diff --git a/soc/arm/cypress/psoc6/Kconfig.series b/soc/arm/cypress/psoc6/Kconfig.series index 35eb08685e12d..bf1665980766d 100644 --- a/soc/arm/cypress/psoc6/Kconfig.series +++ b/soc/arm/cypress/psoc6/Kconfig.series @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_PSOC62 - bool "Cypress PSoC6 series MCU - Standard" + bool select ARM select SOC_FAMILY_PSOC6 select HAS_CYPRESS_DRIVERS @@ -13,7 +13,7 @@ config SOC_SERIES_PSOC62 Enable support for Cypress PSoC6 MCU series config SOC_SERIES_PSOC63 - bool "Cypress PSoC6 series MCU - Bluetooth Low Energy" + bool select ARM select SOC_FAMILY_PSOC6 select HAS_CYPRESS_DRIVERS diff --git a/soc/arm/cypress/psoc6/Kconfig.soc b/soc/arm/cypress/psoc6/Kconfig.soc index 49db89979e017..6dc82e8aa544f 100644 --- a/soc/arm/cypress/psoc6/Kconfig.soc +++ b/soc/arm/cypress/psoc6/Kconfig.soc @@ -4,17 +4,14 @@ # Copyright (c) 2020, ATL Electronics # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Cypress PSoC6 MCU Selection" - depends on SOC_SERIES_PSOC62 || \ - SOC_SERIES_PSOC63 - config SOC_PART_NUMBER_CY8C6247BZI_D54 - bool "CY8C6247BZI_D54" + bool depends on SOC_SERIES_PSOC62 + help + CY8C6247BZI_D54 config SOC_PART_NUMBER_CY8C6347BZI_BLD53 - bool "CY8C6347BZI_BLD53" + bool depends on SOC_SERIES_PSOC63 - -endchoice + help + CY8C6347BZI_BLD53 diff --git a/soc/arm/gigadevice/gd32e10x/Kconfig.series b/soc/arm/gigadevice/gd32e10x/Kconfig.series index ac0a5059fca88..b30ac8bf9007b 100644 --- a/soc/arm/gigadevice/gd32e10x/Kconfig.series +++ b/soc/arm/gigadevice/gd32e10x/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32E10X - bool "GigaDevice GD32E10X series Cortex-M4F MCU" + bool select ARM select CPU_HAS_FPU select CPU_CORTEX_M4 diff --git a/soc/arm/gigadevice/gd32e10x/Kconfig.soc b/soc/arm/gigadevice/gd32e10x/Kconfig.soc index 42e6cd14d9908..0aa9cfcfa9873 100644 --- a/soc/arm/gigadevice/gd32e10x/Kconfig.soc +++ b/soc/arm/gigadevice/gd32e10x/Kconfig.soc @@ -1,10 +1,7 @@ # Copyright (c) 2021 YuLong Yao # SPDX-License-Identifier: Apache-2.0 -choice - prompt "GigaDevice GD32E103 MCU Selection" - depends on SOC_SERIES_GD32E10X - - config SOC_GD32E103 - bool "gd32e103" -endchoice +config SOC_GD32E103 + bool + help + gd32e103 diff --git a/soc/arm/gigadevice/gd32e50x/Kconfig.series b/soc/arm/gigadevice/gd32e50x/Kconfig.series index db29cdb0d8678..074d5fa3c9250 100644 --- a/soc/arm/gigadevice/gd32e50x/Kconfig.series +++ b/soc/arm/gigadevice/gd32e50x/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32E50X - bool "GigaDevice GD32E50X series Cortex-M33 MCU" + bool select ARM select CPU_HAS_ARM_MPU select CPU_HAS_FPU diff --git a/soc/arm/gigadevice/gd32e50x/Kconfig.soc b/soc/arm/gigadevice/gd32e50x/Kconfig.soc index 98494f0dab48c..f9c628cbc1084 100644 --- a/soc/arm/gigadevice/gd32e50x/Kconfig.soc +++ b/soc/arm/gigadevice/gd32e50x/Kconfig.soc @@ -1,11 +1,7 @@ # Copyright (c) 2022, Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "GigaDevice GD32E50X MCU Selection" - depends on SOC_SERIES_GD32E50X - - config SOC_GD32E507 - bool "gd32e507" - -endchoice +config SOC_GD32E507 + bool + help + gd32e507 diff --git a/soc/arm/gigadevice/gd32f3x0/Kconfig.series b/soc/arm/gigadevice/gd32f3x0/Kconfig.series index 19df5f23bf3d3..407e6548d51ce 100644 --- a/soc/arm/gigadevice/gd32f3x0/Kconfig.series +++ b/soc/arm/gigadevice/gd32f3x0/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32F3X0 - bool "GigaDevice GD32F3X0 series Cortex-M4F MCU" + bool select ARM select CPU_HAS_FPU select CPU_CORTEX_M4 diff --git a/soc/arm/gigadevice/gd32f3x0/Kconfig.soc b/soc/arm/gigadevice/gd32f3x0/Kconfig.soc index 1acbaaf4ae0a4..175f5f4477acc 100644 --- a/soc/arm/gigadevice/gd32f3x0/Kconfig.soc +++ b/soc/arm/gigadevice/gd32f3x0/Kconfig.soc @@ -1,10 +1,7 @@ # Copyright (c) 2021 BrainCo Inc. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "GigaDevice GD32F3X0 MCU Selection" - depends on SOC_SERIES_GD32F3X0 - - config SOC_GD32F350 - bool "gd32f350" -endchoice +config SOC_GD32F350 + bool + help + gd32f350 diff --git a/soc/arm/gigadevice/gd32f403/Kconfig.series b/soc/arm/gigadevice/gd32f403/Kconfig.series index c96e1c731dde6..470122b665794 100644 --- a/soc/arm/gigadevice/gd32f403/Kconfig.series +++ b/soc/arm/gigadevice/gd32f403/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32F403 - bool "GigaDevice GD32F403 series Cortex-M4F MCU" + bool select ARM select CPU_HAS_ARM_MPU select CPU_HAS_FPU diff --git a/soc/arm/gigadevice/gd32f403/Kconfig.soc b/soc/arm/gigadevice/gd32f403/Kconfig.soc index 17e960ce40ca6..5080642eb1ec5 100644 --- a/soc/arm/gigadevice/gd32f403/Kconfig.soc +++ b/soc/arm/gigadevice/gd32f403/Kconfig.soc @@ -1,11 +1,7 @@ # Copyright (c) 2021, ATL Electronics # SPDX-License-Identifier: Apache-2.0 -choice - prompt "GigaDevice GD32F403 MCU Selection" - depends on SOC_SERIES_GD32F403 - - config SOC_GD32F403 - bool "gd32f403" - -endchoice +config SOC_GD32F403 + bool + help + gd32f403 diff --git a/soc/arm/gigadevice/gd32f4xx/Kconfig.series b/soc/arm/gigadevice/gd32f4xx/Kconfig.series index 722666d91a78f..f4e03e8844a76 100644 --- a/soc/arm/gigadevice/gd32f4xx/Kconfig.series +++ b/soc/arm/gigadevice/gd32f4xx/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32F4XX - bool "GigaDevice GD32F4XX series Cortex-M4F MCU" + bool select ARM select CPU_HAS_ARM_MPU select CPU_HAS_FPU diff --git a/soc/arm/gigadevice/gd32f4xx/Kconfig.soc b/soc/arm/gigadevice/gd32f4xx/Kconfig.soc index d0cfda3817c5f..b152879253ff8 100644 --- a/soc/arm/gigadevice/gd32f4xx/Kconfig.soc +++ b/soc/arm/gigadevice/gd32f4xx/Kconfig.soc @@ -2,20 +2,22 @@ # Copyright (c) 2022, Rtone. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "GigaDevice GD32F4XX MCU Selection" - depends on SOC_SERIES_GD32F4XX +config SOC_GD32F405 + bool + help + gd32f405 - config SOC_GD32F405 - bool "gd32f405" +config SOC_GD32F407 + bool + help + gd32f407 - config SOC_GD32F407 - bool "gd32f407" +config SOC_GD32F450 + bool + help + gd32f450 - config SOC_GD32F450 - bool "gd32f450" - - config SOC_GD32F470 - bool "gd32f470" - -endchoice +config SOC_GD32F470 + bool + help + gd32f470 diff --git a/soc/arm/infineon_xmc/4xxx/Kconfig.series b/soc/arm/infineon_xmc/4xxx/Kconfig.series index f00639822234d..b378768ac54ed 100644 --- a/soc/arm/infineon_xmc/4xxx/Kconfig.series +++ b/soc/arm/infineon_xmc/4xxx/Kconfig.series @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_XMC_4XXX - bool "XMC 4xxx Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/infineon_xmc/4xxx/Kconfig.soc b/soc/arm/infineon_xmc/4xxx/Kconfig.soc index ede659c83ee7f..cde5727ef72be 100644 --- a/soc/arm/infineon_xmc/4xxx/Kconfig.soc +++ b/soc/arm/infineon_xmc/4xxx/Kconfig.soc @@ -4,15 +4,11 @@ # Author: Parthiban Nallathambi # SPDX-License-Identifier: Apache-2.0 -choice - prompt "XMC 4xxx MCU Selection" - depends on SOC_SERIES_XMC_4XXX - config SOC_XMC4500 - bool "SOC_XMC4500" + bool select HAS_XMCLIB - -endchoice + help + SOC_XMC4500 if SOC_SERIES_XMC_4XXX diff --git a/soc/arm/intel_socfpga_std/cyclonev/Kconfig.series b/soc/arm/intel_socfpga_std/cyclonev/Kconfig.series index 304788d0ee94d..b35e46b4aec05 100644 --- a/soc/arm/intel_socfpga_std/cyclonev/Kconfig.series +++ b/soc/arm/intel_socfpga_std/cyclonev/Kconfig.series @@ -4,7 +4,7 @@ # Adding configuration options for Cyclone V SoC FPGA config SOC_SERIES_CYCLONE5 - bool "Intel SoC FPGA Cyclone5 Series" + bool select ARM select CPU_CORTEX_A9 select GIC_V1 diff --git a/soc/arm/intel_socfpga_std/cyclonev/Kconfig.soc b/soc/arm/intel_socfpga_std/cyclonev/Kconfig.soc index 8851d9e17b225..eaf49635475ae 100644 --- a/soc/arm/intel_socfpga_std/cyclonev/Kconfig.soc +++ b/soc/arm/intel_socfpga_std/cyclonev/Kconfig.soc @@ -3,10 +3,7 @@ # Description: # Adding support to Cyclone V SoC FPGA -choice - prompt "Intel SoC FPGA Cyclone5" - depends on SOC_SERIES_CYCLONE5 - config SOC_CYCLONE5 - bool "Intel SoC FPGA Cyclone5" -endchoice + bool + help + Intel SoC FPGA Cyclone5 diff --git a/soc/arm/microchip_mec/mec1501/Kconfig.series b/soc/arm/microchip_mec/mec1501/Kconfig.series index 83683877bf6a0..bbd39319be1c2 100644 --- a/soc/arm/microchip_mec/mec1501/Kconfig.series +++ b/soc/arm/microchip_mec/mec1501/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_MEC1501X - bool "Microchip MEC1501X Series" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/microchip_mec/mec1501/Kconfig.soc b/soc/arm/microchip_mec/mec1501/Kconfig.soc index 6425a651b0945..b50695b7bda81 100644 --- a/soc/arm/microchip_mec/mec1501/Kconfig.soc +++ b/soc/arm/microchip_mec/mec1501/Kconfig.soc @@ -3,15 +3,11 @@ # Copyright (c) 2018 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -choice - prompt "MEC1501 Selection" - depends on SOC_SERIES_MEC1501X - config SOC_MEC1501_HSZ - bool "MEC1501_HSZ" + bool select HAS_MEC_HAL - -endchoice + help + MEC1501_HSZ config RTOS_TIMER bool "MEC1501 RTOS timer" diff --git a/soc/arm/microchip_mec/mec1701/Kconfig.series b/soc/arm/microchip_mec/mec1701/Kconfig.series index 51d49ce2d32df..f1110e5af0eed 100644 --- a/soc/arm/microchip_mec/mec1701/Kconfig.series +++ b/soc/arm/microchip_mec/mec1701/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_MEC1701X - bool "Microchip MEC1701X Series" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/microchip_mec/mec1701/Kconfig.soc b/soc/arm/microchip_mec/mec1701/Kconfig.soc index 9464f49f44eaa..f7f996a75fc27 100644 --- a/soc/arm/microchip_mec/mec1701/Kconfig.soc +++ b/soc/arm/microchip_mec/mec1701/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2018 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -choice - prompt "MEC1701 Selection" - depends on SOC_SERIES_MEC1701X - config SOC_MEC1701_QSZ - bool "MEC1701_QSZ" + bool select HAS_MEC_HAL - -endchoice + help + MEC1701_QSZ diff --git a/soc/arm/microchip_mec/mec172x/Kconfig.series b/soc/arm/microchip_mec/mec172x/Kconfig.series index 77f7d4023c108..b9393e53377e8 100644 --- a/soc/arm/microchip_mec/mec172x/Kconfig.series +++ b/soc/arm/microchip_mec/mec172x/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_MEC172X - bool "Microchip MEC172X Series" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/microchip_mec/mec172x/Kconfig.soc b/soc/arm/microchip_mec/mec172x/Kconfig.soc index d74993b4466ac..19e94bfdad83c 100644 --- a/soc/arm/microchip_mec/mec172x/Kconfig.soc +++ b/soc/arm/microchip_mec/mec172x/Kconfig.soc @@ -3,14 +3,10 @@ # Copyright (c) 2021 Microchip Technology Inc. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "MEC172x Selection" - depends on SOC_SERIES_MEC172X - config SOC_MEC172X_NSZ - bool "MEC172X_NSZ" - -endchoice + bool + help + MEC172X_NSZ config RTOS_TIMER bool "MEC172x RTOS Timer(32KHz) as kernel timer" diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.series b/soc/arm/nordic_nrf/nrf51/Kconfig.series index a09a8210fe134..02e7bb4dbc571 100644 --- a/soc/arm/nordic_nrf/nrf51/Kconfig.series +++ b/soc/arm/nordic_nrf/nrf51/Kconfig.series @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_NRF51X - bool "Nordic Semiconductor nRF51 series MCU" + bool select ARM select CPU_CORTEX_M0 select SOC_FAMILY_NRF diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.soc b/soc/arm/nordic_nrf/nrf51/Kconfig.soc index aa42e2a729ad2..e1b156da80997 100644 --- a/soc/arm/nordic_nrf/nrf51/Kconfig.soc +++ b/soc/arm/nordic_nrf/nrf51/Kconfig.soc @@ -3,17 +3,17 @@ # Copyright (c) 2016 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -choice - prompt "nRF51x MCU Selection" - depends on SOC_SERIES_NRF51X - config SOC_NRF51822_QFAA - bool "NRF51822_QFAA" + bool + help + NRF51822_QFAA config SOC_NRF51822_QFAB - bool "NRF51822_QFAB" + bool + help + NRF51822_QFAB config SOC_NRF51822_QFAC - bool "NRF51822_QFAC" - -endchoice + bool + help + NRF51822_QFAC diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.series b/soc/arm/nordic_nrf/nrf52/Kconfig.series index f4d3a6f407a86..3f2346d7e09ec 100644 --- a/soc/arm/nordic_nrf/nrf52/Kconfig.series +++ b/soc/arm/nordic_nrf/nrf52/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_NRF52X - bool "Nordic Semiconductor nRF52 series MCU" + bool select ARM select SOC_COMPATIBLE_NRF52X select CPU_CORTEX_M4 diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.soc b/soc/arm/nordic_nrf/nrf52/Kconfig.soc index cc0d2d8119708..b1d52c25b4517 100644 --- a/soc/arm/nordic_nrf/nrf52/Kconfig.soc +++ b/soc/arm/nordic_nrf/nrf52/Kconfig.soc @@ -38,47 +38,59 @@ config SOC_NRF52840 select CPU_CORTEX_M_HAS_DWT select CPU_HAS_FPU -choice - prompt "nRF52x MCU Selection" - depends on SOC_SERIES_NRF52X - config SOC_NRF52805_CAAA - bool "NRF52805_CAAA" + bool select SOC_NRF52805 + help + NRF52805_CAAA config SOC_NRF52810_QFAA - bool "NRF52810_QFAA" + bool select SOC_NRF52810 + help + NRF52810_QFAA config SOC_NRF52811_QFAA - bool "NRF52811_QFAA" + bool select SOC_NRF52811 + help + NRF52811_QFAA config SOC_NRF52820_QDAA - bool "NRF52820_QDAA" + bool select SOC_NRF52820 + help + NRF52820_QDAA config SOC_NRF52832_CIAA - bool "NRF52832_CIAA" + bool select SOC_NRF52832 + help + NRF52832_CIAA config SOC_NRF52832_QFAA - bool "NRF52832_QFAA" + bool select SOC_NRF52832 + help + NRF52832_QFAA config SOC_NRF52832_QFAB - bool "NRF52832_QFAB" + bool select SOC_NRF52832 + help + NRF52832_QFAB config SOC_NRF52833_QIAA - bool "NRF52833_QIAA" + bool select SOC_NRF52833 + help + NRF52833_QIAA config SOC_NRF52840_QIAA - bool "NRF52840_QIAA" + bool select SOC_NRF52840 - -endchoice + help + NRF52840_QIAA config SOC_DCDC_NRF52X bool diff --git a/soc/arm/nordic_nrf/nrf53/Kconfig.series b/soc/arm/nordic_nrf/nrf53/Kconfig.series index da82e8d68aaa3..7acde7902aca4 100644 --- a/soc/arm/nordic_nrf/nrf53/Kconfig.series +++ b/soc/arm/nordic_nrf/nrf53/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_NRF53X - bool "Nordic Semiconductor nRF53 series MCU" + bool select ARM select CPU_CORTEX_M33 select CPU_CORTEX_M_HAS_DWT @@ -16,4 +16,4 @@ config SOC_SERIES_NRF53X select HAS_SEGGER_RTT select HAS_SWO help - Enable support for NRF53 MCU series + Enable support for NRF53 MCU series diff --git a/soc/arm/nordic_nrf/nrf53/Kconfig.soc b/soc/arm/nordic_nrf/nrf53/Kconfig.soc index a27f807ee2ec0..aacc215ae8b24 100644 --- a/soc/arm/nordic_nrf/nrf53/Kconfig.soc +++ b/soc/arm/nordic_nrf/nrf53/Kconfig.soc @@ -14,19 +14,17 @@ config SOC_NRF5340_CPUNET bool select HAS_NO_PM -choice - prompt "nRF53x MCU Selection" - config SOC_NRF5340_CPUAPP_QKAA - bool "NRF5340_CPUAPP_QKAA" + bool select SOC_NRF5340_CPUAPP + help + NRF5340_CPUAPP_QKAA config SOC_NRF5340_CPUNET_QKAA - bool "NRF5340_CPUNET_QKAA" + bool select SOC_NRF5340_CPUNET - -endchoice - + help + NRF5340_CPUNET_QKAA if SOC_NRF5340_CPUAPP diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.series b/soc/arm/nordic_nrf/nrf91/Kconfig.series index c68c080a16379..bde0b480e3263 100644 --- a/soc/arm/nordic_nrf/nrf91/Kconfig.series +++ b/soc/arm/nordic_nrf/nrf91/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_NRF91X - bool "Nordic Semiconductor nRF91 series MCU" + bool select ARM select CPU_CORTEX_M33 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.soc b/soc/arm/nordic_nrf/nrf91/Kconfig.soc index 0d5e7992498f6..1cc286adc5d54 100644 --- a/soc/arm/nordic_nrf/nrf91/Kconfig.soc +++ b/soc/arm/nordic_nrf/nrf91/Kconfig.soc @@ -7,15 +7,11 @@ config SOC_NRF9160 depends on SOC_SERIES_NRF91X bool -choice - prompt "nRF91x MCU Selection" - depends on SOC_SERIES_NRF91X - config SOC_NRF9160_SICA - bool "NRF9160_SICA" + bool select SOC_NRF9160 - -endchoice + help + NRF9160_SICA config NRF_ENABLE_ICACHE bool "Instruction cache (I-Cache)" diff --git a/soc/arm/nuvoton_npcx/npcx7/Kconfig.series b/soc/arm/nuvoton_npcx/npcx7/Kconfig.series index 3fb6921fc094f..991da4166f106 100644 --- a/soc/arm/nuvoton_npcx/npcx7/Kconfig.series +++ b/soc/arm/nuvoton_npcx/npcx7/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_NPCX7 - bool "Nuvoton NPCX7 Series" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nuvoton_npcx/npcx7/Kconfig.soc b/soc/arm/nuvoton_npcx/npcx7/Kconfig.soc index efb7c8ff3215e..0f715ce4528a4 100644 --- a/soc/arm/nuvoton_npcx/npcx7/Kconfig.soc +++ b/soc/arm/nuvoton_npcx/npcx7/Kconfig.soc @@ -3,17 +3,17 @@ # Copyright (c) 2020 Nuvoton Technology Corporation. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "NPCX7 Selection" - depends on SOC_SERIES_NPCX7 - config SOC_NPCX7M6FB - bool "NPCX7M6FB" + bool + help + NPCX7M6FB config SOC_NPCX7M6FC - bool "NPCX7M6FC" + bool + help + NPCX7M6FC config SOC_NPCX7M7FC - bool "NPCX7M7FC" - -endchoice + bool + help + NPCX7M7FC diff --git a/soc/arm/nuvoton_npcx/npcx9/Kconfig.series b/soc/arm/nuvoton_npcx/npcx9/Kconfig.series index 61f258171fbb3..4a29215858d62 100644 --- a/soc/arm/nuvoton_npcx/npcx9/Kconfig.series +++ b/soc/arm/nuvoton_npcx/npcx9/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_NPCX9 - bool "Nuvoton NPCX9 Series" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nuvoton_npcx/npcx9/Kconfig.soc b/soc/arm/nuvoton_npcx/npcx9/Kconfig.soc index e198c44698af3..35ad6f981e14d 100644 --- a/soc/arm/nuvoton_npcx/npcx9/Kconfig.soc +++ b/soc/arm/nuvoton_npcx/npcx9/Kconfig.soc @@ -3,17 +3,17 @@ # Copyright (c) 2021 Nuvoton Technology Corporation. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "NPCX9 Selection" - depends on SOC_SERIES_NPCX9 - config SOC_NPCX9M3F - bool "NPCX9M3F" + bool + help + NPCX9M3F config SOC_NPCX9M6F - bool "NPCX9M6F" + bool + help + NPCX9M6F config SOC_NPCX9M7F - bool "NPCX9M7F" - -endchoice + bool + help + NPCX9M7F diff --git a/soc/arm/nuvoton_numicro/m48x/Kconfig.series b/soc/arm/nuvoton_numicro/m48x/Kconfig.series index 5e79ddfab9a1c..c75afa66ca783 100644 --- a/soc/arm/nuvoton_numicro/m48x/Kconfig.series +++ b/soc/arm/nuvoton_numicro/m48x/Kconfig.series @@ -4,7 +4,7 @@ # Author: Saravanan Sekar config SOC_SERIES_M48X - bool "Nuvoton M48X Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nuvoton_numicro/m48x/Kconfig.soc b/soc/arm/nuvoton_numicro/m48x/Kconfig.soc index cf8ca3d13c517..694417cd9c98b 100644 --- a/soc/arm/nuvoton_numicro/m48x/Kconfig.soc +++ b/soc/arm/nuvoton_numicro/m48x/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2020 Linumiz # Author: Saravanan Sekar -choice - prompt "NUVOTON M48X MCU Selection" - depends on SOC_SERIES_M48X - config SOC_M487 - bool "M487" + bool select HAS_NUMICRO_HAL - -endchoice + help + M487 diff --git a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series index ac0428eff53a9..f131b1245b31e 100644 --- a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series +++ b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_IMX_6X_M4 - bool "i.MX 6SoloX M4 Core Series" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc index 028d4f09212fb..c1da1fa9a58be 100644 --- a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc +++ b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc @@ -3,19 +3,15 @@ # Copyright (c) 2018, NXP # SPDX-License-Identifier: Apache-2.0 -choice - prompt "i.MX 6SoloX Selection" - depends on SOC_SERIES_IMX_6X_M4 - config SOC_MCIMX6X_M4 - bool "SOC_MCIMX6X_M4" + bool select HAS_IMX_HAL select HAS_IMX_GPIO select HAS_IMX_EPIT select HAS_IMX_I2C select HAS_IMX_IOMUXC - -endchoice + help + SOC_MCIMX6X_M4 if SOC_SERIES_IMX_6X_M4 diff --git a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series index be0065cb37303..65ea98fb0336a 100644 --- a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series +++ b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_IMX7_M4 - bool "i.MX7 M4 Core Series" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc index 38d593fc85e7e..835bc45aa73b8 100644 --- a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc +++ b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc @@ -3,18 +3,14 @@ # Copyright (c) 2017, NXP # SPDX-License-Identifier: Apache-2.0 -choice - prompt "i.MX7 M4 Selection" - depends on SOC_SERIES_IMX7_M4 - config SOC_MCIMX7_M4 - bool "SOC_MCIMX7_M4" + bool select HAS_IMX_HAL select HAS_IMX_GPIO select HAS_IMX_I2C select HAS_IMX_IOMUXC - -endchoice + help + SOC_MCIMX7_M4 if SOC_MCIMX7_M4 diff --git a/soc/arm/nxp_imx/mimx8ml8_m7/Kconfig.series b/soc/arm/nxp_imx/mimx8ml8_m7/Kconfig.series index fc55afd4aae19..0344d0ed3faed 100644 --- a/soc/arm/nxp_imx/mimx8ml8_m7/Kconfig.series +++ b/soc/arm/nxp_imx/mimx8ml8_m7/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_IMX8ML_M7 - bool "i.MX8ML M7 Core Series" + bool select ARM select CPU_CORTEX_M7 select SOC_FAMILY_IMX diff --git a/soc/arm/nxp_imx/mimx8ml8_m7/Kconfig.soc b/soc/arm/nxp_imx/mimx8ml8_m7/Kconfig.soc index 224a112a67f22..516a58b0c2f3d 100644 --- a/soc/arm/nxp_imx/mimx8ml8_m7/Kconfig.soc +++ b/soc/arm/nxp_imx/mimx8ml8_m7/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2021, Laird Connectivity # SPDX-License-Identifier: Apache-2.0 -choice -prompt "i.MX8ML M7 Selection" -depends on SOC_SERIES_IMX8ML_M7 - config SOC_MIMX8ML8 - bool "SOC_MIMX8ML8" + bool select HAS_MCUX select HAS_MCUX_CCM select HAS_MCUX_RDC @@ -17,8 +13,8 @@ config SOC_MIMX8ML8 select ARM_MPU select HAS_MCUX_IGPIO select HAS_MCUX_IOMUXC - -endchoice + help + SOC_MIMX8ML8 if SOC_SERIES_IMX8ML_M7 diff --git a/soc/arm/nxp_imx/mimx8mm6_m4/Kconfig.series b/soc/arm/nxp_imx/mimx8mm6_m4/Kconfig.series index dddb12d1b70a8..f9931388a3a4a 100644 --- a/soc/arm/nxp_imx/mimx8mm6_m4/Kconfig.series +++ b/soc/arm/nxp_imx/mimx8mm6_m4/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_IMX8MM_M4 - bool "i.MX8MM M4 Core Series" + bool select ARM select CPU_CORTEX_M4 select SOC_FAMILY_IMX diff --git a/soc/arm/nxp_imx/mimx8mm6_m4/Kconfig.soc b/soc/arm/nxp_imx/mimx8mm6_m4/Kconfig.soc index 94d41bb544a81..ffd4499b43f52 100644 --- a/soc/arm/nxp_imx/mimx8mm6_m4/Kconfig.soc +++ b/soc/arm/nxp_imx/mimx8mm6_m4/Kconfig.soc @@ -3,19 +3,15 @@ # Copyright (c) 2020, Manivannan Sadhasivam # SPDX-License-Identifier: Apache-2.0 -choice -prompt "i.MX8MM M4 Selection" -depends on SOC_SERIES_IMX8MM_M4 - config SOC_MIMX8MM6 - bool "SOC_MIMX8MM6" + bool select HAS_MCUX select HAS_MCUX_CCM select HAS_MCUX_RDC select HAS_MCUX_IGPIO select HAS_MCUX_IOMUXC - -endchoice + help + SOC_MIMX8MM6 if SOC_SERIES_IMX8MM_M4 diff --git a/soc/arm/nxp_imx/mimx8mq6_m4/Kconfig.series b/soc/arm/nxp_imx/mimx8mq6_m4/Kconfig.series index c4b16d3fb5cd6..c271cb012f8fa 100644 --- a/soc/arm/nxp_imx/mimx8mq6_m4/Kconfig.series +++ b/soc/arm/nxp_imx/mimx8mq6_m4/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_IMX8MQ_M4 - bool "i.MX8MQ M4 Core Series" + bool select ARM select CPU_CORTEX_M4 select SOC_FAMILY_IMX diff --git a/soc/arm/nxp_imx/mimx8mq6_m4/Kconfig.soc b/soc/arm/nxp_imx/mimx8mq6_m4/Kconfig.soc index 0165a4d2a1976..ced453e3f8b4d 100644 --- a/soc/arm/nxp_imx/mimx8mq6_m4/Kconfig.soc +++ b/soc/arm/nxp_imx/mimx8mq6_m4/Kconfig.soc @@ -3,18 +3,14 @@ # Copyright (c) 2021, Kwon Tae-young # SPDX-License-Identifier: Apache-2.0 -choice -prompt "i.MX8MQ M4 Selection" - depends on SOC_SERIES_IMX8MQ_M4 - config SOC_MIMX8MQ6 - bool "SOC_MIMX8MQ6" + bool select HAS_MCUX select HAS_MCUX_CCM select HAS_MCUX_RDC select HAS_MCUX_IOMUXC - -endchoice + help + SOC_MIMX8MQ6 if SOC_SERIES_IMX8MQ_M4 diff --git a/soc/arm/nxp_imx/rt/Kconfig.series b/soc/arm/nxp_imx/rt/Kconfig.series index d1adff602513e..3d7d6a1f925ed 100644 --- a/soc/arm/nxp_imx/rt/Kconfig.series +++ b/soc/arm/nxp_imx/rt/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_IMX_RT - bool "i.MX RT Series" + bool select ARM select SOC_FAMILY_IMX select CLOCK_CONTROL diff --git a/soc/arm/nxp_imx/rt/Kconfig.soc b/soc/arm/nxp_imx/rt/Kconfig.soc index 2d76bd8f6ff85..9a84768391d0c 100644 --- a/soc/arm/nxp_imx/rt/Kconfig.soc +++ b/soc/arm/nxp_imx/rt/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2017-2021, NXP # SPDX-License-Identifier: Apache-2.0 -choice - prompt "i.MX RT Selection" - depends on SOC_SERIES_IMX_RT - config SOC_MIMXRT1011 - bool "SOC_MIMXRT1011" + bool select SOC_SERIES_IMX_RT10XX select HAS_MCUX select HAS_MCUX_CACHE @@ -30,9 +26,11 @@ config SOC_MIMXRT1011 select HAS_MCUX_PMU select HAS_MCUX_IOMUXC select HAS_SWO + help + SOC_MIMXRT1011 config SOC_MIMXRT1015 - bool "SOC_MIMXRT1015" + bool select SOC_SERIES_IMX_RT10XX select HAS_MCUX select HAS_MCUX_CACHE @@ -55,9 +53,11 @@ config SOC_MIMXRT1015 select HAS_MCUX_PMU select HAS_MCUX_IOMUXC select HAS_SWO + help + SOC_MIMXRT1015 config SOC_MIMXRT1021 - bool "SOC_MIMXRT1021" + bool select SOC_SERIES_IMX_RT10XX select HAS_MCUX select HAS_MCUX_CACHE @@ -86,9 +86,11 @@ config SOC_MIMXRT1021 select HAS_MCUX_PMU select HAS_MCUX_IOMUXC select HAS_SWO + help + SOC_MIMXRT1021 config SOC_MIMXRT1024 - bool "SOC_MIMXRT1024" + bool select SOC_SERIES_IMX_RT10XX select HAS_MCUX select HAS_MCUX_CACHE @@ -117,9 +119,11 @@ config SOC_MIMXRT1024 select HAS_MCUX_PMU select HAS_MCUX_IOMUXC select HAS_SWO + help + SOC_MIMXRT1024 config SOC_MIMXRT1051 - bool "SOC_MIMXRT1051" + bool select SOC_SERIES_IMX_RT10XX select HAS_MCUX select HAS_MCUX_CACHE @@ -148,9 +152,11 @@ config SOC_MIMXRT1051 select HAS_MCUX_PMU select HAS_MCUX_IOMUXC select HAS_SWO + help + SOC_MIMXRT1051 config SOC_MIMXRT1052 - bool "SOC_MIMXRT1052" + bool select SOC_SERIES_IMX_RT10XX select HAS_MCUX select HAS_MCUX_CACHE @@ -184,9 +190,11 @@ config SOC_MIMXRT1052 select HAS_MCUX_IOMUXC select HAS_MCUX_SRC select HAS_SWO + help + SOC_MIMXRT1052 config SOC_MIMXRT1061 - bool "SOC_MIMXRT1061" + bool select SOC_SERIES_IMX_RT10XX select HAS_MCUX select HAS_MCUX_CACHE @@ -215,9 +223,11 @@ config SOC_MIMXRT1061 select HAS_MCUX_PMU select HAS_MCUX_IOMUXC select HAS_SWO + help + SOC_MIMXRT1061 config SOC_MIMXRT1062 - bool "SOC_MIMXRT1062" + bool select SOC_SERIES_IMX_RT10XX select HAS_MCUX select HAS_MCUX_CACHE @@ -256,9 +266,11 @@ config SOC_MIMXRT1062 select HAS_MCUX_SRC select HAS_SWO select HAS_MCUX_XBARA + help + SOC_MIMXRT1062 config SOC_MIMXRT1064 - bool "SOC_MIMXRT1064" + bool select SOC_SERIES_IMX_RT10XX select HAS_MCUX select HAS_MCUX_CACHE @@ -294,9 +306,11 @@ config SOC_MIMXRT1064 select HAS_MCUX_PMU select HAS_MCUX_IOMUXC select HAS_SWO + help + SOC_MIMXRT1064 config SOC_MIMXRT1176_CM7 - bool "SOC_MIMXRT1176_CM7" + bool select CPU_CORTEX_M7 select CPU_CORTEX_M_HAS_DWT select SOC_SERIES_IMX_RT11XX @@ -334,9 +348,11 @@ config SOC_MIMXRT1176_CM7 select HAS_MCUX_SRC_V2 select HAS_MCUX_IOMUXC select HAS_SWO + help + SOC_MIMXRT1176_CM7 config SOC_MIMXRT1176_CM4 - bool "SOC_MIMXRT1176_CM4" + bool select CPU_CORTEX_M4 select SOC_SERIES_IMX_RT11XX select HAS_MCUX_CACHE @@ -364,9 +380,11 @@ config SOC_MIMXRT1176_CM4 select HAS_MCUX_SRC_V2 select HAS_MCUX_IOMUXC select HAS_SWO + help + SOC_MIMXRT1176_CM4 config SOC_MIMXRT1166_CM7 - bool "SOC_MIMXRT1166_CM7" + bool select CPU_CORTEX_M7 select CPU_CORTEX_M_HAS_DWT select SOC_SERIES_IMX_RT11XX @@ -400,10 +418,11 @@ config SOC_MIMXRT1166_CM7 select HAS_MCUX_SRC_V2 select HAS_MCUX_IOMUXC select HAS_SWO - + help + SOC_MIMXRT1166_CM7 config SOC_MIMXRT1166_CM4 - bool "SOC_MIMXRT1166_CM4" + bool select CPU_CORTEX_M4 select SOC_SERIES_IMX_RT11XX select HAS_MCUX_CACHE @@ -429,8 +448,8 @@ config SOC_MIMXRT1166_CM4 select HAS_MCUX_SRC_V2 select HAS_MCUX_IOMUXC select HAS_SWO - -endchoice + help + SOC_MIMXRT1166_CM4 if SOC_SERIES_IMX_RT diff --git a/soc/arm/nxp_imx/rt5xx/Kconfig.series b/soc/arm/nxp_imx/rt5xx/Kconfig.series index 057e03115be83..1a370b361590e 100644 --- a/soc/arm/nxp_imx/rt5xx/Kconfig.series +++ b/soc/arm/nxp_imx/rt5xx/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_IMX_RT5XX - bool "i.MX RT5XX Series Family MCU" + bool select ARM select CPU_CORTEX_M33 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nxp_imx/rt5xx/Kconfig.soc b/soc/arm/nxp_imx/rt5xx/Kconfig.soc index 97c16f0183056..7ca1d92cf71bb 100644 --- a/soc/arm/nxp_imx/rt5xx/Kconfig.soc +++ b/soc/arm/nxp_imx/rt5xx/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2022, NXP # SPDX-License-Identifier: Apache-2.0 -choice - prompt "i.MX RT5XX Series MCU Selection" - depends on SOC_SERIES_IMX_RT5XX - config SOC_MIMXRT595S_CM33 - bool "SOC_MIMXRT595S M33" + bool select CPU_HAS_ARM_SAU select CPU_HAS_ARM_MPU select CPU_HAS_FPU @@ -31,7 +27,8 @@ config SOC_MIMXRT595S_CM33 select HAS_MCUX_USDHC2 select HAS_MCUX_USB_LPCIP3511 select HAS_MCUX_CTIMER -endchoice + help + SOC_MIMXRT595S M33 if SOC_SERIES_IMX_RT5XX diff --git a/soc/arm/nxp_imx/rt6xx/Kconfig.series b/soc/arm/nxp_imx/rt6xx/Kconfig.series index 64b515d7970ac..0ee055909fa36 100644 --- a/soc/arm/nxp_imx/rt6xx/Kconfig.series +++ b/soc/arm/nxp_imx/rt6xx/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_IMX_RT6XX - bool "i.MX RT6XX Series Family MCU" + bool select ARM select CPU_CORTEX_M33 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nxp_imx/rt6xx/Kconfig.soc b/soc/arm/nxp_imx/rt6xx/Kconfig.soc index 1e1c3feeefb1d..525bc2eff0d14 100644 --- a/soc/arm/nxp_imx/rt6xx/Kconfig.soc +++ b/soc/arm/nxp_imx/rt6xx/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2020, NXP # SPDX-License-Identifier: Apache-2.0 -choice - prompt "i.MX RT6XX Series MCU Selection" - depends on SOC_SERIES_IMX_RT6XX - config SOC_MIMXRT685S_CM33 - bool "SOC_MIMXRT685S M33" + bool select CPU_HAS_ARM_SAU select CPU_HAS_ARM_MPU select CPU_HAS_FPU @@ -31,7 +27,8 @@ config SOC_MIMXRT685S_CM33 select INIT_SYS_PLL select HAS_MCUX_USB_LPCIP3511 select HAS_MCUX_CTIMER -endchoice + help + SOC_MIMXRT685S M33 if SOC_SERIES_IMX_RT6XX diff --git a/soc/arm/nxp_kinetis/k2x/Kconfig.series b/soc/arm/nxp_kinetis/k2x/Kconfig.series index 15ad70d4fada9..4dde82d357ba9 100644 --- a/soc/arm/nxp_kinetis/k2x/Kconfig.series +++ b/soc/arm/nxp_kinetis/k2x/Kconfig.series @@ -8,7 +8,7 @@ # config SOC_SERIES_KINETIS_K2X - bool "Kinetis K2x Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nxp_kinetis/k2x/Kconfig.soc b/soc/arm/nxp_kinetis/k2x/Kconfig.soc index 5653d6cd75a63..a2b6f96c863f3 100644 --- a/soc/arm/nxp_kinetis/k2x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/k2x/Kconfig.soc @@ -7,12 +7,8 @@ # SPDX-License-Identifier: Apache-2.0 # -choice - prompt "Kinetis K2x MCU Selection" - depends on SOC_SERIES_KINETIS_K2X - config SOC_MK22F51212 - bool "SOC_MK22F51212" + bool select HAS_MCUX select HAS_MCUX_SMC select HAS_MCUX_ADC16 @@ -25,8 +21,8 @@ config SOC_MK22F51212 select CPU_HAS_FPU select HAS_MCUX_DAC select HAS_MCUX_RCM - -endchoice + help + SOC_MK22F51212 if SOC_SERIES_KINETIS_K2X diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.series b/soc/arm/nxp_kinetis/k6x/Kconfig.series index 65db948167e40..44f4d3a24dfe0 100644 --- a/soc/arm/nxp_kinetis/k6x/Kconfig.series +++ b/soc/arm/nxp_kinetis/k6x/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_KINETIS_K6X - bool "Kinetis K6x Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.soc b/soc/arm/nxp_kinetis/k6x/Kconfig.soc index 42a0cb6891b66..284fd112fb950 100644 --- a/soc/arm/nxp_kinetis/k6x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/k6x/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2016 Open-RnD Sp. z o.o. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Kinetis K6x MCU Selection" - depends on SOC_SERIES_KINETIS_K6X - config SOC_MK64F12 - bool "SOC_MK64F12" + bool select HAS_MCUX select HAS_MCUX_ADC16 select HAS_MCUX_ENET @@ -24,9 +20,11 @@ config SOC_MK64F12 select HAS_MCUX_DAC select HAS_MCUX_EDMA select HAS_MCUX_RCM + help + SOC_MK64F12 config SOC_MK66F18 - bool "SOC_MK66F18" + bool select HAS_MCUX select HAS_MCUX_ADC16 select HAS_MCUX_ENET @@ -43,8 +41,8 @@ config SOC_MK66F18 select HAS_MCUX_EDMA select HAS_MCUX_RCM select HAS_MCUX_LPUART - -endchoice + help + SOC_MK66F18 if SOC_SERIES_KINETIS_K6X diff --git a/soc/arm/nxp_kinetis/k8x/Kconfig.series b/soc/arm/nxp_kinetis/k8x/Kconfig.series index 087844c97ee40..619d498ff54c6 100644 --- a/soc/arm/nxp_kinetis/k8x/Kconfig.series +++ b/soc/arm/nxp_kinetis/k8x/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_KINETIS_K8X - bool "Kinetis K8x Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nxp_kinetis/k8x/Kconfig.soc b/soc/arm/nxp_kinetis/k8x/Kconfig.soc index b7127ad1bd4a6..02ef15401a4bc 100644 --- a/soc/arm/nxp_kinetis/k8x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/k8x/Kconfig.soc @@ -3,17 +3,15 @@ # Copyright (c) 2019 SEAL AG # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Kinetis K8x MCU Selection" - depends on SOC_SERIES_KINETIS_K8X - config SOC_MK80F25615 - bool "MK80F25615" + bool + help + MK80F25615 config SOC_MK82F25615 - bool "MK82F25615" - -endchoice + bool + help + MK82F25615 if SOC_SERIES_KINETIS_K8X diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.series b/soc/arm/nxp_kinetis/ke1xf/Kconfig.series index 758f4208ef413..d16746d4f1cf6 100644 --- a/soc/arm/nxp_kinetis/ke1xf/Kconfig.series +++ b/soc/arm/nxp_kinetis/ke1xf/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_KINETIS_KE1XF - bool "Kinetis KE1xF Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc b/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc index 6b2ea2145cf5b..b9f00da827b27 100644 --- a/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc +++ b/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc @@ -3,22 +3,22 @@ # Copyright (c) 2019 Vestas Wind Systems A/S # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Kinetis KE1xF MCU Selection" - depends on SOC_SERIES_KINETIS_KE1XF - config SOC_MKE14F16 - bool "MKE14F16" + bool + help + MKE14F16 config SOC_MKE16F16 - bool "MKE16F16" + bool select HAS_MCUX_FLEXCAN + help + MKE16F16 config SOC_MKE18F16 - bool "MKE18F16" + bool select HAS_MCUX_FLEXCAN - -endchoice + help + MKE18F16 if SOC_SERIES_KINETIS_KE1XF diff --git a/soc/arm/nxp_kinetis/kl2x/Kconfig.series b/soc/arm/nxp_kinetis/kl2x/Kconfig.series index fd44f3aa698cf..cb93aafcb2441 100644 --- a/soc/arm/nxp_kinetis/kl2x/Kconfig.series +++ b/soc/arm/nxp_kinetis/kl2x/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_KINETIS_KL2X - bool "Kinetis KL2x Series MCU" + bool select ARM select CPU_CORTEX_M0PLUS select SOC_FAMILY_KINETIS diff --git a/soc/arm/nxp_kinetis/kl2x/Kconfig.soc b/soc/arm/nxp_kinetis/kl2x/Kconfig.soc index 66d6bce9c8f82..bbd3e4c5fa0d1 100644 --- a/soc/arm/nxp_kinetis/kl2x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/kl2x/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2017, NXP # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Kinetis KL2x MCU Selection" - depends on SOC_SERIES_KINETIS_KL2X - config SOC_MKL25Z4 - bool "SOC_MKL25Z4" + bool select CPU_CORTEX_M0PLUS select HAS_MCUX select HAS_MCUX_ADC16 @@ -18,8 +14,8 @@ config SOC_MKL25Z4 select HAS_OSC select HAS_MCG select HAS_MCUX_RCM - -endchoice + help + SOC_MKL25Z4 if SOC_SERIES_KINETIS_KL2X diff --git a/soc/arm/nxp_kinetis/kv5x/Kconfig.series b/soc/arm/nxp_kinetis/kv5x/Kconfig.series index 5e43c5bcb4c54..a3f554ff216fa 100644 --- a/soc/arm/nxp_kinetis/kv5x/Kconfig.series +++ b/soc/arm/nxp_kinetis/kv5x/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_KINETIS_KV5X - bool "Kinetis KV5x Series MCU" + bool select ARM select CPU_CORTEX_M7 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/nxp_kinetis/kv5x/Kconfig.soc b/soc/arm/nxp_kinetis/kv5x/Kconfig.soc index dd69ca523b0b4..0324a050d712b 100644 --- a/soc/arm/nxp_kinetis/kv5x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/kv5x/Kconfig.soc @@ -3,17 +3,15 @@ # Copyright (c) 2019 SEAL AG # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Kinetis KV5x MCU Selection" - depends on SOC_SERIES_KINETIS_KV5X - config SOC_MKV56F24 - bool "MKV56F24" + bool + help + MKV56F24 config SOC_MKV58F24 - bool "MKV58F24" - -endchoice + bool + help + MKV58F24 if SOC_SERIES_KINETIS_KV5X diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.series b/soc/arm/nxp_kinetis/kwx/Kconfig.series index be3eb2565751f..480451d510e55 100644 --- a/soc/arm/nxp_kinetis/kwx/Kconfig.series +++ b/soc/arm/nxp_kinetis/kwx/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_KINETIS_KWX - bool "Kinetis KWx Series MCU" + bool select ARM select SOC_FAMILY_KINETIS select CPU_CORTEX_M_HAS_SYSTICK diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.soc b/soc/arm/nxp_kinetis/kwx/Kconfig.soc index 525637d7f1ed4..b6f8ff59fc500 100644 --- a/soc/arm/nxp_kinetis/kwx/Kconfig.soc +++ b/soc/arm/nxp_kinetis/kwx/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2017, NXP # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Kinetis KWx MCU Selection" - depends on SOC_SERIES_KINETIS_KWX - config SOC_MKW22D5 - bool "SOC_MKW22D5" + bool select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT select HAS_MCUX @@ -20,9 +16,11 @@ config SOC_MKW22D5 select HAS_OSC select HAS_MCG select HAS_MCUX_RCM + help + SOC_MKW22D5 config SOC_MKW24D5 - bool "SOC_MKW24D5" + bool select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT select HAS_MCUX @@ -34,9 +32,11 @@ config SOC_MKW24D5 select HAS_OSC select HAS_MCG select HAS_MCUX_RCM + help + SOC_MKW24D5 config SOC_MKW40Z4 - bool "SOC_MKW40Z4" + bool select CPU_CORTEX_M0PLUS select HAS_MCUX select HAS_MCUX_ADC16 @@ -46,9 +46,11 @@ config SOC_MKW40Z4 select HAS_OSC select HAS_MCG select HAS_MCUX_RCM + help + SOC_MKW40Z4 config SOC_MKW41Z4 - bool "SOC_MKW41Z4" + bool select CPU_CORTEX_M0PLUS select HAS_MCUX select HAS_MCUX_ADC16 @@ -61,8 +63,8 @@ config SOC_MKW41Z4 select HAS_OSC select HAS_MCG select HAS_MCUX_RCM - -endchoice + help + SOC_MKW41Z4 if SOC_SERIES_KINETIS_KWX diff --git a/soc/arm/nxp_lpc/lpc11u6x/Kconfig.series b/soc/arm/nxp_lpc/lpc11u6x/Kconfig.series index cc9574e2dbb40..c1ba0165c3478 100644 --- a/soc/arm/nxp_lpc/lpc11u6x/Kconfig.series +++ b/soc/arm/nxp_lpc/lpc11u6x/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_LPC11U6X - bool "LPC LPC11U6X Series MCU" + bool select ARM select CPU_CORTEX_M0PLUS select CPU_CORTEX_M_HAS_SYSTICK diff --git a/soc/arm/nxp_lpc/lpc11u6x/Kconfig.soc b/soc/arm/nxp_lpc/lpc11u6x/Kconfig.soc index 9dd0ad19c1fd2..7f06f9ae6354e 100644 --- a/soc/arm/nxp_lpc/lpc11u6x/Kconfig.soc +++ b/soc/arm/nxp_lpc/lpc11u6x/Kconfig.soc @@ -3,20 +3,20 @@ # Copyright (c) 2020, Seagate # SPDX-License-Identifier: Apache-2.0 -choice - prompt "LPC LPC11U6X MCU Selection" - depends on SOC_SERIES_LPC11U6X - config SOC_LPC11U68 - bool "SOC_LPC11U68" + bool + help + SOC_LPC11U68 config SOC_LPC11U67 - bool "SOC_LPC11U67" + bool + help + SOC_LPC11U67 config SOC_LPC11U66 - bool "SOC_LPC11U66" - -endchoice + bool + help + SOC_LPC11U66 if SOC_SERIES_LPC11U6X diff --git a/soc/arm/nxp_lpc/lpc51u68/Kconfig.series b/soc/arm/nxp_lpc/lpc51u68/Kconfig.series index 26686e6f3cac3..2b6d9d4e26c1f 100644 --- a/soc/arm/nxp_lpc/lpc51u68/Kconfig.series +++ b/soc/arm/nxp_lpc/lpc51u68/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_LPC51U68 - bool "LPC LPC51U68 Series MCU" + bool select ARM select CPU_CORTEX_M0PLUS select HAS_MCUX diff --git a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.series b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.series index 275bdb9c1538b..ba3b98ab4f46f 100644 --- a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.series +++ b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_LPC54XXX - bool "LPC LPC54xxx Series MCU" + bool select ARM select HAS_MCUX select HAS_MCUX_FLEXCOMM diff --git a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc index 26137a2b73876..f9004bfb11929 100644 --- a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc +++ b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc @@ -3,26 +3,24 @@ # Copyright (c) 2017, NXP # SPDX-License-Identifier: Apache-2.0 -choice - prompt "LPC LPC54XXX MCU Selection" - depends on SOC_SERIES_LPC54XXX - config SOC_LPC54114_M4 - bool "SOC_LPC54114_M4" + bool select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT select CPU_HAS_ARM_MPU select PLATFORM_SPECIFIC_INIT select CLOCK_CONTROL select HAS_MCUX_IAP_LEGACY + help + SOC_LPC54114_M4 config SOC_LPC54114_M0 - bool "SOC_LPC54114_M0" + bool select CPU_CORTEX_M0PLUS select CPU_CORTEX_M_HAS_VTOR select CLOCK_CONTROL - -endchoice + help + SOC_LPC54114_M0 if SOC_SERIES_LPC54XXX diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.series b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.series index 2ea4ec0751ceb..f50b4b9caecbb 100644 --- a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.series +++ b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_LPC55XXX - bool "LPC5500 Series Family MCU" + bool select ARM select HAS_MCUX select HAS_MCUX_FLEXCOMM diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc index fadc126313f05..5db141d46dbb6 100644 --- a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc +++ b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2019, NXP # SPDX-License-Identifier: Apache-2.0 -choice - prompt "LPC5500 Series MCU Selection" - depends on SOC_SERIES_LPC55XXX - config SOC_LPC55S06 - bool "SOC_LPC55S06 M33" + bool select CPU_CORTEX_M33 select CPU_HAS_ARM_SAU select CPU_HAS_ARM_MPU @@ -18,9 +14,11 @@ config SOC_LPC55S06 select CLOCK_CONTROL select HAS_MCUX_IAP if !TRUSTED_EXECUTION_NONSECURE select HAS_MCUX_RNG + help + SOC_LPC55S06 M33 config SOC_LPC55S16 - bool "SOC_LPC55S16 M33" + bool select CPU_CORTEX_M33 select CPU_HAS_ARM_SAU select CPU_HAS_ARM_MPU @@ -31,9 +29,11 @@ config SOC_LPC55S16 select HAS_MCUX_IAP if !TRUSTED_EXECUTION_NONSECURE select HAS_MCUX_MCAN select HAS_MCUX_RNG + help + SOC_LPC55S16 M33 config SOC_LPC55S28 - bool "SOC_LPC55S28 M33" + bool select CPU_CORTEX_M33 select CPU_HAS_ARM_MPU select CPU_HAS_FPU @@ -43,9 +43,11 @@ config SOC_LPC55S28 select HAS_MCUX_LPADC select HAS_MCUX_LPC_DMA select HAS_MCUX_RNG + help + SOC_LPC55S28 M33 config SOC_LPC55S36 - bool "SOC_LPC55S36 M33" + bool select CPU_CORTEX_M33 select CPU_HAS_ARM_SAU select CPU_HAS_ARM_MPU @@ -54,9 +56,11 @@ config SOC_LPC55S36 select ARM_TRUSTZONE_M select CLOCK_CONTROL select HAS_MCUX_MCAN + help + SOC_LPC55S36 M33 config SOC_LPC55S69_CPU0 - bool "SOC_LPC55S69 M33 [CPU 0]" + bool select CPU_CORTEX_M33 select CPU_HAS_ARM_SAU select CPU_HAS_ARM_MPU @@ -71,12 +75,14 @@ config SOC_LPC55S69_CPU0 select HAS_MCUX_CTIMER select HAS_MCUX_SCTIMER select HAS_MCUX_RNG + help + SOC_LPC55S69 M33 [CPU 0] config SOC_LPC55S69_CPU1 - bool "SOC_LPC55S69 M33 [CPU 1]" + bool select CPU_CORTEX_M33 - -endchoice + help + SOC_LPC55S69 M33 [CPU 1] if SOC_SERIES_LPC55XXX diff --git a/soc/arm/quicklogic_eos_s3/Kconfig.soc b/soc/arm/quicklogic_eos_s3/Kconfig.soc index cb5fd170870ca..ad4b89d0ecc6f 100644 --- a/soc/arm/quicklogic_eos_s3/Kconfig.soc +++ b/soc/arm/quicklogic_eos_s3/Kconfig.soc @@ -2,9 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_EOS_S3 - bool "QuickLogic EOS S3 SoC" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_SYSTICK select CPU_HAS_ARM_MPU select EOS_S3_HAL + help + QuickLogic EOS S3 SoC diff --git a/soc/arm/renesas_rcar/gen3/Kconfig.series b/soc/arm/renesas_rcar/gen3/Kconfig.series index 966bbbb30e0b2..bcaae1e9b8685 100644 --- a/soc/arm/renesas_rcar/gen3/Kconfig.series +++ b/soc/arm/renesas_rcar/gen3/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_RCAR_GEN3 - bool "Renesas RCAR Gen3 Cortex R7" + bool select ARM select CPU_CORTEX_R7 select PLATFORM_SPECIFIC_INIT diff --git a/soc/arm/renesas_rcar/gen3/Kconfig.soc b/soc/arm/renesas_rcar/gen3/Kconfig.soc index c859648634367..894754e3690c8 100644 --- a/soc/arm/renesas_rcar/gen3/Kconfig.soc +++ b/soc/arm/renesas_rcar/gen3/Kconfig.soc @@ -1,11 +1,7 @@ # Copyright (c) 2021 IoT.bzh # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Renesas RCar SoC Selection" - depends on SOC_SERIES_RCAR_GEN3 - config SOC_R8A77951 - bool "R8A77951" - -endchoice + bool + help + R8A77951 diff --git a/soc/arm/renesas_smartbond/da1469x/Kconfig.series b/soc/arm/renesas_smartbond/da1469x/Kconfig.series index 247259b5dc0dc..4fcd09629638b 100644 --- a/soc/arm/renesas_smartbond/da1469x/Kconfig.series +++ b/soc/arm/renesas_smartbond/da1469x/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_DA1469X - bool "Renesas SmartBond(tm) DA1469x series MCU" + bool select ARM select CPU_CORTEX_M33 select CPU_HAS_FPU diff --git a/soc/arm/renesas_smartbond/da1469x/Kconfig.soc b/soc/arm/renesas_smartbond/da1469x/Kconfig.soc index edce403986706..adb994c3c0b9b 100644 --- a/soc/arm/renesas_smartbond/da1469x/Kconfig.soc +++ b/soc/arm/renesas_smartbond/da1469x/Kconfig.soc @@ -1,11 +1,7 @@ # Copyright (c) 2022 Renesas Electronics Corporation # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Renesas SmartBond(tm) DA1469x MCU selection" - depends on SOC_SERIES_DA1469X - config SOC_DA14699 - bool "DA14699" - -endchoice + bool + help + DA14699 diff --git a/soc/arm/rpi_pico/rp2/Kconfig.series b/soc/arm/rpi_pico/rp2/Kconfig.series index b13942234d436..c40fb98f0da92 100644 --- a/soc/arm/rpi_pico/rp2/Kconfig.series +++ b/soc/arm/rpi_pico/rp2/Kconfig.series @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_RP2XXX - bool "Raspberry Pi RP2 series MCU" + bool select ARM select CPU_CORTEX_M0PLUS select CPU_CORTEX_M_HAS_SYSTICK diff --git a/soc/arm/rpi_pico/rp2/Kconfig.soc b/soc/arm/rpi_pico/rp2/Kconfig.soc index 601182672db46..2fed5dbba8bf6 100644 --- a/soc/arm/rpi_pico/rp2/Kconfig.soc +++ b/soc/arm/rpi_pico/rp2/Kconfig.soc @@ -4,14 +4,10 @@ # Copyright (c) 2021 Yonatan Schachter # SPDX-License-Identifier: Apache-2.0 -choice - prompt "RP2xxx MCU Selection" - depends on SOC_SERIES_RP2XXX - config SOC_RP2040 - bool "Raspberry Pi RP2040" - -endchoice + bool + help + Raspberry Pi RP2040 config RP2_REQUIRES_SECOND_STAGE_BOOT bool diff --git a/soc/arm/silabs_exx32/efm32gg11b/Kconfig.series b/soc/arm/silabs_exx32/efm32gg11b/Kconfig.series index 50d8a7eb0aa84..bf36c96003aaf 100644 --- a/soc/arm/silabs_exx32/efm32gg11b/Kconfig.series +++ b/soc/arm/silabs_exx32/efm32gg11b/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_EFM32GG11B - bool "EFM32GG11B Series MCU" + bool select ARM select HAS_SILABS_GECKO select HAS_SWO diff --git a/soc/arm/silabs_exx32/efm32hg/Kconfig.series b/soc/arm/silabs_exx32/efm32hg/Kconfig.series index 13c74edb2e6c3..d379686eb23ab 100644 --- a/soc/arm/silabs_exx32/efm32hg/Kconfig.series +++ b/soc/arm/silabs_exx32/efm32hg/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_EFM32HG - bool "EFM32HG Series MCU" + bool select ARM select CPU_CORTEX_M0PLUS select SOC_FAMILY_EXX32 diff --git a/soc/arm/silabs_exx32/efm32jg12b/Kconfig.series b/soc/arm/silabs_exx32/efm32jg12b/Kconfig.series index f454316dad44e..03bf7fe7bb9b3 100644 --- a/soc/arm/silabs_exx32/efm32jg12b/Kconfig.series +++ b/soc/arm/silabs_exx32/efm32jg12b/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_EFM32JG12B - bool "EFM32JG12B Series MCU" + bool select ARM select HAS_SILABS_GECKO select HAS_SWO diff --git a/soc/arm/silabs_exx32/efm32pg12b/Kconfig.series b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.series index 7f99d6d64b8b0..d74afb6668050 100644 --- a/soc/arm/silabs_exx32/efm32pg12b/Kconfig.series +++ b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_EFM32PG12B - bool "EFM32PG12B Series MCU" + bool select ARM select HAS_SILABS_GECKO select HAS_SWO diff --git a/soc/arm/silabs_exx32/efm32pg1b/Kconfig.series b/soc/arm/silabs_exx32/efm32pg1b/Kconfig.series index 9bbf4def7629c..d057e2d58e458 100644 --- a/soc/arm/silabs_exx32/efm32pg1b/Kconfig.series +++ b/soc/arm/silabs_exx32/efm32pg1b/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_EFM32PG1B - bool "EFM32PG1B Series MCU" + bool select ARM select HAS_SILABS_GECKO select HAS_SWO diff --git a/soc/arm/silabs_exx32/efm32wg/Kconfig.series b/soc/arm/silabs_exx32/efm32wg/Kconfig.series index 5d6e4f21e444c..b0cafde898e41 100644 --- a/soc/arm/silabs_exx32/efm32wg/Kconfig.series +++ b/soc/arm/silabs_exx32/efm32wg/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_EFM32WG - bool "EFM32WG Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/silabs_exx32/efr32bg13p/Kconfig.series b/soc/arm/silabs_exx32/efr32bg13p/Kconfig.series index 3fea9b454df37..49d647d57d57b 100644 --- a/soc/arm/silabs_exx32/efr32bg13p/Kconfig.series +++ b/soc/arm/silabs_exx32/efr32bg13p/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_EFR32BG13P - bool "EFR32BG13P Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/silabs_exx32/efr32fg13p/Kconfig.series b/soc/arm/silabs_exx32/efr32fg13p/Kconfig.series index 1913377b3e70e..fc106feae6ca2 100644 --- a/soc/arm/silabs_exx32/efr32fg13p/Kconfig.series +++ b/soc/arm/silabs_exx32/efr32fg13p/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_EFR32FG13P - bool "EFR32FG13P Series MCU" + bool select ARM select HAS_SILABS_GECKO select HAS_SWO diff --git a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series index b2d1ff2874477..0f5132020e113 100644 --- a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series +++ b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_EFR32FG1P - bool "EFR32FG1P Series MCU" + bool select ARM select HAS_SILABS_GECKO select HAS_SWO diff --git a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series index 510889568f038..71b59c255ba07 100644 --- a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series +++ b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_EFR32MG12P - bool "EFR32MG12P Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/silabs_exx32/efr32mg21/Kconfig.series b/soc/arm/silabs_exx32/efr32mg21/Kconfig.series index 97a049db6f1a0..d9be19e0775cd 100644 --- a/soc/arm/silabs_exx32/efr32mg21/Kconfig.series +++ b/soc/arm/silabs_exx32/efr32mg21/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_EFR32MG21 - bool "EFR32MG21 Series MCU" + bool select ARM select CPU_CORTEX_M33 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.series b/soc/arm/st_stm32/stm32f0/Kconfig.series index ac4e6ced15fac..a02949d3f4139 100644 --- a/soc/arm/st_stm32/stm32f0/Kconfig.series +++ b/soc/arm/st_stm32/stm32f0/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32F0X - bool "STM32F0x Series MCU" + bool select ARM select CPU_CORTEX_M0 select CPU_CORTEX_M0_HAS_VECTOR_TABLE_REMAP diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.soc b/soc/arm/st_stm32/stm32f0/Kconfig.soc index 6c4ca6221f24a..63e2fecd52cbe 100644 --- a/soc/arm/st_stm32/stm32f0/Kconfig.soc +++ b/soc/arm/st_stm32/stm32f0/Kconfig.soc @@ -3,35 +3,47 @@ # Copyright (c) 2017 RnDity Sp. z o.o. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32F0x MCU Selection" - depends on SOC_SERIES_STM32F0X - config SOC_STM32F030X4 - bool "STM32F030X4" + bool + help + STM32F030X4 config SOC_STM32F030X8 - bool "STM32F030X8" + bool + help + STM32F030X8 config SOC_STM32F030XC - bool "STM32F030XC" + bool + help + STM32F030XC config SOC_STM32F031X6 - bool "STM32F031X6" + bool + help + STM32F031X6 config SOC_STM32F051X8 - bool "STM32F051X8" + bool + help + STM32F051X8 config SOC_STM32F070XB - bool "STM32F070XB" + bool + help + STM32F070XB config SOC_STM32F072XB - bool "STM32F072XB" + bool + help + STM32F072XB config SOC_STM32F091XC - bool "STM32F091XC" + bool + help + STM32F091XC config SOC_STM32F098XX - bool "STM32F098XX" - -endchoice + bool + help + STM32F098XX diff --git a/soc/arm/st_stm32/stm32f1/Kconfig.series b/soc/arm/st_stm32/stm32f1/Kconfig.series index 7e9428cd9cae6..aa95f4b7786d1 100644 --- a/soc/arm/st_stm32/stm32f1/Kconfig.series +++ b/soc/arm/st_stm32/stm32f1/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32F1X - bool "STM32F1x Series MCU" + bool select ARM select CPU_CORTEX_M3 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32f1/Kconfig.soc b/soc/arm/st_stm32/stm32f1/Kconfig.soc index 46e9ff96c90c7..0850f4b63e30b 100644 --- a/soc/arm/st_stm32/stm32f1/Kconfig.soc +++ b/soc/arm/st_stm32/stm32f1/Kconfig.soc @@ -4,37 +4,45 @@ # Copyright (c) RnDity Sp. z o.o. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32F1x MCU Selection" - depends on SOC_SERIES_STM32F1X - config SOC_STM32F100XB - bool "STM32F100XB" + bool + help + STM32F100XB config SOC_STM32F100XE - bool "STM32F100XE" + bool + help + STM32F100XE config SOC_STM32F103XE - bool "STM32F103XE" + bool select SOC_STM32F10X_DENSITY_DEVICE + help + STM32F103XE config SOC_STM32F103XB - bool "STM32F103XB" + bool select SOC_STM32F10X_DENSITY_DEVICE + help + STM32F103XB config SOC_STM32F103X8 - bool "STM32F103X8" + bool select SOC_STM32F10X_DENSITY_DEVICE + help + STM32F103X8 config SOC_STM32F105XC - bool "STM32F105XC" + bool select SOC_STM32F10X_CONNECTIVITY_LINE_DEVICE + help + STM32F105XC config SOC_STM32F107XC - bool "STM32F107XC" + bool select SOC_STM32F10X_CONNECTIVITY_LINE_DEVICE - -endchoice + help + STM32F107XC config SOC_STM32F10X_DENSITY_DEVICE bool diff --git a/soc/arm/st_stm32/stm32f2/Kconfig.series b/soc/arm/st_stm32/stm32f2/Kconfig.series index 8d2abe1bdfc0f..7e638bf8f89ee 100644 --- a/soc/arm/st_stm32/stm32f2/Kconfig.series +++ b/soc/arm/st_stm32/stm32f2/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32F2X - bool "STM32F2x Series MCU" + bool select ARM select CPU_CORTEX_M3 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32f2/Kconfig.soc b/soc/arm/st_stm32/stm32f2/Kconfig.soc index 5c6bd45373111..06cf6d8c90ff8 100644 --- a/soc/arm/st_stm32/stm32f2/Kconfig.soc +++ b/soc/arm/st_stm32/stm32f2/Kconfig.soc @@ -3,14 +3,12 @@ # Copyright (c) 2018 qianfan Zhao # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32F2X MCU Selection" - depends on SOC_SERIES_STM32F2X - config SOC_STM32F207XX - bool "STM32F207XX" + bool + help + STM32F207XX config SOC_STM32F205XX - bool "STM32F205XX" - -endchoice + bool + help + STM32F205XX diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.series b/soc/arm/st_stm32/stm32f3/Kconfig.series index aab81eb94a9e8..68442e504e15e 100644 --- a/soc/arm/st_stm32/stm32f3/Kconfig.series +++ b/soc/arm/st_stm32/stm32f3/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32F3X - bool "STM32F3x Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.soc b/soc/arm/st_stm32/stm32f3/Kconfig.soc index 135e79b8a49ca..76245c0e2fd86 100644 --- a/soc/arm/st_stm32/stm32f3/Kconfig.soc +++ b/soc/arm/st_stm32/stm32f3/Kconfig.soc @@ -3,29 +3,35 @@ # Copyright (c) 2016 RnDity Sp. z o.o. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32F3x MCU Selection" - depends on SOC_SERIES_STM32F3X - config SOC_STM32F302X8 - bool "STM32F302X8" + bool + help + STM32F302X8 config SOC_STM32F303X8 - bool "STM32F303X8" + bool + help + STM32F303X8 config SOC_STM32F303XC - bool "STM32F303XC" + bool select CPU_HAS_ARM_MPU + help + STM32F303XC config SOC_STM32F303XE - bool "STM32F303XE" + bool select CPU_HAS_ARM_MPU + help + STM32F303XE config SOC_STM32F334X8 - bool "STM32F334X8" + bool + help + STM32F334X8 config SOC_STM32F373XC - bool "STM32F373XC" + bool select CPU_HAS_ARM_MPU - -endchoice + help + STM32F373XC diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.series b/soc/arm/st_stm32/stm32f4/Kconfig.series index 6b8fdf80c7ba9..1414c17341dab 100644 --- a/soc/arm/st_stm32/stm32f4/Kconfig.series +++ b/soc/arm/st_stm32/stm32f4/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32F4X - bool "STM32F4x Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.soc b/soc/arm/st_stm32/stm32f4/Kconfig.soc index ff7dea082efc3..2316697e0aa6e 100644 --- a/soc/arm/st_stm32/stm32f4/Kconfig.soc +++ b/soc/arm/st_stm32/stm32f4/Kconfig.soc @@ -3,68 +3,102 @@ # Copyright (c) 2016 Linaro Limited. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32F4x MCU Selection" - depends on SOC_SERIES_STM32F4X - config SOC_STM32F401XC - bool "STM32F401XC" + bool + help + STM32F401XC config SOC_STM32F401XE - bool "STM32F401XE" + bool + help + STM32F401XE config SOC_STM32F405XG - bool "STM32F405XG" + bool + help + STM32F405XG config SOC_STM32F407XE - bool "STM32F407XE" + bool + help + STM32F407XE config SOC_STM32F407XG - bool "STM32F407XG" + bool + help + STM32F407XG config SOC_STM32F410RX - bool "STM32F410RX" + bool + help + STM32F410RX config SOC_STM32F411XE - bool "STM32F411XE" + bool + help + STM32F411XE config SOC_STM32F412CX - bool "STM32F412CX" + bool + help + STM32F412CX config SOC_STM32F412RX - bool "STM32F412RX" + bool + help + STM32F412RX config SOC_STM32F412VX - bool "STM32F412VX" + bool + help + STM32F412VX config SOC_STM32F412ZX - bool "STM32F412ZX" + bool + help + STM32F412ZX config SOC_STM32F413XX - bool "STM32F413XX" + bool + help + STM32F413XX config SOC_STM32F415XX - bool "STM32F415XX" + bool + help + STM32F415XX config SOC_STM32F417XX - bool "STM32F417XX" + bool + help + STM32F417XX config SOC_STM32F423XX - bool "STM32F423XX" + bool + help + STM32F423XX config SOC_STM32F427XX - bool "STM32F427XI" + bool + help + STM32F427XI config SOC_STM32F429XX - bool "STM32F429XI" + bool + help + STM32F429XI config SOC_STM32F437XX - bool "STM32F437XX" + bool + help + STM32F437XX config SOC_STM32F446XX - bool "STM32F446XX" + bool + help + STM32F446XX config SOC_STM32F469XX - bool "STM32F469XX" - -endchoice + bool + help + STM32F469XX diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.series b/soc/arm/st_stm32/stm32f7/Kconfig.series index 860aea7e7168d..757f05dc7c131 100644 --- a/soc/arm/st_stm32/stm32f7/Kconfig.series +++ b/soc/arm/st_stm32/stm32f7/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32F7X - bool "STM32F7x Series MCU" + bool select ARM select CPU_CORTEX_M7 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.soc b/soc/arm/st_stm32/stm32f7/Kconfig.soc index 3a437101bdd76..87f471a8e503c 100644 --- a/soc/arm/st_stm32/stm32f7/Kconfig.soc +++ b/soc/arm/st_stm32/stm32f7/Kconfig.soc @@ -4,31 +4,39 @@ # Copyright (c) 2022, Rtone. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32F7x MCU Selection" - depends on SOC_SERIES_STM32F7X - config SOC_STM32F723XX - bool "STM32F723XX" + bool + help + STM32F723XX config SOC_STM32F745XX - bool "STM32F745XX" + bool + help + STM32F745XX config SOC_STM32F746XX - bool "STM32F746XX" + bool + help + STM32F746XX config SOC_STM32F756XX - bool "STM32F756XX" + bool + help + STM32F756XX config SOC_STM32F750XX - bool "STM32F750XX" + bool + help + STM32F750XX config SOC_STM32F767XX - bool "STM32F767XX" + bool select CPU_HAS_FPU_DOUBLE_PRECISION + help + STM32F767XX config SOC_STM32F769XX - bool "STM32F769XX" + bool select CPU_HAS_FPU_DOUBLE_PRECISION - -endchoice + help + STM32F769XX diff --git a/soc/arm/st_stm32/stm32g0/Kconfig.series b/soc/arm/st_stm32/stm32g0/Kconfig.series index 43353332745f2..b7b3ebae0b649 100644 --- a/soc/arm/st_stm32/stm32g0/Kconfig.series +++ b/soc/arm/st_stm32/stm32g0/Kconfig.series @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32G0X - bool "STM32G0x Series MCU" + bool select ARM select CPU_CORTEX_M0PLUS select CPU_CORTEX_M_HAS_VTOR diff --git a/soc/arm/st_stm32/stm32g0/Kconfig.soc b/soc/arm/st_stm32/stm32g0/Kconfig.soc index 592290e2fb9aa..4cb367ff4583a 100644 --- a/soc/arm/st_stm32/stm32g0/Kconfig.soc +++ b/soc/arm/st_stm32/stm32g0/Kconfig.soc @@ -5,44 +5,62 @@ # Copyright (c) 2020 Thomas Stranger # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32G0x MCU Selection" - depends on SOC_SERIES_STM32G0X - config SOC_STM32G030XX - bool "STM32G030XX" + bool + help + STM32G030XX config SOC_STM32G031XX - bool "STM32G031XX" + bool + help + STM32G031XX config SOC_STM32G041XX - bool "STM32G041XX" + bool + help + STM32G041XX config SOC_STM32G050XX - bool "STM32G050XX" + bool + help + STM32G050XX config SOC_STM32G051XX - bool "STM32G051XX" + bool + help + STM32G051XX config SOC_STM32G061XX - bool "STM32G061XX" + bool + help + STM32G061XX config SOC_STM32G070XX - bool "STM32G070XX" + bool + help + STM32G070XX config SOC_STM32G071XX - bool "STM32G071XX" + bool + help + STM32G071XX config SOC_STM32G081XX - bool "STM32G081XX" + bool + help + STM32G081XX config SOC_STM32G0B0XX - bool "STM32G0B0XX" + bool + help + STM32G0B0XX config SOC_STM32G0B1XX - bool "STM32G0B1XX" + bool + help + STM32G0B1XX config SOC_STM32G0C1XX - bool "STM32G0C1XX" - -endchoice + bool + help + STM32G0C1XX diff --git a/soc/arm/st_stm32/stm32g4/Kconfig.series b/soc/arm/st_stm32/stm32g4/Kconfig.series index 93fda8ba9a050..e05dd224d292b 100644 --- a/soc/arm/st_stm32/stm32g4/Kconfig.series +++ b/soc/arm/st_stm32/stm32g4/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32G4X - bool "STM32G4x Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32g4/Kconfig.soc b/soc/arm/st_stm32/stm32g4/Kconfig.soc index 9868522fc3113..54fdc70cc65d4 100644 --- a/soc/arm/st_stm32/stm32g4/Kconfig.soc +++ b/soc/arm/st_stm32/stm32g4/Kconfig.soc @@ -3,32 +3,42 @@ # Copyright (c) 2019 Richard Osterloh # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32G4x MCU Selection" - depends on SOC_SERIES_STM32G4X - config SOC_STM32G4A1XX - bool "STM32G4A1XX" + bool + help + STM32G4A1XX config SOC_STM32G431XX - bool "STM32G431XX" + bool + help + STM32G431XX config SOC_STM32G441XX - bool "STM32G441XX" + bool + help + STM32G441XX config SOC_STM32G473XX - bool "STM32G473XX" + bool + help + STM32G473XX config SOC_STM32G474XX - bool "STM32G474XX" + bool + help + STM32G474XX config SOC_STM32G483XX - bool "STM32G483XX" + bool + help + STM32G483XX config SOC_STM32G484XX - bool "STM32G484XX" + bool + help + STM32G484XX config SOC_STM32G491XX - bool "STM32G491XX" - -endchoice + bool + help + STM32G491XX diff --git a/soc/arm/st_stm32/stm32h7/Kconfig.series b/soc/arm/st_stm32/stm32h7/Kconfig.series index 719e97ce8db25..3f1550dc21ee5 100644 --- a/soc/arm/st_stm32/stm32h7/Kconfig.series +++ b/soc/arm/st_stm32/stm32h7/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32H7X - bool "STM32H7x Series MCU" + bool select ARM select CPU_CORTEX_M_HAS_DWT select CPU_HAS_FPU diff --git a/soc/arm/st_stm32/stm32h7/Kconfig.soc b/soc/arm/st_stm32/stm32h7/Kconfig.soc index defec3a87c62f..9c5ef800ca962 100644 --- a/soc/arm/st_stm32/stm32h7/Kconfig.soc +++ b/soc/arm/st_stm32/stm32h7/Kconfig.soc @@ -5,71 +5,91 @@ # Copyright (c) 2021 Electrolance Solutions # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32H7x MCU Selection" - depends on SOC_SERIES_STM32H7X - config SOC_STM32H723XX - bool "STM32H723XX" + bool select CPU_CORTEX_M7 select CPU_HAS_FPU_DOUBLE_PRECISION + help + STM32H723XX config SOC_STM32H725XX - bool "STM32H725XX" + bool select CPU_CORTEX_M7 select CPU_HAS_FPU_DOUBLE_PRECISION + help + STM32H725XX config SOC_STM32H730XX - bool "STM32H730XX" + bool select CPU_CORTEX_M7 select CPU_HAS_FPU_DOUBLE_PRECISION + help + STM32H730XX config SOC_STM32H735XX - bool "STM32H735XX" + bool select CPU_CORTEX_M7 select CPU_HAS_FPU_DOUBLE_PRECISION + help + STM32H735XX config SOC_STM32H743XX - bool "STM32H743XX" + bool select CPU_CORTEX_M7 select CPU_HAS_FPU_DOUBLE_PRECISION + help + STM32H743XX config SOC_STM32H745XX - bool "STM32H745XX" + bool select CPU_HAS_FPU_DOUBLE_PRECISION if CPU_CORTEX_M7 + help + STM32H745XX config SOC_STM32H747XX - bool "STM32H747XX" + bool select CPU_HAS_FPU_DOUBLE_PRECISION if CPU_CORTEX_M7 + help + STM32H747XX config SOC_STM32H750XX - bool "STM32H750XX" + bool select CPU_CORTEX_M7 select CPU_HAS_FPU_DOUBLE_PRECISION + help + STM32H750XX config SOC_STM32H753XX - bool "STM32H753XX" + bool select CPU_CORTEX_M7 select CPU_HAS_FPU_DOUBLE_PRECISION + help + STM32H753XX config SOC_STM32H7A3XX - bool "STM32H7A3XX" + bool select CPU_CORTEX_M7 select CPU_HAS_FPU_DOUBLE_PRECISION + help + STM32H7A3XX config SOC_STM32H7A3XXQ - bool "STM32H7A3XXQ" + bool select CPU_CORTEX_M7 select CPU_HAS_FPU_DOUBLE_PRECISION + help + STM32H7A3XXQ config SOC_STM32H7B3XX - bool "STM32H7B3XX" + bool select CPU_CORTEX_M7 select CPU_HAS_FPU_DOUBLE_PRECISION + help + STM32H7B3XX config SOC_STM32H7B3XXQ - bool "STM32H7B3XXQ" + bool select CPU_CORTEX_M7 select CPU_HAS_FPU_DOUBLE_PRECISION - -endchoice + help + STM32H7B3XXQ diff --git a/soc/arm/st_stm32/stm32l0/Kconfig.series b/soc/arm/st_stm32/stm32l0/Kconfig.series index c465a922848ac..6613ad954afbc 100644 --- a/soc/arm/st_stm32/stm32l0/Kconfig.series +++ b/soc/arm/st_stm32/stm32l0/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32L0X - bool "STM32L0x Series MCU" + bool select ARM select CPU_CORTEX_M0PLUS select CPU_CORTEX_M_HAS_VTOR diff --git a/soc/arm/st_stm32/stm32l0/Kconfig.soc b/soc/arm/st_stm32/stm32l0/Kconfig.soc index 42d49fde84e37..56d4d00742cd9 100644 --- a/soc/arm/st_stm32/stm32l0/Kconfig.soc +++ b/soc/arm/st_stm32/stm32l0/Kconfig.soc @@ -5,37 +5,47 @@ # # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32L0x MCU Selection" - depends on SOC_SERIES_STM32L0X - config SOC_STM32L010XB - bool "STM32L010XB" + bool + help + STM32L010XB config SOC_STM32L011XX - bool "STM32L011XX" + bool + help + STM32L011XX config SOC_STM32L031XX - bool "STM32L031XX" + bool + help + STM32L031XX config SOC_STM32L051XX - bool "STM32L051XX" + bool select CPU_HAS_ARM_MPU + help + STM32L051XX config SOC_STM32L053XX - bool "STM32L053XX" + bool select CPU_HAS_ARM_MPU + help + STM32L053XX config SOC_STM32L071XX - bool "STM32L071XX" + bool select CPU_HAS_ARM_MPU + help + STM32L071XX config SOC_STM32L072XX - bool "STM32L072XX" + bool select CPU_HAS_ARM_MPU + help + STM32L072XX config SOC_STM32L073XX - bool "STM32L073XX" + bool select CPU_HAS_ARM_MPU - -endchoice + help + STM32L073XX diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.series b/soc/arm/st_stm32/stm32l1/Kconfig.series index d21881d6128e8..4ed9bfda069cd 100644 --- a/soc/arm/st_stm32/stm32l1/Kconfig.series +++ b/soc/arm/st_stm32/stm32l1/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32L1X - bool "STM32L1x Series MCU" + bool select ARM select CPU_CORTEX_M3 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.soc b/soc/arm/st_stm32/stm32l1/Kconfig.soc index 07cffb5b3b05c..bcae2387ee6e9 100644 --- a/soc/arm/st_stm32/stm32l1/Kconfig.soc +++ b/soc/arm/st_stm32/stm32l1/Kconfig.soc @@ -3,26 +3,32 @@ # Copyright (c) 2019 Linaro Ltd. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32L1x MCU Selection" - depends on SOC_SERIES_STM32L1X - config SOC_STM32L151X8A - bool "STM32L151X8A" + bool + help + STM32L151X8A config SOC_STM32L151XB - bool "STM32L151XB" + bool + help + STM32L151XB config SOC_STM32L151XBA - bool "STM32L151XBA" + bool + help + STM32L151XBA config SOC_STM32L151XC - bool "STM32L151XC" + bool + help + STM32L151XC config SOC_STM32L152XC - bool "STM32L152XC" + bool + help + STM32L152XC config SOC_STM32L152XE - bool "STM32L152XE" - -endchoice + bool + help + STM32L152XE diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.series b/soc/arm/st_stm32/stm32l4/Kconfig.series index 084082188b2fa..4b6b0f08ebac2 100644 --- a/soc/arm/st_stm32/stm32l4/Kconfig.series +++ b/soc/arm/st_stm32/stm32l4/Kconfig.series @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32L4X - bool "STM32L4x Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.soc b/soc/arm/st_stm32/stm32l4/Kconfig.soc index d92dd534d8e17..ae99b71777773 100644 --- a/soc/arm/st_stm32/stm32l4/Kconfig.soc +++ b/soc/arm/st_stm32/stm32l4/Kconfig.soc @@ -6,47 +6,67 @@ # Copyright (c) 2019 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32L4x MCU Selection" - depends on SOC_SERIES_STM32L4X - config SOC_STM32L476XX - bool "STM32L476X" + bool + help + STM32L476X config SOC_STM32L496XX - bool "STM32L496XX" + bool + help + STM32L496XX config SOC_STM32L412XX - bool "STM32L412XX" + bool + help + STM32L412XX config SOC_STM32L422XX - bool "STM32L422XX" + bool + help + STM32L422XX config SOC_STM32L432XX - bool "STM32L432XX" + bool + help + STM32L432XX config SOC_STM32L433XX - bool "STM32L433XX" + bool + help + STM32L433XX config SOC_STM32L452XX - bool "STM32L452XX" + bool + help + STM32L452XX config SOC_STM32L462XX - bool "STM32L462XX" + bool + help + STM32L462XX config SOC_STM32L475XX - bool "STM32L475XX" + bool + help + STM32L475XX config SOC_STM32L4S5XX - bool "STM32L4S5XX" + bool + help + STM32L4S5XX config SOC_STM32L4R5XX - bool "STM32L4R5XX" + bool + help + STM32L4R5XX config SOC_STM32L4R9XX - bool "STM32L4R9XX" + bool + help + STM32L4R9XX config SOC_STM32L471XX - bool "STM32L471XX" - -endchoice + bool + help + STM32L471XX diff --git a/soc/arm/st_stm32/stm32l5/Kconfig.series b/soc/arm/st_stm32/stm32l5/Kconfig.series index f9447205a539a..cc4fdcdba328b 100644 --- a/soc/arm/st_stm32/stm32l5/Kconfig.series +++ b/soc/arm/st_stm32/stm32l5/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32L5X - bool "STM32L5x Series MCU" + bool select ARM select CPU_CORTEX_M33 select SOC_FAMILY_STM32 diff --git a/soc/arm/st_stm32/stm32l5/Kconfig.soc b/soc/arm/st_stm32/stm32l5/Kconfig.soc index c93746ca48873..abc291f4f2e08 100644 --- a/soc/arm/st_stm32/stm32l5/Kconfig.soc +++ b/soc/arm/st_stm32/stm32l5/Kconfig.soc @@ -3,14 +3,12 @@ # Copyright (c) 2020 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -choice -prompt "STM32L5x MCU Selection" -depends on SOC_SERIES_STM32L5X - config SOC_STM32L552XX - bool "STM32L552XX" + bool + help + STM32L552XX config SOC_STM32L562XX - bool "STM32L562XX" - -endchoice + bool + help + STM32L562XX diff --git a/soc/arm/st_stm32/stm32mp1/Kconfig.series b/soc/arm/st_stm32/stm32mp1/Kconfig.series index 0c6580e84cce5..44a8ef1ef72ef 100644 --- a/soc/arm/st_stm32/stm32mp1/Kconfig.series +++ b/soc/arm/st_stm32/stm32mp1/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32MP1X - bool "STM32MP15 Series MPU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32mp1/Kconfig.soc b/soc/arm/st_stm32/stm32mp1/Kconfig.soc index 18e4202ae5f4f..fa8379bc06b9e 100644 --- a/soc/arm/st_stm32/stm32mp1/Kconfig.soc +++ b/soc/arm/st_stm32/stm32mp1/Kconfig.soc @@ -3,11 +3,7 @@ # Copyright (c) 2019 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32MP1 MPU Selection" - depends on SOC_SERIES_STM32MP1X - config SOC_STM32MP15_M4 - bool "STM32MP15_M4" - -endchoice + bool + help + STM32MP15_M4 diff --git a/soc/arm/st_stm32/stm32u5/Kconfig.series b/soc/arm/st_stm32/stm32u5/Kconfig.series index 69082b70e1cff..eda05823cd841 100644 --- a/soc/arm/st_stm32/stm32u5/Kconfig.series +++ b/soc/arm/st_stm32/stm32u5/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32U5X - bool "STM32U5x Series MCU" + bool select ARM select CPU_CORTEX_M33 select SOC_FAMILY_STM32 diff --git a/soc/arm/st_stm32/stm32u5/Kconfig.soc b/soc/arm/st_stm32/stm32u5/Kconfig.soc index ea0b9f25b3791..4bd5fb41aea16 100644 --- a/soc/arm/st_stm32/stm32u5/Kconfig.soc +++ b/soc/arm/st_stm32/stm32u5/Kconfig.soc @@ -3,14 +3,12 @@ # Copyright (c) 2021 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -choice -prompt "STM32U5x MCU Selection" -depends on SOC_SERIES_STM32U5X - config SOC_STM32U575XX - bool "STM32U575XX" + bool + help + STM32U575XX config SOC_STM32U585XX - bool "STM32U585XX" - -endchoice + bool + help + STM32U585XX diff --git a/soc/arm/st_stm32/stm32wb/Kconfig.series b/soc/arm/st_stm32/stm32wb/Kconfig.series index 8ba570edfe6ee..0b3515b92bc14 100644 --- a/soc/arm/st_stm32/stm32wb/Kconfig.series +++ b/soc/arm/st_stm32/stm32wb/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32WBX - bool "STM32WBx Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32wb/Kconfig.soc b/soc/arm/st_stm32/stm32wb/Kconfig.soc index df65225d311ec..a274bd6f18e0b 100644 --- a/soc/arm/st_stm32/stm32wb/Kconfig.soc +++ b/soc/arm/st_stm32/stm32wb/Kconfig.soc @@ -3,11 +3,7 @@ # Copyright (c) 2019 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32WBx MCU Selection" - depends on SOC_SERIES_STM32WBX - config SOC_STM32WB55XX - bool "STM32WB55XX" - -endchoice + bool + help + STM32WB55XX diff --git a/soc/arm/st_stm32/stm32wl/Kconfig.series b/soc/arm/st_stm32/stm32wl/Kconfig.series index 3b2645dd6cdd2..ac0af14b524d7 100644 --- a/soc/arm/st_stm32/stm32wl/Kconfig.series +++ b/soc/arm/st_stm32/stm32wl/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32WLX - bool "STM32WLx Series MCU" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/st_stm32/stm32wl/Kconfig.soc b/soc/arm/st_stm32/stm32wl/Kconfig.soc index 1664c36cb429c..d94f89228ecde 100644 --- a/soc/arm/st_stm32/stm32wl/Kconfig.soc +++ b/soc/arm/st_stm32/stm32wl/Kconfig.soc @@ -3,20 +3,22 @@ # Copyright (c) 2020 STMicroelectronics. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "STM32WLx MCU Selection" - depends on SOC_SERIES_STM32WLX - config SOC_STM32WLE4XX - bool "STM32WLE4XX" + bool + help + STM32WLE4XX config SOC_STM32WLE5XX - bool "STM32WLE5XX" + bool + help + STM32WLE5XX config SOC_STM32WL54XX - bool "STM32WL54XX" + bool + help + STM32WL54XX config SOC_STM32WL55XX - bool "STM32WL55XX" - -endchoice + bool + help + STM32WL55XX diff --git a/soc/arm/ti_lm3s6965/Kconfig.soc b/soc/arm/ti_lm3s6965/Kconfig.soc index e37f9868dac45..b487c5d994eed 100644 --- a/soc/arm/ti_lm3s6965/Kconfig.soc +++ b/soc/arm/ti_lm3s6965/Kconfig.soc @@ -1,7 +1,9 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_TI_LM3S6965 - bool "TI LM3S6965" + bool select ARM select CPU_CORTEX_M3 select CPU_CORTEX_M_HAS_DWT + help + TI LM3S6965 diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.series b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.series index ea9154b262f30..2eac8c56c0223 100644 --- a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.series +++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_CC13X2_CC26X2 - bool "TI SimpleLink Family CC13x2 / CC26x2" + bool select ARM select CPU_CORTEX_M4 select CPU_HAS_ARM_MPU diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc index e8152a393b970..d1505d4cc5ff5 100644 --- a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc +++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc @@ -3,17 +3,15 @@ # Copyright (c) 2019 Brett Witherspoon # SPDX-License-Identifier: Apache-2.0 -choice - prompt "TI SimpleLink MCU Selection" - depends on SOC_SERIES_CC13X2_CC26X2 - config SOC_CC2652R - bool "CC2652R" + bool + help + CC2652R config SOC_CC1352R - bool "CC1352R" - -endchoice + bool + help + CC1352R menu "Customer Configuration (CCFG)" depends on SOC_SERIES_CC13X2_CC26X2 diff --git a/soc/arm/ti_simplelink/cc32xx/Kconfig.series b/soc/arm/ti_simplelink/cc32xx/Kconfig.series index 5c7344d26e452..73dba94f9e41d 100644 --- a/soc/arm/ti_simplelink/cc32xx/Kconfig.series +++ b/soc/arm/ti_simplelink/cc32xx/Kconfig.series @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_CC32XX - bool "TI SimpleLink Family" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/ti_simplelink/cc32xx/Kconfig.soc b/soc/arm/ti_simplelink/cc32xx/Kconfig.soc index 5746cb835b97d..a6d1ff16561f8 100644 --- a/soc/arm/ti_simplelink/cc32xx/Kconfig.soc +++ b/soc/arm/ti_simplelink/cc32xx/Kconfig.soc @@ -2,19 +2,17 @@ # SPDX-License-Identifier: Apache-2.0 -choice - prompt "TI SimpleLink MCU Selection" - depends on SOC_SERIES_CC32XX - config SOC_CC3220SF - bool "CC3220SF" + bool select HAS_CC3220SDK + help + CC3220SF config SOC_CC3235SF - bool "CC3235SF" + bool select HAS_CC3220SDK - -endchoice + help + CC3235SF config CC3220SF_DEBUG bool "Prepend debug header, disabling flash verification" if XIP diff --git a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series index 6bb0043ff900c..2937a8977e86f 100644 --- a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series +++ b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_MSP432P4XX - bool "TI SimpleLink Family MSP432P4XX" + bool select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT diff --git a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc index 4b3aa5c20868f..3c480e3e73551 100644 --- a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc +++ b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc @@ -3,11 +3,8 @@ # Copyright (c) 2017, Linaro Ltd # SPDX-License-Identifier: Apache-2.0 -choice - prompt "TI SimpleLink MCU Selection" - depends on SOC_SERIES_MSP432P4XX - config SOC_MSP432P401R - bool "MSP432P401R" + bool select HAS_MSP432P4XXSDK -endchoice + help + MSP432P401R diff --git a/soc/arm/xilinx_zynq7000/xc7zxxx/Kconfig.series b/soc/arm/xilinx_zynq7000/xc7zxxx/Kconfig.series index 4b6217d99236c..f021ec7d3dce8 100644 --- a/soc/arm/xilinx_zynq7000/xc7zxxx/Kconfig.series +++ b/soc/arm/xilinx_zynq7000/xc7zxxx/Kconfig.series @@ -4,7 +4,7 @@ # config SOC_SERIES_XILINX_XC7ZXXX - bool "Xilinx Zynq-7000 (XC7Zxxx) SoC series" + bool select SOC_FAMILY_XILINX_ZYNQ7000 select ARM select CPU_CORTEX_A9 diff --git a/soc/arm/xilinx_zynq7000/xc7zxxx/Kconfig.soc b/soc/arm/xilinx_zynq7000/xc7zxxx/Kconfig.soc index 3bb2523fbf6e8..fe0e20d827041 100644 --- a/soc/arm/xilinx_zynq7000/xc7zxxx/Kconfig.soc +++ b/soc/arm/xilinx_zynq7000/xc7zxxx/Kconfig.soc @@ -6,55 +6,49 @@ # https://www.xilinx.com/products/silicon-devices/soc/zynq-7000.html#productTable # -choice - prompt "XC7Zxxx SoC Selection" - depends on SOC_SERIES_XILINX_XC7ZXXX - config SOC_XILINX_XC7Z010 - bool "XC7Z010" + bool help - 2 ARM Cortex-A9 cores up to 866 MHz, Artix-7 programmable logic, + XC7Z010: 2 ARM Cortex-A9 cores up to 866 MHz, Artix-7 programmable logic, 28k logic cells, 2.1Mb block RAM, 800 DSP slices, up to 100 I/O pins. config SOC_XILINX_XC7Z015 - bool "XC7Z015" + bool help - 2 ARM Cortex-A9 cores up to 866 MHz, Artix-7 programmable logic, + XC7Z015: 2 ARM Cortex-A9 cores up to 866 MHz, Artix-7 programmable logic, 74k logic cells, 3.3Mb block RAM, 160 DSP slices, up to 150 I/O pins, up to 4 transceivers. config SOC_XILINX_XC7Z020 - bool "XC7Z020" + bool help - 2 ARM Cortex-A9 cores up to 866 MHz, Artix-7 programmable logic, + XC7Z020: 2 ARM Cortex-A9 cores up to 866 MHz, Artix-7 programmable logic, 85k logic cells, 4.9Mb block RAM, 220 DSP slices, up to 200 I/O pins. config SOC_XILINX_XC7Z030 - bool "XC7Z030" + bool help - 2 ARM Cortex-A9 cores up to 1 GHz, Kintex-7 programmable logic, + XC7Z030: 2 ARM Cortex-A9 cores up to 1 GHz, Kintex-7 programmable logic, 125k logic cells, 9.3Mb block RAM, 400 DSP slices, up to 250 I/O pins, up to 4 transceivers. config SOC_XILINX_XC7Z035 - bool "XC7Z035" + bool help - 2 ARM Cortex-A9 cores up to 1 GHz, Kintex-7 programmable logic, + XC7Z035: 2 ARM Cortex-A9 cores up to 1 GHz, Kintex-7 programmable logic, 275k logic cells, 17.6Mb block RAM, 900 DSP slices, up to 362 I/O pins, up to 16 transceivers. config SOC_XILINX_XC7Z045 - bool "XC7Z045" + bool help - 2 ARM Cortex-A9 cores up to 1 GHz, Kintex-7 programmable logic, + XC7Z045: 2 ARM Cortex-A9 cores up to 1 GHz, Kintex-7 programmable logic, 350k logic cells, 19.1Mb block RAM, 900 DSP slices, up to 362 I/O pins, up to 16 transceivers. config SOC_XILINX_XC7Z100 - bool "XC7Z100" + bool help - 2 ARM Cortex-A9 cores up to 1 GHz, Kintex-7 programmable logic, + XC7Z100: 2 ARM Cortex-A9 cores up to 1 GHz, Kintex-7 programmable logic, 444k logic cells, 26.5Mb block RAM, 2020 DSP slices, up to 400 I/O pins, up to 16 transceivers. - -endchoice diff --git a/soc/arm/xilinx_zynq7000/xc7zxxxs/Kconfig.series b/soc/arm/xilinx_zynq7000/xc7zxxxs/Kconfig.series index 3b00ae321397d..17155132db3ea 100644 --- a/soc/arm/xilinx_zynq7000/xc7zxxxs/Kconfig.series +++ b/soc/arm/xilinx_zynq7000/xc7zxxxs/Kconfig.series @@ -4,7 +4,7 @@ # config SOC_SERIES_XILINX_XC7ZXXXS - bool "Xilinx Zynq-7000S (XC7ZxxxS) SoC series" + bool select SOC_FAMILY_XILINX_ZYNQ7000 select ARM select CPU_CORTEX_A9 diff --git a/soc/arm/xilinx_zynq7000/xc7zxxxs/Kconfig.soc b/soc/arm/xilinx_zynq7000/xc7zxxxs/Kconfig.soc index d69f790f7ddb6..e91a8af3e0ac7 100644 --- a/soc/arm/xilinx_zynq7000/xc7zxxxs/Kconfig.soc +++ b/soc/arm/xilinx_zynq7000/xc7zxxxs/Kconfig.soc @@ -6,27 +6,21 @@ # https://www.xilinx.com/products/silicon-devices/soc/zynq-7000.html#productTable # -choice - prompt "XC7ZxxxS SoC Selection" - depends on SOC_SERIES_XILINX_XC7ZXXXS - config SOC_XILINX_XC7Z007S - bool "XC7Z007S" + bool help - 1 ARM Cortex-A9 core up to 766 MHz, Artix-7 programmable logic, + XC7Z007S: 1 ARM Cortex-A9 core up to 766 MHz, Artix-7 programmable logic, 23k logic cells, 1.8 Mb block RAM, 60 DSP slices, up to 100 I/O pins. config SOC_XILINX_XC7Z012S - bool "XC7Z012S" + bool help - 1 ARM Cortex-A9 core up to 766 MHz, Artix-7 programmable logic, + XC7Z012S: 1 ARM Cortex-A9 core up to 766 MHz, Artix-7 programmable logic, 55k logic cells, 2.5Mb block RAM, 120 DSP slices, up to 150 I/O pins, up to 4 transceivers. config SOC_XILINX_XC7Z014S - bool "XC7Z014S" + bool help - 1 ARM Cortex-A9 core up to 766 MHz, Artix-7 programmable logic, + XC7Z014S: 1 ARM Cortex-A9 core up to 766 MHz, Artix-7 programmable logic, 65k logic cells, 3.8Mb block RAM, 170 DSP slices, up to 200 I/O pins. - -endchoice diff --git a/soc/arm/xilinx_zynqmp/Kconfig.soc b/soc/arm/xilinx_zynqmp/Kconfig.soc index 04611379b2399..dbb12721ea55a 100644 --- a/soc/arm/xilinx_zynqmp/Kconfig.soc +++ b/soc/arm/xilinx_zynqmp/Kconfig.soc @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_XILINX_ZYNQMP_RPU - bool "Xilinx ZynqMP RPU" + bool select ARM select CPU_CORTEX_R5 select SOC_XILINX_ZYNQMP @@ -11,3 +11,5 @@ config SOC_XILINX_ZYNQMP_RPU select PLATFORM_SPECIFIC_INIT select CPU_HAS_ARM_MPU select VFP_DP_D16 + help + Xilinx ZynqMP RPU diff --git a/soc/arm64/arm/fvp_aemv8a/Kconfig.series b/soc/arm64/arm/fvp_aemv8a/Kconfig.series index 27517028bbeb8..e4a35092698d3 100644 --- a/soc/arm64/arm/fvp_aemv8a/Kconfig.series +++ b/soc/arm64/arm/fvp_aemv8a/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_FVP_AEMV8A - bool "ARM FVP AEMv8A AArch64 Series" + bool select ARM64 select SOC_FAMILY_ARM64 help diff --git a/soc/arm64/arm/fvp_aemv8a/Kconfig.soc b/soc/arm64/arm/fvp_aemv8a/Kconfig.soc index b73bf3a6e6e17..f63040ced2618 100644 --- a/soc/arm64/arm/fvp_aemv8a/Kconfig.soc +++ b/soc/arm64/arm/fvp_aemv8a/Kconfig.soc @@ -1,13 +1,9 @@ # Copyright (c) 2021 Carlo Caione # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARM FVP AEMv8A AArch64 SoCs" - depends on SOC_SERIES_FVP_AEMV8A - config SOC_FVP_BASE_REVC_2XAEMV8A - bool "ARM FVP Base RevC 2xAEMv8A AArch64 simulation" + bool select CPU_CORTEX_A53 select GIC_V3 - -endchoice + help + ARM FVP Base RevC 2xAEMv8A AArch64 simulation diff --git a/soc/arm64/arm/fvp_aemv8r/Kconfig.series b/soc/arm64/arm/fvp_aemv8r/Kconfig.series index cf2f75a18b2e5..36c27261c2eae 100644 --- a/soc/arm64/arm/fvp_aemv8r/Kconfig.series +++ b/soc/arm64/arm/fvp_aemv8r/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_FVP_AEMV8R - bool "ARM FVP AEMv8R AArch64 Series" + bool select ARM64 select SOC_FAMILY_ARM64 help diff --git a/soc/arm64/arm/fvp_aemv8r/Kconfig.soc b/soc/arm64/arm/fvp_aemv8r/Kconfig.soc index 2a494850e5bf3..4ada300bcb940 100644 --- a/soc/arm64/arm/fvp_aemv8r/Kconfig.soc +++ b/soc/arm64/arm/fvp_aemv8r/Kconfig.soc @@ -1,18 +1,14 @@ # Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved. # SPDX-License-Identifier: Apache-2.0 -choice - prompt "ARM FVP AEMv8R AArch64 SoCs" - depends on SOC_SERIES_FVP_AEMV8R - config SOC_FVP_AEMV8R_AARCH64 - bool "ARM FVP AEMv8R aarch64 simulation" + bool select CPU_CORTEX_R82 select CPU_HAS_MPU select GIC_V3 select GIC_SINGLE_SECURITY_STATE - -endchoice + help + ARM FVP AEMv8R aarch64 simulation config SOC_FVP_AEMV8R_SIMULATE_CPU_PM bool "Simulate CPU Power Management for FVP_BaseR_AEMv8R" diff --git a/soc/arm64/bcm_vk/viper/Kconfig.series b/soc/arm64/bcm_vk/viper/Kconfig.series index a972a7e0d2bc3..5fbe3c171356e 100644 --- a/soc/arm64/bcm_vk/viper/Kconfig.series +++ b/soc/arm64/bcm_vk/viper/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_VIPER - bool "Broadcom Viper Series" + bool select ARM64 select SOC_FAMILY_BCMVK help diff --git a/soc/arm64/bcm_vk/viper/Kconfig.soc b/soc/arm64/bcm_vk/viper/Kconfig.soc index 9a7dc23f52242..440fc6658b220 100644 --- a/soc/arm64/bcm_vk/viper/Kconfig.soc +++ b/soc/arm64/bcm_vk/viper/Kconfig.soc @@ -1,15 +1,12 @@ # Copyright 2020 Broadcom # SPDX-License-Identifier: Apache-2.0 -choice -prompt "Broadcom Viper SoC" -depends on SOC_SERIES_VIPER - config SOC_BCM58402_A72 - bool "Broadcom BCM58402 A72" + bool select ARM64 select CPU_CORTEX_A72 select ARM_ARCH_TIMER select GIC_V3 - -endchoice +# select SOC_SERIES_VIPER + help + Broadcom BCM58402 A72 diff --git a/soc/arm64/intel_socfpga/agilex/Kconfig.series b/soc/arm64/intel_socfpga/agilex/Kconfig.series index e4aeb5ebb919f..350f62be88456 100644 --- a/soc/arm64/intel_socfpga/agilex/Kconfig.series +++ b/soc/arm64/intel_socfpga/agilex/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_AGILEX - bool "Intel SoC FPGA Agilex Series" + bool select ARM64 select CPU_CORTEX_A53 select GIC_V2 diff --git a/soc/arm64/intel_socfpga/agilex/Kconfig.soc b/soc/arm64/intel_socfpga/agilex/Kconfig.soc index e87636f1af36f..07494448e46a2 100644 --- a/soc/arm64/intel_socfpga/agilex/Kconfig.soc +++ b/soc/arm64/intel_socfpga/agilex/Kconfig.soc @@ -1,10 +1,7 @@ # Copyright (c) 2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -choice -prompt "Intel SoC FPGA Agilex" -depends on SOC_SERIES_AGILEX - config SOC_AGILEX - bool "Intel SoC FPGA Agilex" -endchoice + bool + help + Intel SoC FPGA Agilex diff --git a/soc/arm64/nxp_imx/mimx8m/Kconfig.series b/soc/arm64/nxp_imx/mimx8m/Kconfig.series index cbb0cb99f529e..c03cdb384ffc6 100644 --- a/soc/arm64/nxp_imx/mimx8m/Kconfig.series +++ b/soc/arm64/nxp_imx/mimx8m/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_MIMX8M_A53 - bool "NXP i.MX8M A53 Core Series" + bool select ARM64 select SOC_FAMILY_IMX help diff --git a/soc/arm64/nxp_imx/mimx8m/Kconfig.soc b/soc/arm64/nxp_imx/mimx8m/Kconfig.soc index 56aef3c0ccd91..a408a2a869dbc 100644 --- a/soc/arm64/nxp_imx/mimx8m/Kconfig.soc +++ b/soc/arm64/nxp_imx/mimx8m/Kconfig.soc @@ -1,12 +1,8 @@ # Copyright 2020-2022 NXP # SPDX-License-Identifier: Apache-2.0 -choice -prompt "NXP i.MX8M A53 Selection" -depends on SOC_SERIES_MIMX8M_A53 - config SOC_MIMX8MM_A53 - bool "NXP i.MX8MM A53" + bool select ARM64 select CPU_CORTEX_A53 select ARM_ARCH_TIMER @@ -14,9 +10,11 @@ config SOC_MIMX8MM_A53 select HAS_MCUX if CLOCK_CONTROL select HAS_MCUX_CCM if CLOCK_CONTROL select HAS_MCUX_IOMUXC if PINCTRL + help + NXP i.MX8MM A53 config SOC_MIMX8MP_A53 - bool "NXP i.MX8MP A53" + bool select ARM64 select CPU_CORTEX_A53 select ARM_ARCH_TIMER @@ -24,9 +22,11 @@ config SOC_MIMX8MP_A53 select HAS_MCUX if CLOCK_CONTROL select HAS_MCUX_CCM if CLOCK_CONTROL select HAS_MCUX_IOMUXC if PINCTRL + help + NXP i.MX8MP A53 config SOC_MIMX8MN_A53 - bool "NXP i.MX8MN A53" + bool select ARM64 select CPU_CORTEX_A53 select ARM_ARCH_TIMER @@ -34,8 +34,8 @@ config SOC_MIMX8MN_A53 select HAS_MCUX if CLOCK_CONTROL select HAS_MCUX_CCM if CLOCK_CONTROL select HAS_MCUX_IOMUXC if PINCTRL - -endchoice + help + NXP i.MX8MN A53 config SOC_PART_NUMBER_MIMX8ML8DVNLZ bool diff --git a/soc/arm64/nxp_layerscape/ls1046a/Kconfig.series b/soc/arm64/nxp_layerscape/ls1046a/Kconfig.series index 259a51f51dd2d..38d5b87a169dc 100644 --- a/soc/arm64/nxp_layerscape/ls1046a/Kconfig.series +++ b/soc/arm64/nxp_layerscape/ls1046a/Kconfig.series @@ -5,7 +5,7 @@ # config SOC_SERIES_LS1046A - bool "NXP LS1046A Series" + bool select ARM64 select SOC_FAMILY_LS help diff --git a/soc/arm64/nxp_layerscape/ls1046a/Kconfig.soc b/soc/arm64/nxp_layerscape/ls1046a/Kconfig.soc index 771024c8798e2..25978704881fc 100644 --- a/soc/arm64/nxp_layerscape/ls1046a/Kconfig.soc +++ b/soc/arm64/nxp_layerscape/ls1046a/Kconfig.soc @@ -4,15 +4,11 @@ # SPDX-License-Identifier: Apache-2.0 # -choice -prompt "NXP Layerscpae LS1046A SoC" -depends on SOC_SERIES_LS1046A - config SOC_LS1046A - bool "NXP ls1046a" + bool select ARM64 select CPU_CORTEX_A72 select ARM_ARCH_TIMER select GIC_V2 - -endchoice + help + NXP ls1046a diff --git a/soc/riscv/openisa_rv32m1/Kconfig b/soc/riscv/openisa_rv32m1/Kconfig index b9dc0e55f1102..1dfd7a598898e 100644 --- a/soc/riscv/openisa_rv32m1/Kconfig +++ b/soc/riscv/openisa_rv32m1/Kconfig @@ -12,14 +12,12 @@ # conventions, those "other" cores would need to be supported under a # different soc subdirectory, e.g. soc/arm instead of soc/riscv. -choice - prompt "OpenISA RV32M1 RISC-V Core Selection" - depends on SOC_OPENISA_RV32M1_RISCV32 - config SOC_OPENISA_RV32M1_RI5CY - bool "OpenISA RV32M1 RI5CY core" + bool + help + OpenISA RV32M1 RI5CY core config SOC_OPENISA_RV32M1_ZERO_RISCY - bool "OpenISA RV32M1 ZERO-RISCY core" - -endchoice + bool + help + OpenISA RV32M1 ZERO-RISCY core diff --git a/soc/riscv/riscv-ite/it8xxx2/Kconfig.series b/soc/riscv/riscv-ite/it8xxx2/Kconfig.series index a30d1e5543852..07435bbc986a7 100644 --- a/soc/riscv/riscv-ite/it8xxx2/Kconfig.series +++ b/soc/riscv/riscv-ite/it8xxx2/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_RISCV32_IT8XXX2 - bool "ITE IT8XXX2 implementation" + bool #depends on RISCV # RV32IAFC is an uncommon configuration which is not supported by # default in most toolchains, causing link-time errors. diff --git a/soc/riscv/riscv-ite/it8xxx2/Kconfig.soc b/soc/riscv/riscv-ite/it8xxx2/Kconfig.soc index eeb5d3a9bbeab..1ca71dccb54c9 100644 --- a/soc/riscv/riscv-ite/it8xxx2/Kconfig.soc +++ b/soc/riscv/riscv-ite/it8xxx2/Kconfig.soc @@ -1,12 +1,8 @@ # Copyright (c) 2020 ITE Corporation. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 -choice -prompt "ITE IT8XXX2 system implementation" -depends on SOC_SERIES_RISCV32_IT8XXX2 - config SOC_IT8XXX2 - bool "ITE IT8XXX2 system implementation" + bool select RISCV select ATOMIC_OPERATIONS_BUILTIN select RISCV_ISA_RV32I @@ -17,8 +13,8 @@ config SOC_IT8XXX2 #select RISCV_ISA_EXT_M select RISCV_ISA_EXT_A select RISCV_ISA_EXT_C - -endchoice + help + ITE IT8XXX2 system implementation if SOC_IT8XXX2 diff --git a/soc/riscv/riscv-privilege/andes_v5/Kconfig.series b/soc/riscv/riscv-privilege/andes_v5/Kconfig.series index 15d811fc6d8fa..b613a3fd86444 100644 --- a/soc/riscv/riscv-privilege/andes_v5/Kconfig.series +++ b/soc/riscv/riscv-privilege/andes_v5/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_RISCV_ANDES_V5 - bool "Andes V5 SoC Series Implementation" + bool select RISCV select SOC_FAMILY_RISCV_PRIVILEGE help diff --git a/soc/riscv/riscv-privilege/andes_v5/Kconfig.soc b/soc/riscv/riscv-privilege/andes_v5/Kconfig.soc index a9448b02ec3dc..dfb844940cc04 100644 --- a/soc/riscv/riscv-privilege/andes_v5/Kconfig.soc +++ b/soc/riscv/riscv-privilege/andes_v5/Kconfig.soc @@ -1,18 +1,14 @@ # Copyright (c) 2021 Andes Technology Corporation # SPDX-License-Identifier: Apache-2.0 -choice -prompt "Andes V5 SoC Selection" -depends on SOC_SERIES_RISCV_ANDES_V5 - config SOC_RISCV_ANDES_AE350 - bool "Andes AE350 SoC implementation" + bool select ATOMIC_OPERATIONS_BUILTIN select INCLUDE_RESET_VECTOR select RISCV_ISA_EXT_M select RISCV_ISA_EXT_A - -endchoice + help + Andes AE350 SoC implementation if SOC_SERIES_RISCV_ANDES_V5 diff --git a/soc/riscv/riscv-privilege/gd32vf103/Kconfig.series b/soc/riscv/riscv-privilege/gd32vf103/Kconfig.series index 72a23b83745b2..1b987b843c645 100644 --- a/soc/riscv/riscv-privilege/gd32vf103/Kconfig.series +++ b/soc/riscv/riscv-privilege/gd32vf103/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32VF103 - bool "GigaDevice GD32VF103 series SoC implementation" + bool select RISCV select SOC_FAMILY_RISCV_PRIVILEGE select ATOMIC_OPERATIONS_C diff --git a/soc/riscv/riscv-privilege/gd32vf103/Kconfig.soc b/soc/riscv/riscv-privilege/gd32vf103/Kconfig.soc index a2da5540e41ae..282c8da437e5a 100644 --- a/soc/riscv/riscv-privilege/gd32vf103/Kconfig.soc +++ b/soc/riscv/riscv-privilege/gd32vf103/Kconfig.soc @@ -3,17 +3,13 @@ # Copyright (c) 2021 Tokita, Hiroshi # SPDX-License-Identifier: Apache-2.0 -choice - prompt "GigaDevice GD32VF103 SOC implementation" - depends on SOC_SERIES_GD32VF103 - config SOC_GD32VF103 - bool "GD32VF103" + bool select RISCV_ISA_RV32I select RISCV_ISA_EXT_M select RISCV_ISA_EXT_A select RISCV_ISA_EXT_C select RISCV_ISA_EXT_ZICSR select RISCV_ISA_EXT_ZIFENCEI - -endchoice + help + GD32VF103 diff --git a/soc/riscv/riscv-privilege/miv/Kconfig.series b/soc/riscv/riscv-privilege/miv/Kconfig.series index 6e10f7f62f017..ab2bcaa6f35dd 100644 --- a/soc/riscv/riscv-privilege/miv/Kconfig.series +++ b/soc/riscv/riscv-privilege/miv/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_RISCV32_MIV - bool "Microsemi Mi-V implementation" + bool select RISCV select SOC_FAMILY_RISCV_PRIVILEGE help diff --git a/soc/riscv/riscv-privilege/miv/Kconfig.soc b/soc/riscv/riscv-privilege/miv/Kconfig.soc index 2c7a1e2487693..4ef02075c3112 100644 --- a/soc/riscv/riscv-privilege/miv/Kconfig.soc +++ b/soc/riscv/riscv-privilege/miv/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2018 Antmicro # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Microsemi Mi-V system implementation" - depends on SOC_SERIES_RISCV32_MIV - config SOC_RISCV32_MIV - bool "Microsemi Mi-V system implementation" + bool select ATOMIC_OPERATIONS_C select INCLUDE_RESET_VECTOR select RISCV_ISA_RV32I @@ -16,5 +12,5 @@ config SOC_RISCV32_MIV select RISCV_ISA_EXT_A select RISCV_ISA_EXT_ZICSR select RISCV_ISA_EXT_ZIFENCEI - -endchoice + help + Microsemi Mi-V system implementation diff --git a/soc/riscv/riscv-privilege/mpfs/Kconfig.series b/soc/riscv/riscv-privilege/mpfs/Kconfig.series index d31be61fc9033..9dee8e3541d7d 100644 --- a/soc/riscv/riscv-privilege/mpfs/Kconfig.series +++ b/soc/riscv/riscv-privilege/mpfs/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_RISCV64_MIV - bool "Microchip RV64 implementation" + bool select RISCV select SOC_FAMILY_RISCV_PRIVILEGE help diff --git a/soc/riscv/riscv-privilege/mpfs/Kconfig.soc b/soc/riscv/riscv-privilege/mpfs/Kconfig.soc index 7f20dc703c227..7ab98563f1d08 100644 --- a/soc/riscv/riscv-privilege/mpfs/Kconfig.soc +++ b/soc/riscv/riscv-privilege/mpfs/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2020-2021 Microchip Technology Inc # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Microchip Polarfire SOC implementation" - depends on SOC_SERIES_RISCV64_MIV - config SOC_MPFS - bool "Microchip MPFS system implementation" + bool select ATOMIC_OPERATIONS_BUILTIN select RISCV_GP select USE_SWITCH_SUPPORTED @@ -21,8 +17,8 @@ config SOC_MPFS select RISCV_ISA_EXT_C select RISCV_ISA_EXT_ZICSR select RISCV_ISA_EXT_ZIFENCEI - -endchoice + help + Microchip MPFS system implementation config MPFS_HAL depends on SOC_MPFS diff --git a/soc/riscv/riscv-privilege/neorv32/Kconfig.series b/soc/riscv/riscv-privilege/neorv32/Kconfig.series index 7d80aba1f45de..e73f15bc915fa 100644 --- a/soc/riscv/riscv-privilege/neorv32/Kconfig.series +++ b/soc/riscv/riscv-privilege/neorv32/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_NEORV32 - bool "NEORV32 Processor" + bool select RISCV select RISCV_ISA_RV32I select RISCV_ISA_EXT_M diff --git a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series index 07cd3bf82e1cf..aab9cc67ed852 100644 --- a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series +++ b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_RISCV_SIFIVE_FREEDOM - bool "SiFive Freedom SOC implementation" + bool select RISCV select SOC_FAMILY_RISCV_PRIVILEGE help diff --git a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc index 7840f8a09ba79..3c0de77ea9d3c 100644 --- a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc +++ b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc @@ -3,12 +3,8 @@ # Copyright (c) 2017 Jean-Paul Etienne # SPDX-License-Identifier: Apache-2.0 -choice - prompt "SiFive Freedom SOC implementation" - depends on SOC_SERIES_RISCV_SIFIVE_FREEDOM - config SOC_RISCV_SIFIVE_FREEDOM - bool "SiFive Freedom SOC implementation" + bool select ATOMIC_OPERATIONS_C select INCLUDE_RESET_VECTOR select RISCV_ISA_RV32I @@ -16,9 +12,11 @@ config SOC_RISCV_SIFIVE_FREEDOM select RISCV_ISA_EXT_A select RISCV_ISA_EXT_ZICSR select RISCV_ISA_EXT_ZIFENCEI + help + SiFive Freedom SOC implementation config SOC_RISCV_SIFIVE_FU540 - bool "SiFive Freedom U540 SOC implementation" + bool select ATOMIC_OPERATIONS_C select INCLUDE_RESET_VECTOR select 64BIT @@ -28,9 +26,11 @@ config SOC_RISCV_SIFIVE_FU540 select RISCV_ISA_EXT_C select RISCV_ISA_EXT_ZICSR select RISCV_ISA_EXT_ZIFENCEI + help + SiFive Freedom U540 SOC implementation config SOC_RISCV_SIFIVE_FU740 - bool "SiFive Freedom U740 SOC implementation" + bool select ATOMIC_OPERATIONS_C select INCLUDE_RESET_VECTOR select 64BIT @@ -40,5 +40,5 @@ config SOC_RISCV_SIFIVE_FU740 select RISCV_ISA_EXT_C select RISCV_ISA_EXT_ZICSR select RISCV_ISA_EXT_ZIFENCEI - -endchoice + help + SiFive Freedom U740 SOC implementation diff --git a/soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.series b/soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.series index b573684e0ac88..52acd9896e190 100644 --- a/soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.series +++ b/soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STARFIVE_JH71XX - bool "Starfive JH71XX series" + bool select RISCV select SOC_FAMILY_RISCV_PRIVILEGE help diff --git a/soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.soc b/soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.soc index 8be7ebe5dbe98..9dee31c66b4f1 100644 --- a/soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.soc +++ b/soc/riscv/riscv-privilege/starfive_jh71xx/Kconfig.soc @@ -1,12 +1,8 @@ # Copyright (c) 2021 Rajnesh Kanwal # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Starfive JH7100 SoC" - depends on SOC_SERIES_STARFIVE_JH71XX - config SOC_JH7100 - bool "Starfive JH7100" + bool select ATOMIC_OPERATIONS_BUILTIN select INCLUDE_RESET_VECTOR select RISCV_ISA_RV64I @@ -15,5 +11,5 @@ config SOC_JH7100 select RISCV_ISA_EXT_C select RISCV_ISA_EXT_ZICSR select RISCV_ISA_EXT_ZIFENCEI - -endchoice + help + Starfive JH7100 diff --git a/soc/riscv/riscv-privilege/telink_b91/Kconfig.series b/soc/riscv/riscv-privilege/telink_b91/Kconfig.series index b1f30e73fb437..0a663e0c2b333 100644 --- a/soc/riscv/riscv-privilege/telink_b91/Kconfig.series +++ b/soc/riscv/riscv-privilege/telink_b91/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_RISCV_TELINK_B91 - bool "Telink B91 SoC Implementation" + bool select RISCV select RISCV_ISA_RV32I select RISCV_ISA_EXT_M diff --git a/soc/riscv/riscv-privilege/telink_b91/Kconfig.soc b/soc/riscv/riscv-privilege/telink_b91/Kconfig.soc index 01f3e7ab3428c..345a0af69aae9 100644 --- a/soc/riscv/riscv-privilege/telink_b91/Kconfig.soc +++ b/soc/riscv/riscv-privilege/telink_b91/Kconfig.soc @@ -1,20 +1,16 @@ # Copyright (c) 2021 Telink Semiconductor # SPDX-License-Identifier: Apache-2.0 -choice -prompt "CPU Architecture of SoC" -depends on SOC_SERIES_RISCV_TELINK_B91 - config B91_CPU_RISCV32 - bool "RISCV32 CPU Architecture" + bool select RISCV_ISA_RV32I select RISCV_ISA_EXT_M select RISCV_ISA_EXT_A select RISCV_ISA_EXT_C select RISCV_ISA_EXT_ZICSR select RISCV_ISA_EXT_ZIFENCEI - -endchoice + help + RISCV32 CPU Architecture config TELINK_B91_HWDSP bool "Support Hardware DSP" @@ -27,17 +23,13 @@ config TELINK_B91_PFT_ARCH select RISCV_SOC_CONTEXT_SAVE depends on SOC_SERIES_RISCV_TELINK_B91 -choice -prompt "Telink B91 SoC implementation" -depends on SOC_SERIES_RISCV_TELINK_B91 - config SOC_RISCV_TELINK_B91 - bool "Telink B91 SoC implementation" + bool select ATOMIC_OPERATIONS_BUILTIN select CPU_HAS_FPU select INCLUDE_RESET_VECTOR - -endchoice + help + Telink B91 SoC implementation config FLASH_BASE_ADDRESS hex diff --git a/soc/riscv/riscv-privilege/virt/Kconfig.series b/soc/riscv/riscv-privilege/virt/Kconfig.series index 4f105a26641ea..d9ea29aa3379c 100644 --- a/soc/riscv/riscv-privilege/virt/Kconfig.series +++ b/soc/riscv/riscv-privilege/virt/Kconfig.series @@ -2,6 +2,8 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_RISCV_VIRT - bool "QEMU RISC-V VirtIO Board" + bool select RISCV select SOC_FAMILY_RISCV_PRIVILEGE + help + QEMU RISC-V VirtIO Board diff --git a/soc/riscv/riscv-privilege/virt/Kconfig.soc b/soc/riscv/riscv-privilege/virt/Kconfig.soc index 35a2853eb5008..306ded000f05e 100644 --- a/soc/riscv/riscv-privilege/virt/Kconfig.soc +++ b/soc/riscv/riscv-privilege/virt/Kconfig.soc @@ -1,16 +1,12 @@ # Copyright (c) 2020 Cobham Gaisler AB # SPDX-License-Identifier: Apache-2.0 -choice - prompt "QEMU RISC-V VirtIO Board" - depends on SOC_SERIES_RISCV_VIRT - config SOC_RISCV_VIRT - bool "QEMU RISC-V VirtIO Board" + bool select ATOMIC_OPERATIONS_BUILTIN select INCLUDE_RESET_VECTOR select RISCV_ISA_EXT_M select RISCV_ISA_EXT_A select RISCV_ISA_EXT_C - -endchoice + help + QEMU RISC-V VirtIO Board diff --git a/soc/xtensa/intel_adsp/ace/Kconfig.series b/soc/xtensa/intel_adsp/ace/Kconfig.series index 4a79a5aefc62d..0c0f97bbf5fdf 100644 --- a/soc/xtensa/intel_adsp/ace/Kconfig.series +++ b/soc/xtensa/intel_adsp/ace/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_INTEL_ACE - bool "Intel ACE" + bool select SOC_FAMILY_INTEL_ADSP select XTENSA select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc-clang")) diff --git a/soc/xtensa/intel_adsp/ace/Kconfig.soc b/soc/xtensa/intel_adsp/ace/Kconfig.soc index f3028bf51abd8..2ccc67aea948b 100644 --- a/soc/xtensa/intel_adsp/ace/Kconfig.soc +++ b/soc/xtensa/intel_adsp/ace/Kconfig.soc @@ -1,11 +1,8 @@ # Copyright (c) 2022 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Intel ADSP SoC Selection" - - config SOC_INTEL_ACE15_MTPM - bool "ACE 1.5 Meteor PCH M" - depends on SOC_SERIES_INTEL_ACE - -endchoice +config SOC_INTEL_ACE15_MTPM + bool + depends on SOC_SERIES_INTEL_ACE + help + ACE 1.5 Meteor PCH M diff --git a/soc/xtensa/intel_adsp/cavs/Kconfig.series b/soc/xtensa/intel_adsp/cavs/Kconfig.series index a627dce362c27..6999fbf534ada 100644 --- a/soc/xtensa/intel_adsp/cavs/Kconfig.series +++ b/soc/xtensa/intel_adsp/cavs/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_INTEL_ADSP_CAVS - bool "Intel CAVS" + bool select SOC_FAMILY_INTEL_ADSP select XTENSA select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc-clang")) diff --git a/soc/xtensa/intel_adsp/cavs/Kconfig.soc b/soc/xtensa/intel_adsp/cavs/Kconfig.soc index 37a99b20e13bf..122a93d4ede8d 100644 --- a/soc/xtensa/intel_adsp/cavs/Kconfig.soc +++ b/soc/xtensa/intel_adsp/cavs/Kconfig.soc @@ -1,24 +1,26 @@ # Copyright (c) 2020 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -choice - prompt "Intel CAVS SoC Selection" - depends on SOC_SERIES_INTEL_ADSP_CAVS - config SOC_INTEL_CAVS_V15 - bool "Intel Apollo Lake" + bool + help + Intel Apollo Lake config SOC_INTEL_CAVS_V18 - bool "Intel Cannon Lake" + bool select XTENSA_WAITI_BUG + help + Intel Cannon Lake config SOC_INTEL_CAVS_V20 - bool "Intel Ice Lake" + bool select XTENSA_WAITI_BUG + help + Intel Ice Lake config SOC_INTEL_CAVS_V25 - bool "Intel Tiger Lake" + bool select XTENSA_WAITI_BUG select SCHED_IPI_SUPPORTED - -endchoice + help + Intel Tiger Lake diff --git a/soc/xtensa/nxp_adsp/imx8/Kconfig.series b/soc/xtensa/nxp_adsp/imx8/Kconfig.series index 138f7b33fc64a..7eba292463cc5 100644 --- a/soc/xtensa/nxp_adsp/imx8/Kconfig.series +++ b/soc/xtensa/nxp_adsp/imx8/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_NXP_IMX8 - bool "NXP i.MX8" + bool select SOC_FAMILY_NXP_ADSP select XTENSA select XTENSA_HAL if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" diff --git a/soc/xtensa/nxp_adsp/imx8m/Kconfig.series b/soc/xtensa/nxp_adsp/imx8m/Kconfig.series index 823bd8245218a..459709100f2ac 100644 --- a/soc/xtensa/nxp_adsp/imx8m/Kconfig.series +++ b/soc/xtensa/nxp_adsp/imx8m/Kconfig.series @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_NXP_IMX8M - bool "NXP i.MX8M" + bool select SOC_FAMILY_NXP_ADSP select XTENSA select XTENSA_HAL if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig index 12018059e150b..71c6165a0d830 100644 --- a/subsys/bluetooth/common/Kconfig +++ b/subsys/bluetooth/common/Kconfig @@ -231,7 +231,7 @@ config BT_HCI_VS_FATAL_ERROR config BT_HCI_VS_EXT_DETECT bool "Use heuristics to guess HCI vendor extensions support in advance" depends on BT_HCI_VS_EXT && !BT_CTLR - default y if BOARD_QEMU_X86 || BOARD_QEMU_CORTEX_M3 || BOARD_NATIVE_POSIX + default y if BOARD_QEMU_X86 || BOARD_QEMU_CORTEX_M3 || BOARD_NATIVE_POSIX || BOARD_NATIVE_POSIX_64 help Use some heuristics to try to guess in advance whether the controller supports the HCI vendor extensions in advance, in order to prevent diff --git a/subsys/testsuite/boards/unit_testing/unit_testing/Kconfig.board b/subsys/testsuite/boards/unit_testing/unit_testing/Kconfig.board deleted file mode 100644 index 88c43c26dc8d6..0000000000000 --- a/subsys/testsuite/boards/unit_testing/unit_testing/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright (c) 2022 Nordic Semiconductor - -config BOARD_UNIT_TESTING - bool "Unit testing board" - help - Board for unit testing diff --git a/subsys/testsuite/boards/unit_testing/unit_testing/Kconfig.unit_testing b/subsys/testsuite/boards/unit_testing/unit_testing/Kconfig.unit_testing new file mode 100644 index 0000000000000..57e95f5237969 --- /dev/null +++ b/subsys/testsuite/boards/unit_testing/unit_testing/Kconfig.unit_testing @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: Apache-2.0 +# +# Copyright (c) 2022 Nordic Semiconductor + +config BOARD_UNIT_TESTING + bool + default y + help + Board for unit testing diff --git a/tests/boards/native_posix/cpu_wait/src/main.c b/tests/boards/native_posix/cpu_wait/src/main.c index ec36fcce657f3..54678858fe5bd 100644 --- a/tests/boards/native_posix/cpu_wait/src/main.c +++ b/tests/boards/native_posix/cpu_wait/src/main.c @@ -213,7 +213,8 @@ static void np_timer_isr_test_replacement(const void *arg) */ ZTEST(native_cpu_hold, test_cpu_hold_with_interrupts) { -#if defined(CONFIG_BOARD_NATIVE_POSIX) +#if defined(CONFIG_BOARD_NATIVE_POSIX) || \ + defined(CONFIG_BOARD_NATIVE_POSIX_64) /* So far we only have a test for native_posix. * As the test hooks into an interrupt to cause an extra delay * this is very platform specific @@ -286,7 +287,7 @@ ZTEST(native_cpu_hold, test_cpu_hold_with_interrupts) PRIu64"-"PRIu64"!="PRIu32"\n", time2, time1, ONE_TICK_TIME); -#endif /* defined(CONFIG_BOARD_NATIVE_POSIX) */ +#endif /* defined(CONFIG_BOARD_NATIVE_POSIX) || defined(CONFIG_BOARD_NATIVE_POSIX_64) || */ } ZTEST_SUITE(native_cpu_hold, NULL, NULL, NULL, NULL, NULL); diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c index 828fbfd91a1f8..52f62a2b45ef6 100644 --- a/tests/drivers/adc/adc_api/src/test_adc.c +++ b/tests/drivers/adc/adc_api/src/test_adc.c @@ -167,7 +167,9 @@ #define ADC_1ST_CHANNEL_ID 1 #elif defined(CONFIG_BOARD_SAM_E70_XPLAINED) || \ - defined(CONFIG_BOARD_SAM_V71_XULT) + defined(CONFIG_BOARD_SAM_E70B_XPLAINED) || \ + defined(CONFIG_BOARD_SAM_V71_XULT) || \ + defined(CONFIG_BOARD_SAM_V71B_XULT) #define ADC_DEVICE_NODE DT_INST(0, atmel_sam_afec) #define ADC_RESOLUTION 12 @@ -296,9 +298,10 @@ #define ADC_2ND_CHANNEL_ID 5 #elif defined(CONFIG_BOARD_LPCXPRESSO55S69_CPU0) || \ + defined(CONFIG_BOARD_LPCXPRESSO55S69_NS) || \ defined(CONFIG_BOARD_LPCXPRESSO55S28) || \ defined(CONFIG_BOARD_MIMXRT1170_EVK_CM7) || \ - defined(CONFIG_BOARD_MIMXRT685_EVK) + defined(CONFIG_BOARD_MIMXRT685_EVK_CM33) #define ADC_DEVICE_NODE DT_INST(0, nxp_lpc_lpadc) #define ADC_RESOLUTION 12 #define ADC_GAIN ADC_GAIN_1 @@ -362,7 +365,8 @@ #define ADC_1ST_CHANNEL_ID 0 #define ADC_2ND_CHANNEL_ID 1 -#elif defined(CONFIG_BOARD_NATIVE_POSIX) +#elif defined(CONFIG_BOARD_NATIVE_POSIX) || \ + defined(CONFIG_BOARD_NATIVE_POSIX_64) #define ADC_DEVICE_NODE DT_INST(0, zephyr_adc_emul) #define ADC_RESOLUTION 10 #define ADC_GAIN ADC_GAIN_1 diff --git a/tests/drivers/pwm/pwm_api/src/test_pwm.c b/tests/drivers/pwm/pwm_api/src/test_pwm.c index 23027752e1e68..bd125badb257d 100644 --- a/tests/drivers/pwm/pwm_api/src/test_pwm.c +++ b/tests/drivers/pwm/pwm_api/src/test_pwm.c @@ -64,15 +64,17 @@ #define DEFAULT_PULSE_NSEC 1000000 #endif -#if defined CONFIG_BOARD_SAM_E70_XPLAINED +#if defined(CONFIG_BOARD_SAM_E70_XPLAINED) || \ + defined(CONFIG_BOARD_SAM_E70B_XPLAINED) #define DEFAULT_PWM_PORT 2 /* PWM on EXT2 connector, pin 8 */ #elif defined CONFIG_PWM_NRFX #define DEFAULT_PWM_PORT DT_PROP(DT_ALIAS(pwm_0), ch0_pin) #elif defined CONFIG_BOARD_ADAFRUIT_ITSYBITSY_M4_EXPRESS #define DEFAULT_PWM_PORT 2 /* TCC1/WO[2] on PA18 (D7) */ -#elif defined CONFIG_BOARD_MIMXRT685_EVK +#elif defined CONFIG_BOARD_MIMXRT685_EVK_CM33 #define DEFAULT_PWM_PORT 7 /* D3 on Arduino connector J27 */ -#elif defined CONFIG_BOARD_LPCXPRESSO55S69_CPU0 +#elif defined(CONFIG_BOARD_LPCXPRESSO55S69_CPU0) || \ + defined(CONFIG_BOARD_LPCXPRESSO55S69_NS) #define DEFAULT_PWM_PORT 2 /* D2 on Arduino connector P18 */ #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_pwm) /* Default port should be adapted per board to fit the channel diff --git a/tests/kernel/context/src/main.c b/tests/kernel/context/src/main.c index 4fa9008f07b36..f1d1fe5a372d4 100644 --- a/tests/kernel/context/src/main.c +++ b/tests/kernel/context/src/main.c @@ -57,7 +57,7 @@ #elif defined(CONFIG_SPARC) #elif defined(CONFIG_MIPS) #elif defined(CONFIG_ARCH_POSIX) -#if defined(CONFIG_BOARD_NATIVE_POSIX) +#if defined(CONFIG_BOARD_NATIVE_POSIX) || defined(CONFIG_BOARD_NATIVE_POSIX_64) #define TICK_IRQ TIMER_TICK_IRQ #else /* diff --git a/tests/kernel/mem_protect/syscalls/src/main.c b/tests/kernel/mem_protect/syscalls/src/main.c index 84ebbff16d64d..8529acbc92fae 100644 --- a/tests/kernel/mem_protect/syscalls/src/main.c +++ b/tests/kernel/mem_protect/syscalls/src/main.c @@ -225,7 +225,7 @@ ZTEST_USER(syscalls, test_string_nlen) * if it attempts to access any address outside the image Flash or RAM * boundaries, and the program will hang. */ -#if !((defined(CONFIG_BOARD_NSIM) && defined(CONFIG_SOC_NSIM_SEM)) || \ +#if !(defined(CONFIG_SOC_NSIM_SEM) || \ defined(CONFIG_SOC_EMSK_EM7D) || \ (defined(CONFIG_CPU_CORTEX_M) && \ defined(CONFIG_TRUSTED_EXECUTION_NONSECURE))) diff --git a/tests/lib/sprintf/src/main.c b/tests/lib/sprintf/src/main.c index 0c7578741a504..1760718661bda 100644 --- a/tests/lib/sprintf/src/main.c +++ b/tests/lib/sprintf/src/main.c @@ -110,7 +110,8 @@ ZTEST(sprintf, test_sprintf_double) */ if (IS_MINIMAL_LIBC_NOFP || !(IS_ENABLED(CONFIG_FPU) - || IS_ENABLED(CONFIG_BOARD_NATIVE_POSIX))) { + || IS_ENABLED(CONFIG_BOARD_NATIVE_POSIX) + || IS_ENABLED(CONFIG_BOARD_NATIVE_POSIX_64))) { ztest_test_skip(); return; } diff --git a/tests/subsys/fs/nvs/src/main.c b/tests/subsys/fs/nvs/src/main.c index 11f18be8cdd1f..caf18ff79e953 100644 --- a/tests/subsys/fs/nvs/src/main.c +++ b/tests/subsys/fs/nvs/src/main.c @@ -11,8 +11,9 @@ * Test should be run on qemu_x86 or native_posix target. */ -#if !defined(CONFIG_BOARD_QEMU_X86) && !defined(CONFIG_BOARD_NATIVE_POSIX) -#error "Run on qemu_x86 or native_posix only" +#if !defined(CONFIG_BOARD_QEMU_X86) && !defined(CONFIG_BOARD_NATIVE_POSIX) && \ + !defined(CONFIG_BOARD_NATIVE_POSIX_64) +#error "Run on qemu_x86, native_posix or native_posix_64 only" #endif #include diff --git a/tests/ztest/error_hook/src/main.c b/tests/ztest/error_hook/src/main.c index 7c5ae0a35bcd9..f112d399d2ba6 100644 --- a/tests/ztest/error_hook/src/main.c +++ b/tests/ztest/error_hook/src/main.c @@ -118,11 +118,11 @@ __no_optimization static void trigger_fault_divide_zero(void) */ #if (defined(CONFIG_SOC_SERIES_MPS2) && defined(CONFIG_QEMU_TARGET)) || \ (defined(CONFIG_SOC_SERIES_MPS3) && defined(CONFIG_QEMU_TARGET)) || \ - defined(CONFIG_BOARD_QEMU_CORTEX_A53) || defined(CONFIG_SOC_QEMU_ARC) || \ + defined(CONFIG_SOC_QEMU_CORTEX_A53) || defined(CONFIG_SOC_QEMU_ARC) || \ defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) || \ defined(CONFIG_BOARD_QEMU_CORTEX_R5) || \ - defined(CONFIG_BOARD_FVP_BASER_AEMV8R) || defined(CONFIG_BOARD_FVP_BASE_REVC_2XAEMV8A) || \ - defined(CONFIG_BOARD_FVP_BASER_AEMV8R_AARCH32) + defined(CONFIG_SOC_SERIES_FVP_AEMV8R) || defined(CONFIG_SOC_FVP_BASE_REVC_2XAEMV8A) || \ + defined(CONFIG_SOC_FVP_AEMV8R_AARCH32) ztest_test_skip(); #endif }