From 124004c29a0bf610734d1637c373bb650da7c70b Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Wed, 29 Jan 2020 15:23:33 +0100 Subject: [PATCH] boards: stm32: Remove useless CONFIG_BOARD_FOO from _defconfig files CONFIG_BOARD_FOO is enabled in a number of board *_defconfig files although it is useless as it is set by default (as defined as a one option choice, symbol defaults to 'y'). CONFIG_BOARD_FOO should remain only in target that are defined in boards providing multiple choices (dual cores, board with multiple revisions). Clean it from STM32 impacted boards. Signed-off-by: Erwan Gouriou --- boards/arm/96b_avenger96/96b_avenger96_defconfig | 1 - .../arm/96b_stm32_sensor_mez/96b_stm32_sensor_mez_defconfig | 1 - boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig | 1 - boards/arm/nucleo_f070rb/nucleo_f070rb_defconfig | 1 - boards/arm/nucleo_f091rc/nucleo_f091rc_defconfig | 1 - boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig | 1 - boards/arm/nucleo_f207zg/nucleo_f207zg_defconfig | 1 - boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig | 1 - boards/arm/nucleo_f401re/nucleo_f401re_defconfig | 1 - boards/arm/nucleo_f411re/nucleo_f411re_defconfig | 1 - boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig | 1 - boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig | 1 - boards/arm/nucleo_f446re/nucleo_f446re_defconfig | 1 - boards/arm/nucleo_f746zg/nucleo_f746zg_defconfig | 1 - boards/arm/nucleo_f756zg/nucleo_f756zg_defconfig | 1 - boards/arm/nucleo_f767zi/nucleo_f767zi_defconfig | 1 - boards/arm/nucleo_g071rb/nucleo_g071rb_defconfig | 1 - boards/arm/nucleo_l053r8/nucleo_l053r8_defconfig | 1 - boards/arm/nucleo_l073rz/nucleo_l073rz_defconfig | 1 - boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig | 1 - boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig | 1 - boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig | 1 - boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig | 1 - boards/arm/olimexino_stm32/olimexino_stm32_defconfig | 1 - boards/arm/sensortile_box/sensortile_box_defconfig | 1 - boards/arm/steval_fcu001v1/steval_fcu001v1_defconfig | 1 - boards/arm/stm3210c_eval/stm3210c_eval_defconfig | 1 - boards/arm/stm32373c_eval/stm32373c_eval_defconfig | 1 - boards/arm/stm32_min_dev/stm32_min_dev_black_defconfig | 1 - boards/arm/stm32_min_dev/stm32_min_dev_blue_defconfig | 1 - boards/arm/stm32f030_demo/stm32f030_demo_defconfig | 1 - boards/arm/stm32f072_eval/stm32f072_eval_defconfig | 1 - boards/arm/stm32f072b_disco/stm32f072b_disco_defconfig | 1 - boards/arm/stm32f0_disco/stm32f0_disco_defconfig | 1 - boards/arm/stm32f3_disco/stm32f3_disco_defconfig | 1 - boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig | 1 - boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig | 1 - boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig | 1 - boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig | 1 - boards/arm/stm32f4_disco/stm32f4_disco_defconfig | 1 - boards/arm/stm32f723e_disco/stm32f723e_disco_defconfig | 1 - boards/arm/stm32f746g_disco/stm32f746g_disco_defconfig | 1 - boards/arm/stm32f769i_disco/stm32f769i_disco_defconfig | 1 - boards/arm/stm32g0316_disco/stm32g0316_disco_defconfig | 1 - boards/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig | 4 +++- boards/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig | 4 +++- boards/arm/stm32l1_disco/stm32l1_disco_defconfig | 1 - boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig | 1 - boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig | 1 - boards/arm/stm32mp157c_dk2/stm32mp157c_dk2_defconfig | 1 - boards/arm/stm32vl_disco/stm32vl_disco_defconfig | 1 - 51 files changed, 6 insertions(+), 51 deletions(-) diff --git a/boards/arm/96b_avenger96/96b_avenger96_defconfig b/boards/arm/96b_avenger96/96b_avenger96_defconfig index 8504ca6333c..9f307f59830 100644 --- a/boards/arm/96b_avenger96/96b_avenger96_defconfig +++ b/boards/arm/96b_avenger96/96b_avenger96_defconfig @@ -1,5 +1,4 @@ CONFIG_ARM=y -CONFIG_BOARD_96B_AVENGER96=y CONFIG_SOC_SERIES_STM32MP1X=y CONFIG_SOC_STM32MP15_M4=y # 209 MHz system clock (mlhclk_ck) 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 25637e6d4b8..fac2dcf2e2a 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,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_96B_STM32_SENSOR_MEZ=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F446XX=y diff --git a/boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig b/boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig index d2871fafdf0..82148cb6379 100644 --- a/boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig +++ b/boards/arm/nucleo_f030r8/nucleo_f030r8_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration CONFIG_SOC_STM32F030X8=y -CONFIG_BOARD_NUCLEO_F030R8=y # General Kernel Options CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 diff --git a/boards/arm/nucleo_f070rb/nucleo_f070rb_defconfig b/boards/arm/nucleo_f070rb/nucleo_f070rb_defconfig index 719843b9e3d..998b0492fcf 100644 --- a/boards/arm/nucleo_f070rb/nucleo_f070rb_defconfig +++ b/boards/arm/nucleo_f070rb/nucleo_f070rb_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration CONFIG_SOC_STM32F070XB=y -CONFIG_BOARD_NUCLEO_F070RB=y # General Kernel Options CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 diff --git a/boards/arm/nucleo_f091rc/nucleo_f091rc_defconfig b/boards/arm/nucleo_f091rc/nucleo_f091rc_defconfig index f3b037061f3..0f14d01b19f 100644 --- a/boards/arm/nucleo_f091rc/nucleo_f091rc_defconfig +++ b/boards/arm/nucleo_f091rc/nucleo_f091rc_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration CONFIG_SOC_STM32F091XC=y -CONFIG_BOARD_NUCLEO_F091RC=y # General Kernel Options CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 diff --git a/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig b/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig index 67b174f0aa9..8272cf73837 100644 --- a/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig +++ b/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_NUCLEO_F103RB=y CONFIG_SOC_SERIES_STM32F1X=y CONFIG_SOC_STM32F103XB=y # 72MHz system clock diff --git a/boards/arm/nucleo_f207zg/nucleo_f207zg_defconfig b/boards/arm/nucleo_f207zg/nucleo_f207zg_defconfig index 3bba30e231d..eba9b8badf8 100644 --- a/boards/arm/nucleo_f207zg/nucleo_f207zg_defconfig +++ b/boards/arm/nucleo_f207zg/nucleo_f207zg_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_NUCLEO_F207ZG=y CONFIG_SOC_SERIES_STM32F2X=y CONFIG_SOC_STM32F207XX=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000 diff --git a/boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig b/boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig index 31edc02234d..66731f24e73 100644 --- a/boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig +++ b/boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32F3X=y # Platform Configuration CONFIG_SOC_STM32F334X8=y -CONFIG_BOARD_NUCLEO_F334R8=y # General Kernel Options CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000 diff --git a/boards/arm/nucleo_f401re/nucleo_f401re_defconfig b/boards/arm/nucleo_f401re/nucleo_f401re_defconfig index 7bc5f263c0d..aed1965d4a5 100644 --- a/boards/arm/nucleo_f401re/nucleo_f401re_defconfig +++ b/boards/arm/nucleo_f401re/nucleo_f401re_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_NUCLEO_F401RE=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F401XE=y # 84MHz system clock diff --git a/boards/arm/nucleo_f411re/nucleo_f411re_defconfig b/boards/arm/nucleo_f411re/nucleo_f411re_defconfig index 713d6eb0540..b8bee684c0f 100644 --- a/boards/arm/nucleo_f411re/nucleo_f411re_defconfig +++ b/boards/arm/nucleo_f411re/nucleo_f411re_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_NUCLEO_F411RE=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F411XE=y # 96MHz system clock (highest value to get a precise USB clock) diff --git a/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig b/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig index 0a08da7918f..9969ea594e6 100644 --- a/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig +++ b/boards/arm/nucleo_f412zg/nucleo_f412zg_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_NUCLEO_F412ZG=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F412ZG=y # 96MHz system clock (highest value to get a precise USB clock) diff --git a/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig b/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig index 0bd52978927..505b9b008ef 100644 --- a/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig +++ b/boards/arm/nucleo_f413zh/nucleo_f413zh_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_NUCLEO_F413ZH=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F413XX=y # 96MHz system clock (highest value to get a precise USB clock) diff --git a/boards/arm/nucleo_f446re/nucleo_f446re_defconfig b/boards/arm/nucleo_f446re/nucleo_f446re_defconfig index 58880aee003..095f0c229c8 100644 --- a/boards/arm/nucleo_f446re/nucleo_f446re_defconfig +++ b/boards/arm/nucleo_f446re/nucleo_f446re_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_NUCLEO_F446RE=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F446XX=y # 96MHz system clock (highest value to get a precise USB clock) diff --git a/boards/arm/nucleo_f746zg/nucleo_f746zg_defconfig b/boards/arm/nucleo_f746zg/nucleo_f746zg_defconfig index 36140cb4242..49ea83a93e3 100644 --- a/boards/arm/nucleo_f746zg/nucleo_f746zg_defconfig +++ b/boards/arm/nucleo_f746zg/nucleo_f746zg_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_NUCLEO_F746ZG=y CONFIG_SOC_SERIES_STM32F7X=y CONFIG_SOC_STM32F746XX=y # 72MHz system clock (CubeMX Defaults) diff --git a/boards/arm/nucleo_f756zg/nucleo_f756zg_defconfig b/boards/arm/nucleo_f756zg/nucleo_f756zg_defconfig index 1a5a4530077..e9848c94a3b 100644 --- a/boards/arm/nucleo_f756zg/nucleo_f756zg_defconfig +++ b/boards/arm/nucleo_f756zg/nucleo_f756zg_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_NUCLEO_F756ZG=y CONFIG_SOC_SERIES_STM32F7X=y CONFIG_SOC_STM32F756XX=y # 72MHz system clock (CubeMX Defaults) diff --git a/boards/arm/nucleo_f767zi/nucleo_f767zi_defconfig b/boards/arm/nucleo_f767zi/nucleo_f767zi_defconfig index 49d48794296..a7cbf5c2381 100644 --- a/boards/arm/nucleo_f767zi/nucleo_f767zi_defconfig +++ b/boards/arm/nucleo_f767zi/nucleo_f767zi_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_NUCLEO_F767ZI=y CONFIG_SOC_SERIES_STM32F7X=y CONFIG_SOC_STM32F767XX=y # 72MHz system clock (CubeMX Defaults) diff --git a/boards/arm/nucleo_g071rb/nucleo_g071rb_defconfig b/boards/arm/nucleo_g071rb/nucleo_g071rb_defconfig index 4f37efb13e3..116364db849 100644 --- a/boards/arm/nucleo_g071rb/nucleo_g071rb_defconfig +++ b/boards/arm/nucleo_g071rb/nucleo_g071rb_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y CONFIG_SOC_SERIES_STM32G0X=y CONFIG_SOC_STM32G071XX=y -CONFIG_BOARD_NUCLEO_G071RB=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/arm/nucleo_l053r8/nucleo_l053r8_defconfig b/boards/arm/nucleo_l053r8/nucleo_l053r8_defconfig index bb60e0b010b..52e80560539 100644 --- a/boards/arm/nucleo_l053r8/nucleo_l053r8_defconfig +++ b/boards/arm/nucleo_l053r8/nucleo_l053r8_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32L0X=y # Platform Configuration CONFIG_SOC_STM32L053XX=y -CONFIG_BOARD_NUCLEO_L053R8=y # General Kernel Options CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000 diff --git a/boards/arm/nucleo_l073rz/nucleo_l073rz_defconfig b/boards/arm/nucleo_l073rz/nucleo_l073rz_defconfig index f331dbbe740..f5d55cdc84f 100644 --- a/boards/arm/nucleo_l073rz/nucleo_l073rz_defconfig +++ b/boards/arm/nucleo_l073rz/nucleo_l073rz_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32L0X=y # Platform Configuration CONFIG_SOC_STM32L073XX=y -CONFIG_BOARD_NUCLEO_L073RZ=y # General Kernel Options CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000 diff --git a/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig b/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig index fec5bce470a..b4900c07bd2 100644 --- a/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig +++ b/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig @@ -3,7 +3,6 @@ CONFIG_ARM=y CONFIG_SOC_SERIES_STM32L4X=y CONFIG_SOC_STM32L4R5XX=y -CONFIG_BOARD_NUCLEO_L4R5ZI=y # 120MHz system clock only in 'boost power' mode. DM00310109, section # 5.1.7 states that the R1MODE bit must be cleared before system can diff --git a/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig b/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig index 5178970ec87..d1b5bf89e95 100644 --- a/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig +++ b/boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_OLIMEX_STM32_E407=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F407XG=y # 168MHz system clock diff --git a/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig b/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig index 7103a8d9c2f..d1b5bf89e95 100644 --- a/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig +++ b/boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_OLIMEX_STM32_H407=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F407XG=y # 168MHz system clock diff --git a/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig b/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig index 311739856ff..f2cceec9f5a 100644 --- a/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig +++ b/boards/arm/olimex_stm32_p405/olimex_stm32_p405_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_OLIMEX_STM32_P405=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F405XG=y # 168MHz system clock diff --git a/boards/arm/olimexino_stm32/olimexino_stm32_defconfig b/boards/arm/olimexino_stm32/olimexino_stm32_defconfig index 96dd790419a..075904c4493 100644 --- a/boards/arm/olimexino_stm32/olimexino_stm32_defconfig +++ b/boards/arm/olimexino_stm32/olimexino_stm32_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_OLIMEXINO_STM32=y CONFIG_SOC_SERIES_STM32F1X=y CONFIG_SOC_STM32F103XB=y # 72MHz system clock diff --git a/boards/arm/sensortile_box/sensortile_box_defconfig b/boards/arm/sensortile_box/sensortile_box_defconfig index ad838ea6d05..3c6bdf112b1 100644 --- a/boards/arm/sensortile_box/sensortile_box_defconfig +++ b/boards/arm/sensortile_box/sensortile_box_defconfig @@ -3,7 +3,6 @@ CONFIG_ARM=y CONFIG_SOC_SERIES_STM32L4X=y CONFIG_SOC_STM32L4R9XX=y -CONFIG_BOARD_SENSORTILE_BOX=y # 120MHz system clock only in 'boost power' mode. DM00310109, section # 5.1.7 states that the R1MODE bit must be cleared before system can diff --git a/boards/arm/steval_fcu001v1/steval_fcu001v1_defconfig b/boards/arm/steval_fcu001v1/steval_fcu001v1_defconfig index 46df7a7cd7c..6e35c2b5e0c 100644 --- a/boards/arm/steval_fcu001v1/steval_fcu001v1_defconfig +++ b/boards/arm/steval_fcu001v1/steval_fcu001v1_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STEVAL_FCU001V1=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F401XC=y diff --git a/boards/arm/stm3210c_eval/stm3210c_eval_defconfig b/boards/arm/stm3210c_eval/stm3210c_eval_defconfig index e4f819453a2..8fb0f065da1 100644 --- a/boards/arm/stm3210c_eval/stm3210c_eval_defconfig +++ b/boards/arm/stm3210c_eval/stm3210c_eval_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32F1X=y # Platform Configuration CONFIG_SOC_STM32F107XC=y -CONFIG_BOARD_STM3210C_EVAL=y # General Kernel Options # 72MHz system clock diff --git a/boards/arm/stm32373c_eval/stm32373c_eval_defconfig b/boards/arm/stm32373c_eval/stm32373c_eval_defconfig index 40763ff1a31..ee50dcd9530 100644 --- a/boards/arm/stm32373c_eval/stm32373c_eval_defconfig +++ b/boards/arm/stm32373c_eval/stm32373c_eval_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32F3X=y # Platform Configuration CONFIG_SOC_STM32F373XC=y -CONFIG_BOARD_STM32373C_EVAL=y # Floating Point Options CONFIG_FLOAT=y 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 19662738ce8..0cda8668365 100644 --- a/boards/arm/stm32_min_dev/stm32_min_dev_black_defconfig +++ b/boards/arm/stm32_min_dev/stm32_min_dev_black_defconfig @@ -6,7 +6,6 @@ # CONFIG_ARM=y -CONFIG_BOARD_STM32_MIN_DEV_BLACK=y CONFIG_SOC_SERIES_STM32F1X=y CONFIG_SOC_STM32F103X8=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 0feeb280b43..102cb28fe56 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,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32_MIN_DEV_BLUE=y CONFIG_SOC_SERIES_STM32F1X=y CONFIG_SOC_STM32F103X8=y diff --git a/boards/arm/stm32f030_demo/stm32f030_demo_defconfig b/boards/arm/stm32f030_demo/stm32f030_demo_defconfig index 12b69a078ea..9ec7b184d97 100644 --- a/boards/arm/stm32f030_demo/stm32f030_demo_defconfig +++ b/boards/arm/stm32f030_demo/stm32f030_demo_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration CONFIG_SOC_STM32F030X4=y -CONFIG_BOARD_STM32F030_DEMO=y # General Kernel Options CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 diff --git a/boards/arm/stm32f072_eval/stm32f072_eval_defconfig b/boards/arm/stm32f072_eval/stm32f072_eval_defconfig index b93a8a15a80..ab808ffe908 100644 --- a/boards/arm/stm32f072_eval/stm32f072_eval_defconfig +++ b/boards/arm/stm32f072_eval/stm32f072_eval_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration CONFIG_SOC_STM32F072XB=y -CONFIG_BOARD_STM32F072_EVAL=y # General Kernel Options CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 diff --git a/boards/arm/stm32f072b_disco/stm32f072b_disco_defconfig b/boards/arm/stm32f072b_disco/stm32f072b_disco_defconfig index 50d33839611..c964e49989d 100644 --- a/boards/arm/stm32f072b_disco/stm32f072b_disco_defconfig +++ b/boards/arm/stm32f072b_disco/stm32f072b_disco_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration CONFIG_SOC_STM32F072XB=y -CONFIG_BOARD_STM32F072B_DISCO=y # General Kernel Options CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 diff --git a/boards/arm/stm32f0_disco/stm32f0_disco_defconfig b/boards/arm/stm32f0_disco/stm32f0_disco_defconfig index 540ae7db115..bdf29963f59 100644 --- a/boards/arm/stm32f0_disco/stm32f0_disco_defconfig +++ b/boards/arm/stm32f0_disco/stm32f0_disco_defconfig @@ -6,7 +6,6 @@ CONFIG_SOC_SERIES_STM32F0X=y # Platform Configuration CONFIG_SOC_STM32F051X8=y -CONFIG_BOARD_STM32F0_DISCO=y # General Kernel Options CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 diff --git a/boards/arm/stm32f3_disco/stm32f3_disco_defconfig b/boards/arm/stm32f3_disco/stm32f3_disco_defconfig index f11cbeb3801..64ac49abf6b 100644 --- a/boards/arm/stm32f3_disco/stm32f3_disco_defconfig +++ b/boards/arm/stm32f3_disco/stm32f3_disco_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32F3_DISCO=y CONFIG_SOC_SERIES_STM32F3X=y CONFIG_SOC_STM32F303XC=y # 72MHz system clock diff --git a/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig b/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig index 8a7a5b00a98..0b7c179045d 100644 --- a/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig +++ b/boards/arm/stm32f411e_disco/stm32f411e_disco_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32F411E_DISCO=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F411XE=y # 100MHz system clock (highest value to get a precise USB clock should be 96MHz) diff --git a/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig b/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig index aaec7f09fa7..c2e51ec41e8 100644 --- a/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig +++ b/boards/arm/stm32f412g_disco/stm32f412g_disco_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32F412G_DISCO=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F412ZG=y # 100MHz system clock (highest value to get a precise USB clock should be 96MHz) diff --git a/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig b/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig index bfae33a68b4..56dcb815518 100644 --- a/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig +++ b/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32F429I_DISC1=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F429XX=y # 168MHz system clock diff --git a/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig b/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig index 2191fcfabd6..bdd00aa79e4 100644 --- a/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig +++ b/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32F469I_DISCO=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F469XX=y # 180MHz system clock diff --git a/boards/arm/stm32f4_disco/stm32f4_disco_defconfig b/boards/arm/stm32f4_disco/stm32f4_disco_defconfig index 871694a12f7..49cb0bd0970 100644 --- a/boards/arm/stm32f4_disco/stm32f4_disco_defconfig +++ b/boards/arm/stm32f4_disco/stm32f4_disco_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32F4_DISCO=y CONFIG_SOC_SERIES_STM32F4X=y CONFIG_SOC_STM32F407XG=y # 168MHz system clock diff --git a/boards/arm/stm32f723e_disco/stm32f723e_disco_defconfig b/boards/arm/stm32f723e_disco/stm32f723e_disco_defconfig index b2779b4a105..8ce6515720e 100644 --- a/boards/arm/stm32f723e_disco/stm32f723e_disco_defconfig +++ b/boards/arm/stm32f723e_disco/stm32f723e_disco_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32F723E_DISCO=y CONFIG_SOC_SERIES_STM32F7X=y CONFIG_SOC_STM32F723XX=y # 216MHz system clock diff --git a/boards/arm/stm32f746g_disco/stm32f746g_disco_defconfig b/boards/arm/stm32f746g_disco/stm32f746g_disco_defconfig index 788e0416656..e7f6ff38774 100644 --- a/boards/arm/stm32f746g_disco/stm32f746g_disco_defconfig +++ b/boards/arm/stm32f746g_disco/stm32f746g_disco_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32F746G_DISCO=y CONFIG_SOC_SERIES_STM32F7X=y CONFIG_SOC_STM32F746XX=y # 216MHz system clock diff --git a/boards/arm/stm32f769i_disco/stm32f769i_disco_defconfig b/boards/arm/stm32f769i_disco/stm32f769i_disco_defconfig index fbb32948bf7..e54c8511a72 100644 --- a/boards/arm/stm32f769i_disco/stm32f769i_disco_defconfig +++ b/boards/arm/stm32f769i_disco/stm32f769i_disco_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32F769I_DISCO=y CONFIG_SOC_SERIES_STM32F7X=y CONFIG_SOC_STM32F769XX=y # 216MHz system clock diff --git a/boards/arm/stm32g0316_disco/stm32g0316_disco_defconfig b/boards/arm/stm32g0316_disco/stm32g0316_disco_defconfig index 1bb8ff62b5f..7dff690ea4e 100644 --- a/boards/arm/stm32g0316_disco/stm32g0316_disco_defconfig +++ b/boards/arm/stm32g0316_disco/stm32g0316_disco_defconfig @@ -3,7 +3,6 @@ CONFIG_ARM=y CONFIG_SOC_SERIES_STM32G0X=y CONFIG_SOC_STM32G031XX=y CONFIG_CORTEX_M_SYSTICK=y -CONFIG_BOARD_STM32G0316_DISCO=y # 64MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=64000000 diff --git a/boards/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig b/boards/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig index b2020d49f61..1cf901f2e30 100644 --- a/boards/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig +++ b/boards/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig @@ -1,10 +1,12 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32H747I_DISCO_M4=y 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 pinmux CONFIG_PINMUX=y diff --git a/boards/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig b/boards/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig index 0e2c38aff5a..bc4251277fb 100644 --- a/boards/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig +++ b/boards/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig @@ -1,10 +1,12 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32H747I_DISCO_M7=y 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 pinmux CONFIG_PINMUX=y diff --git a/boards/arm/stm32l1_disco/stm32l1_disco_defconfig b/boards/arm/stm32l1_disco/stm32l1_disco_defconfig index 26c532e6766..5aaae38c657 100644 --- a/boards/arm/stm32l1_disco/stm32l1_disco_defconfig +++ b/boards/arm/stm32l1_disco/stm32l1_disco_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32L1_DISCO=y CONFIG_SOC_SERIES_STM32L1X=y CONFIG_SOC_STM32L151XB=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000 diff --git a/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig b/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig index 3ca1b29bd9b..24acb518160 100644 --- a/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig +++ b/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32L476G_DISCO=y CONFIG_SOC_SERIES_STM32L4X=y CONFIG_SOC_STM32L476XX=y # 80MHz system clock diff --git a/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig b/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig index c1fca5d07c4..0a6b87cd1f5 100644 --- a/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig +++ b/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ARM=y -CONFIG_BOARD_STM32L496G_DISCO=y CONFIG_SOC_SERIES_STM32L4X=y CONFIG_SOC_STM32L496XX=y # 80MHz system clock diff --git a/boards/arm/stm32mp157c_dk2/stm32mp157c_dk2_defconfig b/boards/arm/stm32mp157c_dk2/stm32mp157c_dk2_defconfig index feeae154e8a..9f307f59830 100644 --- a/boards/arm/stm32mp157c_dk2/stm32mp157c_dk2_defconfig +++ b/boards/arm/stm32mp157c_dk2/stm32mp157c_dk2_defconfig @@ -1,5 +1,4 @@ CONFIG_ARM=y -CONFIG_BOARD_STM32MP157C_DK2=y CONFIG_SOC_SERIES_STM32MP1X=y CONFIG_SOC_STM32MP15_M4=y # 209 MHz system clock (mlhclk_ck) diff --git a/boards/arm/stm32vl_disco/stm32vl_disco_defconfig b/boards/arm/stm32vl_disco/stm32vl_disco_defconfig index 6e510d53669..bff33344f0d 100644 --- a/boards/arm/stm32vl_disco/stm32vl_disco_defconfig +++ b/boards/arm/stm32vl_disco/stm32vl_disco_defconfig @@ -5,7 +5,6 @@ CONFIG_ARM=y # Platform Configuration CONFIG_SOC_SERIES_STM32F1X=y CONFIG_SOC_STM32F100XB=y -CONFIG_BOARD_STM32VL_DISCO=y # 24MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=24000000