Use the proper CONFIG_TARGET_STRIDER Kconfig option to replace the CONFIG_STRIDER ad-hoc config option.
Signed-off-by: Mario Six mario.six@gdsys.cc
---
v1 -> v2: * Removed config option from whitelist
--- board/gdsys/common/Makefile | 4 ++-- board/gdsys/mpc8308/Makefile | 2 +- include/configs/strider.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/board/gdsys/common/Makefile b/board/gdsys/common/Makefile index 67d2b310b30..9090933e345 100644 --- a/board/gdsys/common/Makefile +++ b/board/gdsys/common/Makefile @@ -11,8 +11,8 @@ obj-$(CONFIG_IOCON) += osd.o mclink.o dp501.o phy.o ch7301.o obj-$(CONFIG_DLVISION_10G) += osd.o dp501.o obj-$(CONFIG_CONTROLCENTERD) += dp501.o obj-$(CONFIG_TARGET_HRCON) += osd.o mclink.o dp501.o phy.o ioep-fpga.o fanctrl.o -obj-$(CONFIG_STRIDER) += mclink.o dp501.o phy.o ioep-fpga.o adv7611.o ch7301.o -obj-$(CONFIG_STRIDER) += fanctrl.o +obj-$(CONFIG_TARGET_STRIDER) += mclink.o dp501.o phy.o ioep-fpga.o adv7611.o ch7301.o +obj-$(CONFIG_TARGET_STRIDER) += fanctrl.o obj-$(CONFIG_STRIDER_CON) += osd.o obj-$(CONFIG_STRIDER_CON_DP) += osd.o
diff --git a/board/gdsys/mpc8308/Makefile b/board/gdsys/mpc8308/Makefile index f29376fc9ed..dc579479f95 100644 --- a/board/gdsys/mpc8308/Makefile +++ b/board/gdsys/mpc8308/Makefile @@ -5,4 +5,4 @@
obj-y := mpc8308.o sdram.o obj-$(CONFIG_TARGET_HRCON) += hrcon.o -obj-$(CONFIG_STRIDER) += strider.o +obj-$(CONFIG_TARGET_STRIDER) += strider.o diff --git a/include/configs/strider.h b/include/configs/strider.h index 89e0610871e..c42fe8c3ece 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -13,7 +13,6 @@ */ #define CONFIG_E300 1 /* E300 family */ #define CONFIG_MPC83xx 1 /* MPC83xx family */ -#define CONFIG_STRIDER 1 /* STRIDER board specific */
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 68d4b956d7d..087d9c59235 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1952,7 +1952,6 @@ CONFIG_STANDALONE_LOAD_ADDR CONFIG_STATIC_BOARD_REV CONFIG_STD_DEVICES_SETTINGS CONFIG_STM32_FLASH -CONFIG_STRIDER CONFIG_STRIDER_CON CONFIG_STRIDER_CON_DP CONFIG_STRIDER_CPU