[U-Boot] [PATCH 06/17] km/powerpc: move open firmware defines to km-powerpc.h

Heiko Schocher
2015-11-16T10:59:29Z

Hello Valentin,

Am 13.11.2015 um 15:59 schrieb Valentin Longchamp:
> From: Holger Brunck <holger.brunck@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@keymile.com>
> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
> ---
>
> 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(-)

Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
>
> 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"
>

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany