leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert CONFIG_88F5182 et al to Kconfig

Browse Source 
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>
This commit is contained in:
Tom Rini 2021-12-17 18:08:44 -05:00
parent 8cca60a2cb
commit f98b3be287
36 changed files with 118 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
arch/arm/mach-kirkwood/Kconfig
View File

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

8
arch/arm/mach-orion5x/Kconfig
View File

@ -1,11 +1,19 @@
if ARCH_ORION5X if ARCH_ORION5X
config 88F5182
bool
config FEROCEON
bool
choice choice
prompt "Marvell Orion board select" prompt "Marvell Orion board select"
optional optional
config TARGET_EDMINIV2 config TARGET_EDMINIV2
bool "LaCie Ethernet Disk mini V2" bool "LaCie Ethernet Disk mini V2"
select 88F5182
select FEROCEON
select SUPPORT_SPL select SUPPORT_SPL
endchoice endchoice

11
board/LaCie/net2big_v2/Kconfig
View File

@ -1,5 +1,16 @@
if TARGET_NET2BIG_V2 if TARGET_NET2BIG_V2
choice
prompt "Board variant"
config D2NET_V2
bool "D2NET v2"
config NET2BIG_V2
bool "NET2BIG v2"
endchoice
config SYS_BOARD config SYS_BOARD
default "net2big_v2" default "net2big_v2"

25
board/LaCie/netspace_v2/Kconfig
View File

@ -1,5 +1,30 @@
if TARGET_NETSPACE_V2 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 config SYS_BOARD
default "netspace_v2" default "netspace_v2"

14
board/Marvell/openrd/Kconfig
View File

@ -1,5 +1,19 @@
if TARGET_OPENRD 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 config SYS_BOARD
default "openrd" default "openrd"

1
configs/d2net_v2_defconfig
View File

@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-d2net"
CONFIG_IDENT_STRING=" D2 v2" CONFIG_IDENT_STRING=" D2 v2"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_SYS_LOAD_ADDR=0x800000
CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_BOOTARGS="console=ttyS0,115200"

1
configs/inetspace_v2_defconfig
View File

@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-is2"
CONFIG_IDENT_STRING=" IS v2" CONFIG_IDENT_STRING=" IS v2"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_SYS_LOAD_ADDR=0x800000
CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_BOOTARGS="console=ttyS0,115200"

2
configs/net2big_v2_defconfig
View File

@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_TARGET_NET2BIG_V2=y CONFIG_TARGET_NET2BIG_V2=y
CONFIG_NET2BIG_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000
CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_OFFSET=0x70000
CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000
@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-net2big"
CONFIG_IDENT_STRING=" 2Big v2" CONFIG_IDENT_STRING=" 2Big v2"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_SYS_LOAD_ADDR=0x800000
CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_BOOTARGS="console=ttyS0,115200"

2
configs/netspace_lite_v2_defconfig
View File

@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_TARGET_NETSPACE_V2=y CONFIG_TARGET_NETSPACE_V2=y
CONFIG_NETSPACE_LITE_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000
CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_OFFSET=0x70000
CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000
@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2lite"
CONFIG_IDENT_STRING=" NS v2 Lite" CONFIG_IDENT_STRING=" NS v2 Lite"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_SYS_LOAD_ADDR=0x800000
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_BOOTARGS="console=ttyS0,115200"

2
configs/netspace_max_v2_defconfig
View File

@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_TARGET_NETSPACE_V2=y CONFIG_TARGET_NETSPACE_V2=y
CONFIG_NETSPACE_MAX_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000
CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_OFFSET=0x70000
CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000
@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2max"
CONFIG_IDENT_STRING=" NS Max v2" CONFIG_IDENT_STRING=" NS Max v2"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_SYS_LOAD_ADDR=0x800000
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_BOOTARGS="console=ttyS0,115200"

2
configs/netspace_mini_v2_defconfig
View File

@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_TARGET_NETSPACE_V2=y CONFIG_TARGET_NETSPACE_V2=y
CONFIG_NETSPACE_MINI_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000
CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_OFFSET=0x70000
CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000
@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2mini"
CONFIG_IDENT_STRING=" NS v2 Mini" CONFIG_IDENT_STRING=" NS v2 Mini"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_SYS_LOAD_ADDR=0x800000
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_BOOTARGS="console=ttyS0,115200"

