strider: Migrate to CONFIG_TARGET_STRIDER

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>

diff --git a/board/gdsys/common/Makefile b/board/gdsys/common/Makefile
index 67d2b310b30a2e33c9328b2ee6fb34b067cf4628..9090933e345f79bb824a1161350cac11a2837d82 100644 (file)
--- 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 f29376fc9ed8a4ead90c852f5ee4d42d852eaaf1..dc579479f950f5e2957ad0b54f63369681231524 100644 (file)
--- 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 89e0610871e3a473e7ac05dda097627cee6b4322..c42fe8c3ece2356a412e3dc73f0d27d915aa8b69 100644 (file)
--- 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 35197779ea5284fc99cce90c65311d4a71525c67..7c3256a5cb592ff33e19665f3957c1874b58c377 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1899,7 +1899,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