[U-Boot] powerpc: Drop unreferenced CONFIG_* defines

Message ID 20180113002137.21696-1-tuomas@tuxera.com
State Accepted
Commit 7dd97af52309364f7ec8305a86507ad86e524b62
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot] powerpc: Drop unreferenced CONFIG_* defines
Related show

Commit Message

Tuomas Tynkkynen Jan. 13, 2018, 12:21 a.m.
The following config symbols are only defined once and never referenced
anywhere else:

CONFIG_CYRUS
CONFIG_IDS8313
CONFIG_MPC8308_P1M
CONFIG_MPC8308RDB
CONFIG_MPC8349EMDS
CONFIG_MPC8349ITXGP
CONFIG_SBC8349
CONFIG_SBC8548
CONFIG_SBC8641D
CONFIG_TQM834X
CONFIG_VE8313
CONFIG_XPEDITE5140
CONFIG_XPEDITE5200
CONFIG_XPEDITE550X

Most of them are config symbols named after the respective boards which
seems to have been a standard practice at some point.

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
---
 board/freescale/mpc8349itx/README |  1 -
 configs/MPC8349ITXGP_defconfig    |  2 +-
 include/configs/MPC8308RDB.h      |  1 -
 include/configs/MPC8349EMDS.h     |  1 -
 include/configs/TQM834x.h         |  1 -
 include/configs/cyrus.h           |  2 --
 include/configs/ids8313.h         |  1 -
 include/configs/mpc8308_p1m.h     |  1 -
 include/configs/sbc8349.h         |  1 -
 include/configs/sbc8548.h         |  1 -
 include/configs/sbc8641d.h        |  1 -
 include/configs/ve8313.h          |  1 -
 include/configs/xpedite517x.h     |  1 -
 include/configs/xpedite520x.h     |  1 -
 include/configs/xpedite550x.h     |  1 -
 scripts/config_whitelist.txt      | 14 --------------
 16 files changed, 1 insertion(+), 30 deletions(-)

Comments

Mario Six Jan. 16, 2018, 12:53 p.m. | #1
Hi Tuomas,