2
configs/netspace_v2_defconfig
View File

@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_TARGET_NETSPACE_V2=y CONFIG_TARGET_NETSPACE_V2=y
CONFIG_NETSPACE_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000
CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_OFFSET=0x70000
CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000
@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2"
CONFIG_IDENT_STRING=" NS v2" CONFIG_IDENT_STRING=" NS v2"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_SYS_LOAD_ADDR=0x800000
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_BOOTARGS="console=ttyS0,115200"

1
configs/openrd_base_defconfig
View File

@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-base"
CONFIG_IDENT_STRING="\nOpenRD-Base" CONFIG_IDENT_STRING="\nOpenRD-Base"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_SYS_LOAD_ADDR=0x800000
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTCOMMAND=y CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;" CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"

2
configs/openrd_client_defconfig
View File

@ -7,13 +7,13 @@ CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_TARGET_OPENRD=y CONFIG_TARGET_OPENRD=y
CONFIG_BOARD_IS_OPENRD_CLIENT=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x80000 CONFIG_ENV_OFFSET=0x80000
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-client" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-client"
CONFIG_IDENT_STRING="\nOpenRD-Client" CONFIG_IDENT_STRING="\nOpenRD-Client"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_SYS_LOAD_ADDR=0x800000
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTCOMMAND=y CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;" CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"

2
configs/openrd_ultimate_defconfig
View File

@ -7,13 +7,13 @@ CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_TARGET_OPENRD=y CONFIG_TARGET_OPENRD=y
CONFIG_BOARD_IS_OPENRD_ULTIMATE=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x80000 CONFIG_ENV_OFFSET=0x80000
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-ultimate" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-ultimate"
CONFIG_IDENT_STRING="\nOpenRD-Ultimate" CONFIG_IDENT_STRING="\nOpenRD-Ultimate"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_SYS_LOAD_ADDR=0x800000
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTCOMMAND=y CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;" CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"

2
include/configs/SBx81LIFKW.h
View File

@ -9,8 +9,6 @@
/* /*
* High Level Configuration Options (easy to change) * 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 #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg
/* additions for new ARM relocation support */ /* additions for new ARM relocation support */

2
include/configs/SBx81LIFXCAT.h
View File

@ -9,8 +9,6 @@
/* /*
* High Level Configuration Options (easy to change) * 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 #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg
/* additions for new ARM relocation support */ /* additions for new ARM relocation support */

6
include/configs/dns325.h
View File

@ -12,12 +12,6 @@
#ifndef _CONFIG_DNS325_H #ifndef _CONFIG_DNS325_H
#define _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" #include "mv-common.h"
/* Remove or override few declarations from mv-common.h */ /* Remove or override few declarations from mv-common.h */

6
include/configs/dockstar.h
View File

@ -11,12 +11,6 @@
#ifndef _CONFIG_DOCKSTAR_H #ifndef _CONFIG_DOCKSTAR_H
#define _CONFIG_DOCKSTAR_H #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 * mv-common.h should be defined after CMD configs since it used them
* to enable certain macros * to enable certain macros

7
include/configs/dreamplug.h
View File

@ -11,12 +11,7 @@
#ifndef _CONFIG_DREAMPLUG_H #ifndef _CONFIG_DREAMPLUG_H
#define _CONFIG_DREAMPLUG_H #define _CONFIG_DREAMPLUG_H
/* #include "mv-common.h"
* High Level Configuration Options (easy to change)
*/
#define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */
#include "mv-plug-common.h"
/* /*
* Environment variables configurations * Environment variables configurations

7
include/configs/ds109.h
View File

@ -11,12 +11,7 @@
#ifndef _CONFIG_DS109_H #ifndef _CONFIG_DS109_H
#define _CONFIG_DS109_H #define _CONFIG_DS109_H
/* #include "mv-common.h"
* High Level Configuration Options (easy to change)
*/
#define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */
#include "mv-plug-common.h"
/* /*
* Environment variables configurations * Environment variables configurations

3
include/configs/edminiv2.h
View File

@ -28,9 +28,6 @@
* High Level Configuration Options (easy to change) * 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> #include <asm/arch/orion5x.h>
/* /*
* CLKs configurations * CLKs configurations

6
include/configs/goflexhome.h
View File

@ -14,12 +14,6 @@
#ifndef _CONFIG_GOFLEXHOME_H #ifndef _CONFIG_GOFLEXHOME_H
#define _CONFIG_GOFLEXHOME_H #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 * Default GPIO configuration and LED status
*/ */

