diff options
author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-08-30 22:10:59 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-08-31 01:21:21 (GMT) |
commit | 47539e2317276ab7e31b47f75e52981c4473dbbd (patch) | |
tree | 0748151ea5968867067fced64dd18789382b7b05 /include/configs | |
parent | ad17a81c0627537e022967628410cd12dd781b53 (diff) | |
download | u-boot-fsl-qoriq-47539e2317276ab7e31b47f75e52981c4473dbbd.tar.xz |
kirkwood: kconfig: refactor Kconfig and defconfig
Becuase the board select menu in arch/arm/Kconfig is too big,
move the KirkWood board select menu to kirkwood/Kconfig.
Consolidate also common settings (CONFIG_SYS_CPU="arm926ejs" and
CONFIG_SYS_SOC="kirkwood").
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Prafulla Wadasdkar <prafulla@marvell.com>
Cc: Luka Perkov <luka@openwrt.org>
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/dns325.h | 1 | ||||
-rw-r--r-- | include/configs/dockstar.h | 1 | ||||
-rw-r--r-- | include/configs/dreamplug.h | 1 | ||||
-rw-r--r-- | include/configs/goflexhome.h | 1 | ||||
-rw-r--r-- | include/configs/guruplug.h | 1 | ||||
-rw-r--r-- | include/configs/ib62x0.h | 1 | ||||
-rw-r--r-- | include/configs/iconnect.h | 1 | ||||
-rw-r--r-- | include/configs/km/km_arm.h | 1 | ||||
-rw-r--r-- | include/configs/lacie_kw.h | 1 | ||||
-rw-r--r-- | include/configs/lsxl.h | 1 | ||||
-rw-r--r-- | include/configs/mv88f6281gtw_ge.h | 1 | ||||
-rw-r--r-- | include/configs/openrd.h | 1 | ||||
-rw-r--r-- | include/configs/pogo_e02.h | 1 | ||||
-rw-r--r-- | include/configs/rd6281a.h | 1 | ||||
-rw-r--r-- | include/configs/sheevaplug.h | 1 | ||||
-rw-r--r-- | include/configs/tk71.h | 1 | ||||
-rw-r--r-- | include/configs/wireless_space.h | 1 |
17 files changed, 0 insertions, 17 deletions
diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 96db44f..eaf8c85 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -24,7 +24,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD /* SOC Family Name */ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index d66bd2a..46a42b3 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -21,7 +21,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_DOCKSTAR /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index b1ca859..981233a 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -34,7 +34,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 30a5859..5ed9497 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -24,7 +24,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_GOFLEXHOME /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index e401e7e..a56a4cb 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -18,7 +18,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_GURUPLUG /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 186fd35..f4c748a 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -18,7 +18,6 @@ * High level configuration options */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD /* SOC Family Name */ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index a58f076..9f4a4b8 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -18,7 +18,6 @@ * High level configuration options */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD /* SOC Family Name */ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 6d77680..d31e674 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -28,7 +28,6 @@ */ #define CONFIG_MARVELL #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD /* SOC Family Name */ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_MACH_KM_KIRKWOOD /* Machine type */ diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 2d2e23a..9ac5d33 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -41,7 +41,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD /* SoC Family Name */ /* SoC name */ #if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2) #define CONFIG_KW88F6192 diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index f5f4961..bf5c1a1 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -29,7 +29,6 @@ * General configuration options */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD /* SOC Family Name */ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/mv88f6281gtw_ge.h b/include/configs/mv88f6281gtw_ge.h index f6c06ee..311fc0c 100644 --- a/include/configs/mv88f6281gtw_ge.h +++ b/include/configs/mv88f6281gtw_ge.h @@ -18,7 +18,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_MV88F6281GTW_GE /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index b65bdfd..b6f80af 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -35,7 +35,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_OPENRD_BASE /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index a81d452..7594bdb 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -24,7 +24,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD /* SOC Family Name */ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/rd6281a.h b/include/configs/rd6281a.h index 9856516..e80949e 100644 --- a/include/configs/rd6281a.h +++ b/include/configs/rd6281a.h @@ -18,7 +18,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_RD6281A /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 3d6ff09..4747adf 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -18,7 +18,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_SHEEVAPLUG /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ diff --git a/include/configs/tk71.h b/include/configs/tk71.h index 16e8a7f..a9c6d2e 100644 --- a/include/configs/tk71.h +++ b/include/configs/tk71.h @@ -17,7 +17,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/wireless_space.h b/include/configs/wireless_space.h index 2070a9b..036c1e4 100644 --- a/include/configs/wireless_space.h +++ b/include/configs/wireless_space.h @@ -21,7 +21,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD /* SoC Family Name */ /* SoC name */ #define CONFIG_KW88F6281 #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ |