Convert CONFIG_88F5182 et al to Kconfig

This converts the following to Kconfig:
   CONFIG_88F5182
   CONFIG_BOARD_IS_OPENRD_BASE
   CONFIG_BOARD_IS_OPENRD_CLIENT
   CONFIG_BOARD_IS_OPENRD_ULTIMATE
   CONFIG_D2NET_V2
   CONFIG_FEROCEON
   CONFIG_FEROCEON_88FR131
   CONFIG_INETSPACE_V2
   CONFIG_KW88F6192
   CONFIG_KW88F6281
   CONFIG_KW88F6702
   CONFIG_NET2BIG_V2
   CONFIG_NETSPACE_LITE_V2
   CONFIG_NETSPACE_MAX_V2
   CONFIG_NETSPACE_MINI_V2
   CONFIG_NETSPACE_V2
   CONFIG_SHEEVA_88SV131

At this point mv-plug-common.h is now only an include of mv-common.h so
remove that indirection.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index cb4e9f2..c060cc8 100644 (file)
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -1,66 +1,115 @@
 if ARCH_KIRKWOOD
 
+config FEROCEON_88FR131
+       bool
+
+config KW88F6192
+       bool
+
+config KW88F6281
+       bool
+
+config SHEEVA_88SV131
+       bool
+
 choice
        prompt "Marvell Kirkwood board select"
        optional
 
 config TARGET_OPENRD
        bool "Marvell OpenRD Board"
+       select KW88F6281
+       select SHEEVA_88SV131
 
 config TARGET_DREAMPLUG
        bool "DreamPlug Board"
+       select KW88F6281
+       select SHEEVA_88SV131
 
 config TARGET_DS109
        bool "Synology DS109"
+       select KW88F6281
+       select SHEEVA_88SV131
 
 config TARGET_GURUPLUG
        bool "GuruPlug Board"
+       select KW88F6281
+       select SHEEVA_88SV131
 
 config TARGET_SHEEVAPLUG
        bool "SheevaPlug Board"
+       select FEROCEON_88FR131
+       select KW88F6281
 
 config TARGET_LSXL
        bool "lsxl Board"
+       select FEROCEON_88FR131
+       select KW88F6281
 
 config TARGET_POGO_E02
        bool "pogo_e02 Board"
+       select FEROCEON_88FR131
+       select KW88F6281
 
 config TARGET_DNS325
        bool "dns325 Board"
+       select FEROCEON_88FR131
+       select KW88F6281
 
 config TARGET_ICONNECT
        bool "iconnect Board"
+       select FEROCEON_88FR131
+       select KW88F6281
 
 config TARGET_KM_KIRKWOOD
        bool "KM Kirkwood Board"
+       select FEROCEON_88FR131
+       select KW88F6281
        select VENDOR_KM
 
 config TARGET_NET2BIG_V2
        bool "LaCie 2Big Network v2 NAS Board"
+       select FEROCEON_88FR131
+       select KW88F6281
 
 config TARGET_NETSPACE_V2
        bool "LaCie netspace_v2 Board"
+       select FEROCEON_88FR131
 
 config TARGET_IB62X0
        bool "ib62x0 Board"
+       select FEROCEON_88FR131
+       select KW88F6281
 
 config TARGET_DOCKSTAR
        bool "Dockstar Board"
+       select FEROCEON_88FR131
+       select KW88F6281
 
 config TARGET_GOFLEXHOME
        bool "GoFlex Home Board"
+       select FEROCEON_88FR131
+       select KW88F6281
 
 config TARGET_NAS220
        bool "BlackArmor NAS220"
+       select FEROCEON_88FR131
+       select KW88F6192
 
 config TARGET_NSA310S
        bool "Zyxel NSA310S"
+       select FEROCEON_88FR131
+       select KW88F6192
 
 config TARGET_SBx81LIFKW
        bool "Allied Telesis SBx81GS24/SBx81GT40/SBx81XS6/SBx81XS16"