On Sat, Jan 13, 2018 at 1:21 AM, Tuomas Tynkkynen <tuomas@tuxera.com> wrote:
> The following config symbols are only defined once and never referenced
> anywhere else:
>
> CONFIG_CYRUS
> CONFIG_IDS8313
> CONFIG_MPC8308_P1M
> CONFIG_MPC8308RDB
> CONFIG_MPC8349EMDS
> CONFIG_MPC8349ITXGP
> CONFIG_SBC8349
> CONFIG_SBC8548
> CONFIG_SBC8641D
> CONFIG_TQM834X
> CONFIG_VE8313
> CONFIG_XPEDITE5140
> CONFIG_XPEDITE5200
> CONFIG_XPEDITE550X
>
> Most of them are config symbols named after the respective boards which
> seems to have been a standard practice at some point.
>
> Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
> ---
>  board/freescale/mpc8349itx/README |  1 -
>  configs/MPC8349ITXGP_defconfig    |  2 +-
>  include/configs/MPC8308RDB.h      |  1 -
>  include/configs/MPC8349EMDS.h     |  1 -
>  include/configs/TQM834x.h         |  1 -
>  include/configs/cyrus.h           |  2 --
>  include/configs/ids8313.h         |  1 -
>  include/configs/mpc8308_p1m.h     |  1 -
>  include/configs/sbc8349.h         |  1 -
>  include/configs/sbc8548.h         |  1 -
>  include/configs/sbc8641d.h        |  1 -
>  include/configs/ve8313.h          |  1 -
>  include/configs/xpedite517x.h     |  1 -
>  include/configs/xpedite520x.h     |  1 -
>  include/configs/xpedite550x.h     |  1 -
>  scripts/config_whitelist.txt      | 14 --------------
>  16 files changed, 1 insertion(+), 30 deletions(-)
>
> diff --git a/board/freescale/mpc8349itx/README b/board/freescale/mpc8349itx/README
> index 48bbd50356..3012b83737 100644
> --- a/board/freescale/mpc8349itx/README
> +++ b/board/freescale/mpc8349itx/README
> @@ -91,7 +91,6 @@ Freescale MPC8349E-mITX and MPC8349E-mITX-GP Boards
>         CONFIG_MPC83xx          MPC83xx family
>         CONFIG_MPC8349          MPC8349 specific
>         CONFIG_MPC8349ITX               MPC8349E-mITX
> -       CONFIG_MPC8349ITXGP             MPC8349E-mITX-GP
>
>  5. Compilation
>
> diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
> index 319141de1b..97dc8e7a80 100644
> --- a/configs/MPC8349ITXGP_defconfig
> +++ b/configs/MPC8349ITXGP_defconfig
> @@ -3,7 +3,7 @@ CONFIG_MPC83xx=y
>  CONFIG_TARGET_MPC8349ITX=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITXGP,SYS_TEXT_BASE=0xFE000000"
> +CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFE000000"
>  CONFIG_BOOTDELAY=6
>  CONFIG_USE_BOOTARGS=y
>  CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitxgp:eth0:off console=ttyS0,115200"
> diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
> index bd0cb6fddc..d348ec9367 100644
> --- a/include/configs/MPC8308RDB.h
> +++ b/include/configs/MPC8308RDB.h
> @@ -15,7 +15,6 @@
>  #define CONFIG_E300            1 /* E300 family */
>  #define CONFIG_MPC830x         1 /* MPC830x family */
>  #define CONFIG_MPC8308         1 /* MPC8308 CPU specific */
> -#define CONFIG_MPC8308RDB      1 /* MPC8308RDB board specific */
>
>  #define        CONFIG_SYS_TEXT_BASE    0xFE000000
>
> diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
> index 9b906a7c77..c7a5ee0aaf 100644
> --- a/include/configs/MPC8349EMDS.h
> +++ b/include/configs/MPC8349EMDS.h
> @@ -19,7 +19,6 @@
>  #define CONFIG_E300            1       /* E300 Family */
>  #define CONFIG_MPC834x         1       /* MPC834x family */
>  #define CONFIG_MPC8349         1       /* MPC8349 specific */
> -#define CONFIG_MPC8349EMDS     1       /* MPC8349EMDS board specific */
>
>  #define        CONFIG_SYS_TEXT_BASE    0xFE000000
>
> diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
> index 0c6bcae33c..9d27358031 100644
> --- a/include/configs/TQM834x.h
> +++ b/include/configs/TQM834x.h
> @@ -18,7 +18,6 @@
>  #define CONFIG_E300            1       /* E300 Family */
>  #define CONFIG_MPC834x         1       /* MPC834x specific */
>  #define CONFIG_MPC8349         1       /* MPC8349 specific */
> -#define CONFIG_TQM834X         1       /* TQM834X board specific */
>
>  #define        CONFIG_SYS_TEXT_BASE    0x80000000
>
> diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
> index e413b5158c..3da91e80c8 100644
> --- a/include/configs/cyrus.h
> +++ b/include/configs/cyrus.h
> @@ -7,8 +7,6 @@
>  #ifndef __CONFIG_H
>  #define __CONFIG_H
>
> -#define CONFIG_CYRUS
> -
>  #if !defined(CONFIG_ARCH_P5020) && !defined(CONFIG_ARCH_P5040)
>  #error Must call Cyrus CONFIG with a specific CPU enabled.
>  #endif
> diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
> index b43c8c711e..12eb07d1f7 100644
> --- a/include/configs/ids8313.h
> +++ b/include/configs/ids8313.h
> @@ -17,7 +17,6 @@
>   */
>  #define CONFIG_MPC831x
>  #define CONFIG_MPC8313
> -#define CONFIG_IDS8313
>
>  #define CONFIG_FSL_ELBC
>
> diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
> index f97773146a..69c4309139 100644
> --- a/include/configs/mpc8308_p1m.h
> +++ b/include/configs/mpc8308_p1m.h
> @@ -15,7 +15,6 @@
>  #define CONFIG_E300            1 /* E300 family */
>  #define CONFIG_MPC830x         1 /* MPC830x family */
>  #define CONFIG_MPC8308         1 /* MPC8308 CPU specific */
> -#define CONFIG_MPC8308_P1M     1 /* mpc8308_p1m board specific */
>
>  #ifndef CONFIG_SYS_TEXT_BASE
>  #define CONFIG_SYS_TEXT_BASE   0xFC000000
> diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
> index 328cdf4757..7f1620db02 100644
> --- a/include/configs/sbc8349.h
> +++ b/include/configs/sbc8349.h
> @@ -21,7 +21,6 @@
>  #define CONFIG_E300            1       /* E300 Family */
>  #define CONFIG_MPC834x         1       /* MPC834x family */
>  #define CONFIG_MPC8349         1       /* MPC8349 specific */
> -#define CONFIG_SBC8349         1       /* WRS SBC8349 board specific */
>
>  #define        CONFIG_SYS_TEXT_BASE    0xFF800000
>
> diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
> index a2a715b99d..041e69e1f7 100644
> --- a/include/configs/sbc8548.h
> +++ b/include/configs/sbc8548.h
> @@ -36,7 +36,6 @@
>  /*
>   * High Level Configuration Options
>   */
> -#define CONFIG_SBC8548         1       /* SBC8548 board specific */
>
>  /*
>   * If you want to boot from the SODIMM flash, instead of the soldered
> diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
> index 817c9d920d..03709adb2d 100644
> --- a/include/configs/sbc8641d.h
> +++ b/include/configs/sbc8641d.h
> @@ -21,7 +21,6 @@
>  #define __CONFIG_H
>
>  /* High Level Configuration Options */
> -#define CONFIG_SBC8641D                1       /* SBC8641D board specific */
>  #define CONFIG_MP              1       /* support multiple processors */
>  #define CONFIG_LINUX_RESET_VEC  0x100   /* Reset vector used by Linux */
>
> diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
> index 3ac11ccb8f..94a59f3e90 100644
> --- a/include/configs/ve8313.h
> +++ b/include/configs/ve8313.h
> @@ -19,7 +19,6 @@
>  #define CONFIG_E300            1
>  #define CONFIG_MPC831x         1
>  #define CONFIG_MPC8313         1
> -#define CONFIG_VE8313          1
>
>  #ifndef CONFIG_SYS_TEXT_BASE
>  #define CONFIG_SYS_TEXT_BASE   0xfe000000
> diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
> index 4326984b06..f95d47a9a0 100644
> --- a/include/configs/xpedite517x.h
> +++ b/include/configs/xpedite517x.h
> @@ -14,7 +14,6 @@
>  /*
>   * High Level Configuration Options
>   */
> -#define CONFIG_XPEDITE5140     1       /* MPC8641HPCN board specific */
>  #define CONFIG_SYS_BOARD_NAME  "XPedite5170"
>  #define CONFIG_SYS_FORM_3U_VPX 1
>  #define CONFIG_LINUX_RESET_VEC 0x100   /* Reset vector used by Linux */
> diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
> index 5a56162e7c..c0df5ef02b 100644
> --- a/include/configs/xpedite520x.h
> +++ b/include/configs/xpedite520x.h
> @@ -14,7 +14,6 @@
>  /*
>   * High Level Configuration Options
>   */
> -#define CONFIG_XPEDITE5200     1
>  #define CONFIG_SYS_BOARD_NAME  "XPedite5200"
>  #define CONFIG_SYS_FORM_PMC_XMC        1
>  #define CONFIG_BOARD_EARLY_INIT_R      /* Call board_pre_init */
> diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
> index 624e9a82d0..b5e8231873 100644
> --- a/include/configs/xpedite550x.h
> +++ b/include/configs/xpedite550x.h
> @@ -14,7 +14,6 @@
>  /*
>   * High Level Configuration Options
>   */
> -#define CONFIG_XPEDITE550X     1
>  #define CONFIG_SYS_BOARD_NAME  "XPedite5500"
>  #define CONFIG_SYS_FORM_PMC_XMC        1
>  #define CONFIG_PRPMC_PCI_ALIAS "pci0"  /* Processor PMC interface on pci0 */
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 4160c59a4b..a661882640 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -335,7 +335,6 @@ CONFIG_CSF_SIZE
>  CONFIG_CTL_JTAG
>  CONFIG_CTL_TBE
>  CONFIG_CUSTOMER_BOARD_SUPPORT
> -CONFIG_CYRUS
>  CONFIG_D2NET_V2
>  CONFIG_DA850_AM18X_EVM
>  CONFIG_DA850_EVM_MAX_CPU_CLK
> @@ -1018,7 +1017,6 @@ CONFIG_IDE_PCMCIA
>  CONFIG_IDE_PREINIT
>  CONFIG_IDE_RESET
>  CONFIG_IDE_SWAP_IO
> -CONFIG_IDS8313
>  CONFIG_IDT8T49N222A
>  CONFIG_ID_EEPROM
>  CONFIG_IMA
> @@ -1343,8 +1341,6 @@ CONFIG_MODVERSIONS
>  CONFIG_MONITOR_IS_IN_RAM
>  CONFIG_MP
>  CONFIG_MPC8308
> -CONFIG_MPC8308RDB
> -CONFIG_MPC8308_P1M
>  CONFIG_MPC8309
>  CONFIG_MPC830x
>  CONFIG_MPC8313
> @@ -1355,9 +1351,7 @@ CONFIG_MPC831x
>  CONFIG_MPC832XEMDS
>  CONFIG_MPC832x
>  CONFIG_MPC8349
> -CONFIG_MPC8349EMDS
>  CONFIG_MPC8349ITX
> -CONFIG_MPC8349ITXGP
>  CONFIG_MPC834x
>  CONFIG_MPC8360
>  CONFIG_MPC837XEMDS
> @@ -1835,9 +1829,6 @@ CONFIG_SAR_REG
>  CONFIG_SATA1
>  CONFIG_SATA2
>  CONFIG_SATA_ULI5288
> -CONFIG_SBC8349
> -CONFIG_SBC8548
> -CONFIG_SBC8641D
>  CONFIG_SCF0403_LCD
>  CONFIG_SCIF
>  CONFIG_SCIF_A
> @@ -4702,7 +4693,6 @@ CONFIG_TMU_TIMER
>  CONFIG_TPL_PAD_TO
>  CONFIG_TPM_TIS_BASE_ADDRESS
>  CONFIG_TPS6586X_POWER
> -CONFIG_TQM834X
>  CONFIG_TRACE
>  CONFIG_TRACE_BUFFER_SIZE
>  CONFIG_TRACE_EARLY
> @@ -4908,7 +4898,6 @@ CONFIG_U_QE
>  CONFIG_VAL
>  CONFIG_VAR_SIZE_SPL
>  CONFIG_VCT_NOR
> -CONFIG_VE8313
>  CONFIG_VERY_BIG_RAM
>  CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
>  CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
> @@ -4962,9 +4951,6 @@ CONFIG_XILINX_GPIO
>  CONFIG_XILINX_LL_TEMAC_CLK
>  CONFIG_XILINX_SPI_IDLE_VAL
>  CONFIG_XILINX_TB_WATCHDOG
> -CONFIG_XPEDITE5140
> -CONFIG_XPEDITE5200
> -CONFIG_XPEDITE550X
>  CONFIG_XR16L2751
>  CONFIG_XSENGINE
>  CONFIG_XTFPGA
> --
> 2.15.0
>

