From bbd94a0b491161c11a93436fd1bf91d601a8ba95 Mon Sep 17 00:00:00 2001 From: Holger Brunck Date: Tue, 17 Nov 2015 10:53:28 +0100 Subject: [PATCH] km/powerpc: move open firmware defines to km-powerpc.h 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 Signed-off-by: Valentin Longchamp --- 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 64fccbd727..3f045f2e4a 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 cebe21060e..4e355a7bd5 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -152,9 +152,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 19e89cec76..4cfc1dc2d7 100644 --- a/include/configs/km82xx.h +++ b/include/configs/km82xx.h @@ -430,10 +430,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@11a90" -- 2.25.1