+       select FEROCEON_88FR131
+       select KW88F6281
 
 config TARGET_SBx81LIFXCAT
        bool "Allied Telesis SBx81GP24/SBx81GT24"
+       select FEROCEON_88FR131
+       select KW88F6281
 
 endchoice
 

diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index 5baa6fb..b8b45a0 100644 (file)
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -1,11 +1,19 @@
 if ARCH_ORION5X
 
+config 88F5182
+       bool
+
+config FEROCEON
+       bool
+
 choice
        prompt "Marvell Orion board select"
        optional
 
 config TARGET_EDMINIV2
        bool "LaCie Ethernet Disk mini V2"
+       select 88F5182
+       select FEROCEON
        select SUPPORT_SPL
 
 endchoice

diff --git a/board/LaCie/net2big_v2/Kconfig b/board/LaCie/net2big_v2/Kconfig
index ba460db..758d25e 100644 (file)
--- a/board/LaCie/net2big_v2/Kconfig
+++ b/board/LaCie/net2big_v2/Kconfig
@@ -1,5 +1,16 @@
 if TARGET_NET2BIG_V2
 
+choice
+       prompt "Board variant"
+
+config D2NET_V2
+       bool "D2NET v2"
+
+config NET2BIG_V2
+       bool "NET2BIG v2"
+
+endchoice
+
 config SYS_BOARD
        default "net2big_v2"
 

diff --git a/board/LaCie/netspace_v2/Kconfig b/board/LaCie/netspace_v2/Kconfig
index 930b822..4eca1d4 100644 (file)
--- a/board/LaCie/netspace_v2/Kconfig
+++ b/board/LaCie/netspace_v2/Kconfig
@@ -1,5 +1,30 @@
 if TARGET_NETSPACE_V2
 
+choice
+       prompt "Board variant"
+
+config INETSPACE_V2
+       bool "INETSPACE v2"
+       select KW88F6281
+
+config NETSPACE_LITE_V2
+       bool "NETSPACE LITE v2"
+       select KW88F6192
+
+config NETSPACE_MAX_V2
+       bool "NETSPACE MAX v2"
+       select KW88F6281
+
+config NETSPACE_MINI_V2
+       bool "NETSPACE MINI v2"
+       select KW88F6192
+
+config NETSPACE_V2
+       bool "NETSPACE v2"
+       select KW88F6281
+
+endchoice
+
 config SYS_BOARD
        default "netspace_v2"
 

diff --git a/board/Marvell/openrd/Kconfig b/board/Marvell/openrd/Kconfig
index 124b66d..dc26ed2 100644 (file)
--- a/board/Marvell/openrd/Kconfig
+++ b/board/Marvell/openrd/Kconfig
@@ -1,5 +1,19 @@
 if TARGET_OPENRD
 
+choice
+       prompt "Board variant"
+
+config BOARD_IS_OPENRD_BASE
+       bool "Base"
+
+config BOARD_IS_OPENRD_CLIENT
+       bool "Client"
+
+config BOARD_IS_OPENRD_ULTIMATE
+       bool "Ultimate"
+
+endchoice
+
 config SYS_BOARD
        default "openrd"
 

diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 32fe1dc..3f27633 100644 (file)
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-d2net"
 CONFIG_IDENT_STRING=" D2 v2"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"

diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index b6ebab0..c3f9be8 100644 (file)
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-is2"
 CONFIG_IDENT_STRING=" IS v2"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"

diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index cc1d81c..083d3e6 100644 (file)
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NET2BIG_V2=y
+CONFIG_NET2BIG_V2=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-net2big"
 CONFIG_IDENT_STRING=" 2Big v2"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"

diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 249ffc6..e671d99 100644 (file)
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
+CONFIG_NETSPACE_LITE_V2=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2lite"
 CONFIG_IDENT_STRING=" NS v2 Lite"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"

diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index e11a6b7..607cb5a 100644 (file)
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
+CONFIG_NETSPACE_MAX_V2=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2max"
 CONFIG_IDENT_STRING=" NS Max v2"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"

diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 7b9c29b..203071d 100644 (file)
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
+CONFIG_NETSPACE_MINI_V2=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2mini"
 CONFIG_IDENT_STRING=" NS v2 Mini"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"

diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index ba0d0ff..84a2389 100644 (file)
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
+CONFIG_NETSPACE_V2=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2"
 CONFIG_IDENT_STRING=" NS v2"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"

diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index 9e048d4..e79649e 100644 (file)
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-base"
 CONFIG_IDENT_STRING="\nOpenRD-Base"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"

diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index 6f9f0a2..9d924f3 100644 (file)
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -7,13 +7,13 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_OPENRD=y
+CONFIG_BOARD_IS_OPENRD_CLIENT=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-client"
 CONFIG_IDENT_STRING="\nOpenRD-Client"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"

diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index b587963..7c2e41e 100644 (file)
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -7,13 +7,13 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_OPENRD=y
+CONFIG_BOARD_IS_OPENRD_ULTIMATE=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-ultimate"
 CONFIG_IDENT_STRING="\nOpenRD-Ultimate"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"

diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index 782b16f..3ebeccc 100644 (file)
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -9,8 +9,6 @@
 /*
  * High Level Configuration Options (easy to change)
  */
-#define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_SYS_KWD_CONFIG  $(CONFIG_BOARDDIR)/kwbimage.cfg
 
 /* additions for new ARM relocation support */

diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index e4666e1..53a6bdf 100644 (file)
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -9,8 +9,6 @@
 /*
  * High Level Configuration Options (easy to change)
  */
-#define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_SYS_KWD_CONFIG  $(CONFIG_BOARDDIR)/kwbimage.cfg
 
 /* additions for new ARM relocation support */

diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 8e298dd..e35c16a 100644 (file)
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -12,12 +12,6 @@
 #ifndef _CONFIG_DNS325_H
 #define _CONFIG_DNS325_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KW88F6281               /* SOC Name */
-
 #include "mv-common.h"
 
 /* Remove or override few declarations from mv-common.h */

diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 8a5daf4..0ad04ee 100644 (file)
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -12,12 +12,6 @@
 #define _CONFIG_DOCKSTAR_H
 
 /*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KW88F6281       1       /* SOC Name */
-
-/*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros
  */

diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 61b1e0f..beea234 100644 (file)
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -11,12 +11,7 @@
 #ifndef _CONFIG_DREAMPLUG_H
 #define _CONFIG_DREAMPLUG_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-
-#include "mv-plug-common.h"
+#include "mv-common.h"
 
 /*
  *  Environment variables configurations

diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index c57461c..8553ea0 100644 (file)
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -11,12 +11,7 @@
 #ifndef _CONFIG_DS109_H
 #define _CONFIG_DS109_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-
-#include "mv-plug-common.h"
+#include "mv-common.h"
 
 /*
  *  Environment variables configurations

diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 6b487b3..e20e058 100644 (file)
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -28,9 +28,6 @@
  * High Level Configuration Options (easy to change)
  */
 
-#define CONFIG_FEROCEON                1       /* CPU Core subversion */
-#define CONFIG_88F5182         1       /* SOC Name */
-
 #include <asm/arch/orion5x.h>
 /*
  * CLKs configurations

diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 269178c..90e37d9 100644 (file)
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -15,12 +15,6 @@
 #define _CONFIG_GOFLEXHOME_H
 
 /*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KW88F6281       1       /* SOC Name */
-
-/*
  * Default GPIO configuration and LED status
  */
 #define GOFLEXHOME_OE_LOW               (~(0))

diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index e51f3f2..25c5a97 100644 (file)
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -9,20 +9,7 @@
 #ifndef _CONFIG_GURUPLUG_H
 #define _CONFIG_GURUPLUG_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-
-/*
- * Standard filesystems
- */
-
-/*
- * mv-plug-common.h should be defined after CMD configs since it used them
- * to enable certain macros
- */
-#include "mv-plug-common.h"
+#include "mv-common.h"
 
 /*
  *  Environment variables configurations

diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 75bb073..9783fd8 100644 (file)
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -8,12 +8,6 @@
 #ifndef _CONFIG_IB62x0_H
 #define _CONFIG_IB62x0_H
 
-/*
- * High level configuration options
- */
-#define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KW88F6281               /* SOC Name */
-
 #include "mv-common.h"
 
 /*

diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 4903b92..f1aad1e 100644 (file)
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -8,12 +8,6 @@
 #ifndef _CONFIG_ICONNECT_H
 #define _CONFIG_ICONNECT_H
 
-/*
- * High level configuration options
- */
-#define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KW88F6281               /* SOC Name */
-
 #include "mv-common.h"
 
 /*

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index cca624e..6501884 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -19,12 +19,6 @@
 #ifndef _CONFIG_KM_ARM_H
 #define _CONFIG_KM_ARM_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KW88F6281               /* SOC Name */
-
 #define CONFIG_NAND_ECC_BCH
 
 /* include common defines/options for all Keymile boards */

diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 6180563..d6c5425 100644 (file)
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -7,17 +7,6 @@
 #define _CONFIG_LACIE_KW_H
 
 /*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-/* SoC name */
-#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
-#define CONFIG_KW88F6192
-#else
-#define CONFIG_KW88F6281
-#endif
-
-/*
  * SDRAM configuration
  */
 

diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 7294a3c..5891a1d 100644 (file)
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -21,8 +21,6 @@
 /*
  * General configuration options
  */
-#define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KW88F6281               /* SOC Name */
 
 #define CONFIG_KIRKWOOD_GPIO
 

diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h
deleted file mode 100644 (file)
index d38d987..0000000
--- a/include/configs/mv-plug-common.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2009-2015
- * Marvell Semiconductor <www.marvell.com>
- */
-
-#ifndef _CONFIG_MARVELL_PLUG_H
-#define _CONFIG_MARVELL_PLUG_H
-
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_KW88F6281       1       /* SOC Name */
-
-/*
- * mv-common.h should be defined after CMD configs since it used them
- * to enable certain macros
- */
-#include "mv-common.h"
-
-#endif /* _CONFIG_MARVELL_PLUG_H */

diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 9f89cca..12480d9 100644 (file)
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -11,12 +11,6 @@
 #ifndef _CONFIG_NAS220_H
 #define _CONFIG_NAS220_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131                /* #define CPU Core subversion */
-#define CONFIG_KW88F6192               /* SOC Name */
-
 /* power-on led, regulator, sata0, sata1 */
 #define NAS220_GE_OE_VAL_LOW ((1 << 12)|(1 << 14)|(1 << 24)|(1 << 28))
 #define NAS220_GE_OE_VAL_HIGH (0)

diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 54f496f..8cc9ca6 100644 (file)
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -9,11 +9,6 @@
 #ifndef _CONFIG_NSA310S_H
 #define _CONFIG_NSA310S_H
 
-/* high level configuration options */
-#define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KW88F6192               1       /* SOC Name */
-#define CONFIG_KW88F6702               1       /* SOC Name */
-
 #include "mv-common.h"
 
 /* environment variables configuration */

diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index bd27e50..43d0896 100644 (file)
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -13,12 +13,6 @@
 #ifndef _CONFIG_OPENRD_H
 #define _CONFIG_OPENRD_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-#define CONFIG_KW88F6281       1       /* SOC Name */
-
 #include "mv-common.h"
 
 /*

diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 196e362..3e94125 100644 (file)
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -12,12 +12,6 @@
 #ifndef _CONFIG_POGO_E02_H
 #define _CONFIG_POGO_E02_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KW88F6281               /* SOC Name */