15
include/configs/guruplug.h
View File

@ -9,20 +9,7 @@
#ifndef _CONFIG_GURUPLUG_H #ifndef _CONFIG_GURUPLUG_H
#define _CONFIG_GURUPLUG_H #define _CONFIG_GURUPLUG_H
/* #include "mv-common.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"
/* /*
* Environment variables configurations * Environment variables configurations

6
include/configs/ib62x0.h
View File

@ -8,12 +8,6 @@
#ifndef _CONFIG_IB62x0_H #ifndef _CONFIG_IB62x0_H
#define _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" #include "mv-common.h"
/* /*

6
include/configs/iconnect.h
View File

@ -8,12 +8,6 @@
#ifndef _CONFIG_ICONNECT_H #ifndef _CONFIG_ICONNECT_H
#define _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" #include "mv-common.h"
/* /*

6
include/configs/km/km_arm.h
View File

@ -19,12 +19,6 @@
#ifndef _CONFIG_KM_ARM_H #ifndef _CONFIG_KM_ARM_H
#define _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 #define CONFIG_NAND_ECC_BCH
/* include common defines/options for all Keymile boards */ /* include common defines/options for all Keymile boards */

11
include/configs/lacie_kw.h
View File

@ -6,17 +6,6 @@
#ifndef _CONFIG_LACIE_KW_H #ifndef _CONFIG_LACIE_KW_H
#define _CONFIG_LACIE_KW_H #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 * SDRAM configuration
*/ */

2
include/configs/lsxl.h
View File

@ -21,8 +21,6 @@
/* /*
* General configuration options * General configuration options
*/ */
#define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */
#define CONFIG_KW88F6281 /* SOC Name */
#define CONFIG_KIRKWOOD_GPIO #define CONFIG_KIRKWOOD_GPIO

21
include/configs/mv-plug-common.h
View File

@ -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 */

6
include/configs/nas220.h
View File

@ -11,12 +11,6 @@
#ifndef _CONFIG_NAS220_H #ifndef _CONFIG_NAS220_H
#define _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 */ /* 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_LOW ((1 << 12)|(1 << 14)|(1 << 24)|(1 << 28))
#define NAS220_GE_OE_VAL_HIGH (0) #define NAS220_GE_OE_VAL_HIGH (0)

5
include/configs/nsa310s.h
View File

@ -9,11 +9,6 @@
#ifndef _CONFIG_NSA310S_H #ifndef _CONFIG_NSA310S_H
#define _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" #include "mv-common.h"
/* environment variables configuration */ /* environment variables configuration */

6
include/configs/openrd.h
View File

@ -13,12 +13,6 @@
#ifndef _CONFIG_OPENRD_H #ifndef _CONFIG_OPENRD_H
#define _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" #include "mv-common.h"
/* /*

6
include/configs/pogo_e02.h
View File

@ -12,12 +12,6 @@
#ifndef _CONFIG_POGO_E02_H #ifndef _CONFIG_POGO_E02_H
#define _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" #include "mv-common.h"
/* /*

7
include/configs/sheevaplug.h
View File

@ -9,12 +9,7 @@
#ifndef _CONFIG_SHEEVAPLUG_H #ifndef _CONFIG_SHEEVAPLUG_H
#define _CONFIG_SHEEVAPLUG_H #define _CONFIG_SHEEVAPLUG_H
/* #include "mv-common.h"
* High Level Configuration Options (easy to change)
*/
#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */
#include "mv-plug-common.h"
/* /*
* Environment variables configurations * Environment variables configurations

17
scripts/config_whitelist.txt
View File

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