summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-12-17 18:08:44 -0500
committerTom Rini <trini@konsulko.com>2021-12-27 16:20:19 -0500
commitf98b3be287bf59414e282fda6e9879dafeae150a (patch)
treeb33fa395d373643f4193910db98c1f2e184517d5 /include
parent8cca60a2cbf25c811129c251e84b066cd542fefc (diff)
downloadu-boot-f98b3be287bf59414e282fda6e9879dafeae150a.tar.gz
u-boot-f98b3be287bf59414e282fda6e9879dafeae150a.tar.bz2
u-boot-f98b3be287bf59414e282fda6e9879dafeae150a.zip
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/SBx81LIFKW.h2
-rw-r--r--include/configs/SBx81LIFXCAT.h2
-rw-r--r--include/configs/dns325.h6
-rw-r--r--include/configs/dockstar.h6
-rw-r--r--include/configs/dreamplug.h7
-rw-r--r--include/configs/ds109.h7
-rw-r--r--include/configs/edminiv2.h3
-rw-r--r--include/configs/goflexhome.h6
-rw-r--r--include/configs/guruplug.h15
-rw-r--r--include/configs/ib62x0.h6
-rw-r--r--include/configs/iconnect.h6
-rw-r--r--include/configs/km/km_arm.h6
-rw-r--r--include/configs/lacie_kw.h11
-rw-r--r--include/configs/lsxl.h2
-rw-r--r--include/configs/mv-plug-common.h21
-rw-r--r--include/configs/nas220.h6
-rw-r--r--include/configs/nsa310s.h5
-rw-r--r--include/configs/openrd.h6
-rw-r--r--include/configs/pogo_e02.h6
-rw-r--r--include/configs/sheevaplug.h7
20 files changed, 4 insertions, 132 deletions
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index 782b16f30f..3ebeccc33b 100644
--- 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 e4666e1e7e..53a6bdf0a3 100644
--- 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 8e298ddfa1..e35c16add4 100644
--- 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 8a5daf48c0..0ad04eee1b 100644
--- 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 61b1e0fc1f..beea234d8d 100644
--- 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 c57461c7e6..8553ea0b95 100644
--- 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 6b487b310c..e20e058e0a 100644
--- 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 269178c9c2..90e37d9853 100644
--- 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 e51f3f2483..25c5a97c69 100644
--- 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 75bb073d4d..9783fd89ec 100644
--- 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 4903b92ca3..f1aad1efde 100644
--- 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 cca624ea3e..6501884d32 100644
--- 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 6180563ab7..d6c5425a9d 100644
--- 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 7294a3c20a..5891a1d8c5 100644
--- 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
index d38d9872c0..0000000000
--- 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 9f89cca0b0..12480d9d55 100644
--- 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 54f496f6ce..8cc9ca6a49 100644
--- 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 bd27e503ca..43d089657b 100644
--- 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 196e362bd7..3e94125cb3 100644
--- 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 bb7ce8d3ed..8dba4fcb4f 100644
--- 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 20:06:04 +0000