For MPC83xx:

Acked-by: Mario Six <mario.six@gdsys.cc>

Best regards,

Mario
Tom Rini Jan. 19, 2018, 9:15 p.m. | #2
On Sat, Jan 13, 2018 at 02:21:37AM +0200, Tuomas Tynkkynen wrote:

> The following config symbols are only defined once and never referenced
> anywhere else:
> 
> CONFIG_CYRUS
> CONFIG_IDS8313
> CONFIG_MPC8308_P1M
> CONFIG_MPC8308RDB
> CONFIG_MPC8349EMDS
> CONFIG_MPC8349ITXGP
> CONFIG_SBC8349
> CONFIG_SBC8548
> CONFIG_SBC8641D
> CONFIG_TQM834X
> CONFIG_VE8313
> CONFIG_XPEDITE5140
> CONFIG_XPEDITE5200
> CONFIG_XPEDITE550X
> 
> Most of them are config symbols named after the respective boards which
> seems to have been a standard practice at some point.
> 
> Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
> Acked-by: Mario Six <mario.six@gdsys.cc>

Applied to u-boot/master, thanks!

Patch

diff --git a/board/freescale/mpc8349itx/README b/board/freescale/mpc8349itx/README
index 48bbd50356..3012b83737 100644
--- a/board/freescale/mpc8349itx/README
+++ b/board/freescale/mpc8349itx/README
@@ -91,7 +91,6 @@  Freescale MPC8349E-mITX and MPC8349E-mITX-GP Boards
 	CONFIG_MPC83xx		MPC83xx family
 	CONFIG_MPC8349		MPC8349 specific
 	CONFIG_MPC8349ITX		MPC8349E-mITX
