[U-Boot] [PATCH v2 05/15] km/powerpc: move open firmware defines to km-powerpc.h

Valentin Longchamp valentin.longchamp at keymile.com
Tue Nov 17 10:53:28 CET 2015


From: Holger Brunck <holger.brunck at keymile.com>

We use the same settings for open firmware defines on all our powerpc
targets, so move them from the CPU specific headers to the common
powerpc header.

Signed-off-by: Holger Brunck <holger.brunck at keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp at keymile.com>
---

Changes in v2: None

 include/configs/km/km-powerpc.h    | 4 ++++
 include/configs/km/km83xx-common.h | 3 ---
 include/configs/km82xx.h           | 3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index 8121e5c..cf4a91c 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -17,6 +17,10 @@
 #define CONFIG_CMD_DTT
 #define CONFIG_JFFS2_CMDLINE
 
+/* Pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT
+#define CONFIG_OF_BOARD_SETUP
+
 /* standard km ethernet_present for piggy */
 #define CONFIG_KM_COMMON_ETH_INIT
 
diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h
index 940000e..2325451 100644
--- a/include/configs/km/km83xx-common.h
+++ b/include/configs/km/km83xx-common.h
@@ -153,9 +153,6 @@
 #define CONFIG_SYS_NS16550_COM1	(CONFIG_SYS_IMMR+0x4500)
 #define CONFIG_SYS_NS16550_COM2	(CONFIG_SYS_IMMR+0x4600)
 
-/* Pass open firmware flat tree */
-#define CONFIG_OF_LIBFDT
-#define CONFIG_OF_BOARD_SETUP
 #define CONFIG_OF_STDOUT_VIA_ALIAS
 
 /*
diff --git a/include/configs/km82xx.h b/include/configs/km82xx.h
index 12f9d42..8c06dc1 100644
--- a/include/configs/km82xx.h
+++ b/include/configs/km82xx.h
@@ -431,10 +431,7 @@ int get_scl(void);
 
 #define	CONFIG_SYS_RESET_ADDRESS 0xFDFFFFFC	/* "bad" address */
 
-/* pass open firmware flat tree */
 #define CONFIG_FIT		1
-#define CONFIG_OF_LIBFDT	1
-#define CONFIG_OF_BOARD_SETUP	1
 
 #define OF_TBCLK		(bd->bi_busfreq / 4)
 #define OF_STDOUT_PATH		"/soc/cpm/serial at 11a90"
-- 
1.8.3.1



More information about the U-Boot mailing list