[U-Boot] [PATCH 15/48] keymile: Simplify configs after include unroll

Mario Six mario.six at gdsys.cc
Fri Sep 28 09:52:51 UTC 2018


Simplify the keymile configs again after unrolling the km83xx-common.h
include file.

Signed-off-by: Mario Six <mario.six at gdsys.cc>
---
 include/configs/km8360.h  | 11 -----------
 include/configs/kmopti2.h | 13 -------------
 include/configs/kmsupx5.h | 13 -------------
 include/configs/kmtegr1.h | 18 ------------------
 include/configs/kmtepr2.h | 13 -------------
 include/configs/kmvect1.h | 18 ------------------
 include/configs/suvd3.h   | 15 ---------------
 include/configs/tuge1.h   | 13 -------------
 include/configs/tuxx1.h   | 13 -------------
 9 files changed, 127 deletions(-)

diff --git a/include/configs/km8360.h b/include/configs/km8360.h
index 0d082e6488..b22345bcc2 100644
--- a/include/configs/km8360.h
+++ b/include/configs/km8360.h
@@ -37,16 +37,6 @@
  */
 #define CONFIG_QE			/* Has QE */
 
-/* include common defines/options for all 83xx Keymile boards */
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Heiko Schocher, DENX Software Engineering, hs at denx.de.
- */
-
-#ifndef __CONFIG_KM83XX_H
-#define __CONFIG_KM83XX_H
-
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
@@ -337,7 +327,6 @@
 #define CONFIG_HAS_ETH0
 #endif
 
-#endif /* __CONFIG_KM83XX_H */
 /*
  * System IO Setup
  */
diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h
index 2533d290a1..60f7fd09d9 100644
--- a/include/configs/kmopti2.h
+++ b/include/configs/kmopti2.h
@@ -34,16 +34,6 @@
 
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_8xx\0"
 
-/* include common defines/options for all 83xx Keymile boards */
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Heiko Schocher, DENX Software Engineering, hs at denx.de.
- */
-
-#ifndef __CONFIG_KM83XX_H
-#define __CONFIG_KM83XX_H
-
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
@@ -176,10 +166,8 @@
 #define CONFIG_UEC_ETH
 #define CONFIG_ETHPRIME		"UEC0"
 
-#if !defined(CONFIG_ARCH_MPC8309)
 #define CONFIG_UEC_ETH1		/* GETH1 */
 #define UEC_VERBOSE_DEBUG	1
-#endif
 
 #ifdef CONFIG_UEC_ETH1
 #define CONFIG_SYS_UEC1_UCC_NUM	3	/* UCC4 */
@@ -334,7 +322,6 @@
 #define CONFIG_HAS_ETH0
 #endif
 
-#endif /* __CONFIG_KM83XX_H */
 /*
  * System IO Config
  */
diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index 3dbd554303..4af2903ec2 100644
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -34,16 +34,6 @@
 
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_8xx\0"
 
-/* include common defines/options for all 83xx Keymile boards */
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Heiko Schocher, DENX Software Engineering, hs at denx.de.
- */
-
-#ifndef __CONFIG_KM83XX_H
-#define __CONFIG_KM83XX_H
-
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
@@ -176,10 +166,8 @@
 #define CONFIG_UEC_ETH
 #define CONFIG_ETHPRIME		"UEC0"
 
-#if !defined(CONFIG_ARCH_MPC8309)
 #define CONFIG_UEC_ETH1		/* GETH1 */
 #define UEC_VERBOSE_DEBUG	1
-#endif
 
 #ifdef CONFIG_UEC_ETH1
 #define CONFIG_SYS_UEC1_UCC_NUM	3	/* UCC4 */
@@ -334,7 +322,6 @@
 #define CONFIG_HAS_ETH0
 #endif
 
-#endif /* __CONFIG_KM83XX_H */
 /*
  * System IO Config
  */
diff --git a/include/configs/kmtegr1.h b/include/configs/kmtegr1.h
index 27f8345708..c731c0666f 100644
--- a/include/configs/kmtegr1.h
+++ b/include/configs/kmtegr1.h
@@ -20,8 +20,6 @@
  * High Level Configuration Options
  */
 