-
 #include "mv-common.h"
 
 /*

diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index bb7ce8d..8dba4fc 100644 (file)
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -9,12 +9,7 @@
 #ifndef _CONFIG_SHEEVAPLUG_H
 #define _CONFIG_SHEEVAPLUG_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-
-#include "mv-plug-common.h"
+#include "mv-common.h"
 
 /*
  *  Environment variables configurations

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d69ae70..c1142ac 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,4 +1,3 @@
-CONFIG_88F5182
 CONFIG_A003399_NOR_WORKAROUND
 CONFIG_A008044_WORKAROUND
 CONFIG_AM335X_USB0
@@ -42,9 +41,6 @@ CONFIG_BOARDDIR
 CONFIG_BOARDNAME
 CONFIG_BOARD_COMMON
 CONFIG_BOARD_ECC_SUPPORT
-CONFIG_BOARD_IS_OPENRD_BASE
-CONFIG_BOARD_IS_OPENRD_CLIENT
-CONFIG_BOARD_IS_OPENRD_ULTIMATE
 CONFIG_BOARD_NAME
 CONFIG_BOARD_POSTCLK_INIT
 CONFIG_BOARD_SIZE_LIMIT
@@ -103,7 +99,6 @@ CONFIG_CPU_ARMV8
 CONFIG_CPU_FREQ_HZ
 CONFIG_CQSPI_REF_CLK
 CONFIG_CUSTOMER_BOARD_SUPPORT
-CONFIG_D2NET_V2
 CONFIG_DB_784MP_GP
 CONFIG_DCACHE
 CONFIG_DEBUG
@@ -203,8 +198,6 @@ CONFIG_FEC_ENET_DEV
 CONFIG_FEC_FIXED_SPEED
 CONFIG_FEC_MXC_PHYADDR
 CONFIG_FEC_XCV_TYPE
-CONFIG_FEROCEON
-CONFIG_FEROCEON_88FR131
 CONFIG_FIXED_SDHCI_ALIGNED_BUFFER
 CONFIG_FLASH_BR_PRELIM
 CONFIG_FLASH_CFI_LEGACY
@@ -456,7 +449,6 @@ CONFIG_IMX
 CONFIG_IMX6_PWM_PER_CLK
 CONFIG_IMX_HDMI
 CONFIG_IMX_VIDEO_SKIP
-CONFIG_INETSPACE_V2
 CONFIG_INTERRUPTS
 CONFIG_IODELAY_RECALIBRATION
 CONFIG_IOMUX_LPSR
@@ -519,9 +511,6 @@ CONFIG_KSNET_NETCP_V1_5
 CONFIG_KSNET_SERDES_LANES_PER_SGMII
 CONFIG_KSNET_SERDES_SGMII2_BASE
 CONFIG_KSNET_SERDES_SGMII_BASE
-CONFIG_KW88F6192
-CONFIG_KW88F6281
-CONFIG_KW88F6702
 CONFIG_L1_INIT_RAM
 CONFIG_L2_CACHE
 CONFIG_LAYERSCAPE_NS_ACCESS
@@ -611,13 +600,8 @@ CONFIG_NAND_KMETER1
 CONFIG_NAND_OMAP_GPMC_WSCFG
 CONFIG_NAND_SECBOOT
 CONFIG_NAND_SPL
-CONFIG_NET2BIG_V2
 CONFIG_NETDEV
 CONFIG_NETMASK
-CONFIG_NETSPACE_LITE_V2
-CONFIG_NETSPACE_MAX_V2
-CONFIG_NETSPACE_MINI_V2
-CONFIG_NETSPACE_V2
 CONFIG_NET_RETRY_COUNT
 CONFIG_NEVER_ASSERT_ODT_TO_CPU
 CONFIG_NFS_TIMEOUT
@@ -771,7 +755,6 @@ CONFIG_SET_BOOTARGS
 CONFIG_SET_DFU_ALT_BUF_LEN
 CONFIG_SH73A0
 CONFIG_SH7751_PCI
-CONFIG_SHEEVA_88SV131
 CONFIG_SH_ETHER_ALIGNE_SIZE
 CONFIG_SH_ETHER_BASE_ADDR
 CONFIG_SH_ETHER_CACHE_INVALIDATE