-	CONFIG_MPC8349ITXGP		MPC8349E-mITX-GP
 
 5. Compilation
 
diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
index 319141de1b..97dc8e7a80 100644
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -3,7 +3,7 @@  CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITXGP,SYS_TEXT_BASE=0xFE000000"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFE000000"
 CONFIG_BOOTDELAY=6
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitxgp:eth0:off console=ttyS0,115200"
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index bd0cb6fddc..d348ec9367 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -15,7 +15,6 @@ 
 #define CONFIG_E300		1 /* E300 family */
 #define CONFIG_MPC830x		1 /* MPC830x family */
 #define CONFIG_MPC8308		1 /* MPC8308 CPU specific */
-#define CONFIG_MPC8308RDB	1 /* MPC8308RDB board specific */
 
 #define	CONFIG_SYS_TEXT_BASE	0xFE000000
 
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 9b906a7c77..c7a5ee0aaf 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -19,7 +19,6 @@ 
 #define CONFIG_E300		1	/* E300 Family */
 #define CONFIG_MPC834x		1	/* MPC834x family */
 #define CONFIG_MPC8349		1	/* MPC8349 specific */
-#define CONFIG_MPC8349EMDS	1	/* MPC8349EMDS board specific */
 
 #define	CONFIG_SYS_TEXT_BASE	0xFE000000
 
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 0c6bcae33c..9d27358031 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -18,7 +18,6 @@ 
 #define CONFIG_E300		1	/* E300 Family */
 #define CONFIG_MPC834x		1	/* MPC834x specific */
 #define CONFIG_MPC8349		1	/* MPC8349 specific */