-/* This needs to be set prior to including km83xx-common.h */
-
 #define CONFIG_HOSTNAME   "kmtegr1"
 #define CONFIG_KM_BOARD_NAME   "kmtegr1"
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
@@ -43,16 +41,6 @@
 
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 
-/* include common defines/options for all 83xx Keymile boards */
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Heiko Schocher, DENX Software Engineering, hs at denx.de.
- */
-
-#ifndef __CONFIG_KM83XX_H
-#define __CONFIG_KM83XX_H
-
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
@@ -185,11 +173,6 @@
 #define CONFIG_UEC_ETH
 #define CONFIG_ETHPRIME		"UEC0"
 
-#if !defined(CONFIG_ARCH_MPC8309)
-#define CONFIG_UEC_ETH1		/* GETH1 */
-#define UEC_VERBOSE_DEBUG	1
-#endif
-
 #ifdef CONFIG_UEC_ETH1
 #define CONFIG_SYS_UEC1_UCC_NUM	3	/* UCC4 */
 #define CONFIG_SYS_UEC1_RX_CLK		QE_CLK_NONE /* not used in RMII Mode */
@@ -343,7 +326,6 @@
 #define CONFIG_HAS_ETH0
 #endif
 
-#endif /* __CONFIG_KM83XX_H */
 /* QE microcode/firmware address */
 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
 /* between the u-boot partition and env */
diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h
index ed70f884c8..ca7a1477e2 100644
--- a/include/configs/kmtepr2.h
+++ b/include/configs/kmtepr2.h
@@ -34,16 +34,6 @@
 
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_8xx\0"
 
-/* include common defines/options for all 83xx Keymile boards */
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Heiko Schocher, DENX Software Engineering, hs at denx.de.
- */
-
-#ifndef __CONFIG_KM83XX_H
-#define __CONFIG_KM83XX_H
-
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
@@ -176,10 +166,8 @@
 #define CONFIG_UEC_ETH
 #define CONFIG_ETHPRIME		"UEC0"
 
-#if !defined(CONFIG_ARCH_MPC8309)
 #define CONFIG_UEC_ETH1		/* GETH1 */
 #define UEC_VERBOSE_DEBUG	1
-#endif
 
 #ifdef CONFIG_UEC_ETH1
 #define CONFIG_SYS_UEC1_UCC_NUM	3	/* UCC4 */
@@ -334,7 +322,6 @@
 #define CONFIG_HAS_ETH0
 #endif
 
-#endif /* __CONFIG_KM83XX_H */
 /*
  * System IO Config
  */
diff --git a/include/configs/kmvect1.h b/include/configs/kmvect1.h
index 446161e157..9eae4cdf07 100644
--- a/include/configs/kmvect1.h
+++ b/include/configs/kmvect1.h
@@ -20,8 +20,6 @@
  * High Level Configuration Options
  */
 
-/* This needs to be set prior to including km83xx-common.h */
-
 #define CONFIG_HOSTNAME		"kmvect1"
 #define CONFIG_KM_BOARD_NAME   "kmvect1"
 /* at end of uboot partition, before env */
@@ -35,16 +33,6 @@
 
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 
-/* include common defines/options for all 83xx Keymile boards */
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Heiko Schocher, DENX Software Engineering, hs at denx.de.
- */
-
-#ifndef __CONFIG_KM83XX_H
-#define __CONFIG_KM83XX_H
-
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
@@ -177,11 +165,6 @@
 #define CONFIG_UEC_ETH
 #define CONFIG_ETHPRIME		"UEC0"
 
-#if !defined(CONFIG_ARCH_MPC8309)
-#define CONFIG_UEC_ETH1		/* GETH1 */
-#define UEC_VERBOSE_DEBUG	1
-#endif
-
 #ifdef CONFIG_UEC_ETH1
 #define CONFIG_SYS_UEC1_UCC_NUM	3	/* UCC4 */
 #define CONFIG_SYS_UEC1_RX_CLK		QE_CLK_NONE /* not used in RMII Mode */