-#define CONFIG_TQM834X		1	/* TQM834X board specific */
 
 #define	CONFIG_SYS_TEXT_BASE	0x80000000
 
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index e413b5158c..3da91e80c8 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -7,8 +7,6 @@ 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_CYRUS
-
 #if !defined(CONFIG_ARCH_P5020) && !defined(CONFIG_ARCH_P5040)
 #error Must call Cyrus CONFIG with a specific CPU enabled.
 #endif
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index b43c8c711e..12eb07d1f7 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -17,7 +17,6 @@ 
  */
 #define CONFIG_MPC831x
 #define CONFIG_MPC8313
-#define CONFIG_IDS8313
 
 #define CONFIG_FSL_ELBC
 
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index f97773146a..69c4309139 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -15,7 +15,6 @@ 
 #define CONFIG_E300		1 /* E300 family */
 #define CONFIG_MPC830x		1 /* MPC830x family */
 #define CONFIG_MPC8308		1 /* MPC8308 CPU specific */
-#define CONFIG_MPC8308_P1M	1 /* mpc8308_p1m board specific */
 
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0xFC000000
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 328cdf4757..7f1620db02 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -21,7 +21,6 @@ 
 #define CONFIG_E300		1	/* E300 Family */
 #define CONFIG_MPC834x		1	/* MPC834x family */
 #define CONFIG_MPC8349		1	/* MPC8349 specific */
-#define CONFIG_SBC8349		1	/* WRS SBC8349 board specific */
 
 #define	CONFIG_SYS_TEXT_BASE	0xFF800000
 
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index a2a715b99d..041e69e1f7 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -36,7 +36,6 @@ 
 /*
  * High Level Configuration Options
  */
-#define CONFIG_SBC8548		1	/* SBC8548 board specific */
 
 /*
  * If you want to boot from the SODIMM flash, instead of the soldered
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 817c9d920d..03709adb2d 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -21,7 +21,6 @@ 
 #define __CONFIG_H
 
 /* High Level Configuration Options */
-#define CONFIG_SBC8641D		1	/* SBC8641D board specific */
 #define CONFIG_MP		1	/* support multiple processors */
 #define CONFIG_LINUX_RESET_VEC  0x100   /* Reset vector used by Linux */
 
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 3ac11ccb8f..94a59f3e90 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -19,7 +19,6 @@ 
 #define CONFIG_E300		1
 #define CONFIG_MPC831x		1
 #define CONFIG_MPC8313		1
-#define CONFIG_VE8313		1
 
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0xfe000000
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 4326984b06..f95d47a9a0 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -14,7 +14,6 @@ 
 /*
  * High Level Configuration Options
  */
-#define CONFIG_XPEDITE5140	1	/* MPC8641HPCN board specific */
 #define CONFIG_SYS_BOARD_NAME	"XPedite5170"
 #define CONFIG_SYS_FORM_3U_VPX	1
 #define CONFIG_LINUX_RESET_VEC	0x100	/* Reset vector used by Linux */
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 5a56162e7c..c0df5ef02b 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -14,7 +14,6 @@ 
 /*
  * High Level Configuration Options
  */
-#define CONFIG_XPEDITE5200	1
 #define CONFIG_SYS_BOARD_NAME	"XPedite5200"
 #define CONFIG_SYS_FORM_PMC_XMC	1
 #define CONFIG_BOARD_EARLY_INIT_R	/* Call board_pre_init */
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 624e9a82d0..b5e8231873 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -14,7 +14,6 @@ 
 /*
  * High Level Configuration Options
  */
-#define CONFIG_XPEDITE550X	1
 #define CONFIG_SYS_BOARD_NAME	"XPedite5500"
 #define CONFIG_SYS_FORM_PMC_XMC	1
 #define CONFIG_PRPMC_PCI_ALIAS	"pci0"	/* Processor PMC interface on pci0 */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4160c59a4b..a661882640 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -335,7 +335,6 @@  CONFIG_CSF_SIZE
 CONFIG_CTL_JTAG
 CONFIG_CTL_TBE
 CONFIG_CUSTOMER_BOARD_SUPPORT
-CONFIG_CYRUS
 CONFIG_D2NET_V2
 CONFIG_DA850_AM18X_EVM
 CONFIG_DA850_EVM_MAX_CPU_CLK
@@ -1018,7 +1017,6 @@  CONFIG_IDE_PCMCIA
 CONFIG_IDE_PREINIT
 CONFIG_IDE_RESET
 CONFIG_IDE_SWAP_IO
-CONFIG_IDS8313
 CONFIG_IDT8T49N222A
 CONFIG_ID_EEPROM
 CONFIG_IMA
@@ -1343,8 +1341,6 @@  CONFIG_MODVERSIONS
 CONFIG_MONITOR_IS_IN_RAM
 CONFIG_MP
 CONFIG_MPC8308
-CONFIG_MPC8308RDB
-CONFIG_MPC8308_P1M
 CONFIG_MPC8309
 CONFIG_MPC830x
 CONFIG_MPC8313
@@ -1355,9 +1351,7 @@  CONFIG_MPC831x
 CONFIG_MPC832XEMDS
 CONFIG_MPC832x
 CONFIG_MPC8349
-CONFIG_MPC8349EMDS
 CONFIG_MPC8349ITX
-CONFIG_MPC8349ITXGP
 CONFIG_MPC834x
 CONFIG_MPC8360
 CONFIG_MPC837XEMDS
@@ -1835,9 +1829,6 @@  CONFIG_SAR_REG
 CONFIG_SATA1
 CONFIG_SATA2
 CONFIG_SATA_ULI5288
-CONFIG_SBC8349
-CONFIG_SBC8548
-CONFIG_SBC8641D
 CONFIG_SCF0403_LCD
 CONFIG_SCIF
 CONFIG_SCIF_A
@@ -4702,7 +4693,6 @@  CONFIG_TMU_TIMER
 CONFIG_TPL_PAD_TO
 CONFIG_TPM_TIS_BASE_ADDRESS
 CONFIG_TPS6586X_POWER
-CONFIG_TQM834X
 CONFIG_TRACE
 CONFIG_TRACE_BUFFER_SIZE
 CONFIG_TRACE_EARLY
@@ -4908,7 +4898,6 @@  CONFIG_U_QE
 CONFIG_VAL
 CONFIG_VAR_SIZE_SPL
 CONFIG_VCT_NOR
-CONFIG_VE8313
 CONFIG_VERY_BIG_RAM
 CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
 CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
@@ -4962,9 +4951,6 @@  CONFIG_XILINX_GPIO
 CONFIG_XILINX_LL_TEMAC_CLK
 CONFIG_XILINX_SPI_IDLE_VAL
 CONFIG_XILINX_TB_WATCHDOG
-CONFIG_XPEDITE5140
-CONFIG_XPEDITE5200
-CONFIG_XPEDITE550X
 CONFIG_XR16L2751
 CONFIG_XSENGINE
 CONFIG_XTFPGA