@@ -335,7 +318,6 @@
 #define CONFIG_HAS_ETH0
 #endif
 
-#endif /* __CONFIG_KM83XX_H */
 /* QE microcode/firmware address */
 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
 /* between the u-boot partition and env */
diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index 34e97ef9fd..a652343d95 100644
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -20,8 +20,6 @@
  * High Level Configuration Options
  */
 
-/* This needs to be set prior to including km83xx-common.h */
-
 #define CONFIG_HOSTNAME		"suvd3"
 #define CONFIG_KM_BOARD_NAME   "suvd3"
 
@@ -33,16 +31,6 @@
 
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_8xx\0"
 
-/* include common defines/options for all 83xx Keymile boards */
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Heiko Schocher, DENX Software Engineering, hs at denx.de.
- */
-
-#ifndef __CONFIG_KM83XX_H
-#define __CONFIG_KM83XX_H
-
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
@@ -175,10 +163,8 @@
 #define CONFIG_UEC_ETH
 #define CONFIG_ETHPRIME		"UEC0"
 
-#if !defined(CONFIG_ARCH_MPC8309)
 #define CONFIG_UEC_ETH1		/* GETH1 */
 #define UEC_VERBOSE_DEBUG	1
-#endif
 
 #ifdef CONFIG_UEC_ETH1
 #define CONFIG_SYS_UEC1_UCC_NUM	3	/* UCC4 */
@@ -333,7 +319,6 @@
 #define CONFIG_HAS_ETH0
 #endif
 
-#endif /* __CONFIG_KM83XX_H */
 /*
  * System IO Config
  */
diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h
index d2e0466cd8..cfd317f6e1 100644
--- a/include/configs/tuge1.h
+++ b/include/configs/tuge1.h
@@ -34,16 +34,6 @@
 
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_8xx\0"
 
-/* include common defines/options for all 83xx Keymile boards */
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Heiko Schocher, DENX Software Engineering, hs at denx.de.
- */
-
-#ifndef __CONFIG_KM83XX_H
-#define __CONFIG_KM83XX_H
-
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
@@ -176,10 +166,8 @@
 #define CONFIG_UEC_ETH
 #define CONFIG_ETHPRIME		"UEC0"
 
-#if !defined(CONFIG_ARCH_MPC8309)
 #define CONFIG_UEC_ETH1		/* GETH1 */
 #define UEC_VERBOSE_DEBUG	1
-#endif
 
 #ifdef CONFIG_UEC_ETH1
 #define CONFIG_SYS_UEC1_UCC_NUM	3	/* UCC4 */
@@ -334,7 +322,6 @@
 #define CONFIG_HAS_ETH0
 #endif
 
-#endif /* __CONFIG_KM83XX_H */
 /*
  * System IO Config
  */
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index f1d12e456f..b3bfb7b7c5 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -34,16 +34,6 @@
 
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_8xx\0"
 
-/* include common defines/options for all 83xx Keymile boards */
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2010
- * Heiko Schocher, DENX Software Engineering, hs at denx.de.
- */
-
-#ifndef __CONFIG_KM83XX_H
-#define __CONFIG_KM83XX_H
-
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
@@ -176,10 +166,8 @@
 #define CONFIG_UEC_ETH
 #define CONFIG_ETHPRIME		"UEC0"
 
-#if !defined(CONFIG_ARCH_MPC8309)
 #define CONFIG_UEC_ETH1		/* GETH1 */
 #define UEC_VERBOSE_DEBUG	1
-#endif
 
 #ifdef CONFIG_UEC_ETH1
 #define CONFIG_SYS_UEC1_UCC_NUM	3	/* UCC4 */
@@ -334,7 +322,6 @@
 #define CONFIG_HAS_ETH0
 #endif
 
-#endif /* __CONFIG_KM83XX_H */
 /*
  * System IO Config
  */
-- 
2.16.4



More information about the U-Boot mailing list