[U-Boot] [PATCH][v2] FDT: remove obsolete OF_CPU and OF_SOC macros.

[Guennadi Liakhovetski]

On Wed, 9 Sep 2009, Marcel Ziswiler wrote:

> Signed-off-by: Marcel Ziswiler <marcel.ziswiler at noser.com>

Acked-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>

> ---
> Changes since v1:
> - CC all respective board maintainers
> 
>  README                        |    6 ++++--
>  include/configs/IDS8247.h     |    2 --
>  include/configs/MPC8260ADS.h  |    1 -
>  include/configs/linkstation.h |    2 --
>  include/configs/mgcoge.h      |    2 --
>  include/configs/mpc7448hpc2.h |    1 -
>  include/configs/muas3001.h    |    2 --
>  include/configs/stxxtc.h      |    1 -
>  8 files changed, 4 insertions(+), 13 deletions(-)
> 
> diff --git a/README b/README
> index ff4ed8b..3cb7786 100644
> --- a/README
> +++ b/README
> @@ -368,8 +368,10 @@ The following options need to be configured:
>  		 * Adds the "fdt" command
>  		 * The bootm command automatically updates the fdt
>  
> -		OF_CPU - The proper name of the cpus node.
> -		OF_SOC - The proper name of the soc node.
> +		OF_CPU - The proper name of the cpus node (only required for
> +			MPC512X and MPC5xxx based boards).
> +		OF_SOC - The proper name of the soc node (only required for
> +			MPC512X and MPC5xxx based boards).
>  		OF_TBCLK - The timebase frequency.
>  		OF_STDOUT_PATH - The path to the console device
>  
> diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
> index 4c4af05..147a8b2 100644
> --- a/include/configs/IDS8247.h
> +++ b/include/configs/IDS8247.h
> @@ -125,8 +125,6 @@
>  #define CONFIG_OF_LIBFDT	1
>  #define CONFIG_OF_BOARD_SETUP	1
>  
> -#define OF_CPU	"PowerPC,8247 at 0"
> -#define OF_SOC	"soc at f0000000"
>  #define OF_TBCLK	(bd->bi_busfreq / 4)
>  #define OF_STDOUT_PATH	"/soc at f0000000/serial8250 at e0008000"
>  
> diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
> index 942a4cc..677a143 100644
> --- a/include/configs/MPC8260ADS.h
> +++ b/include/configs/MPC8260ADS.h
> @@ -209,7 +209,6 @@
>  #define CONFIG_OF_LIBFDT	1
>  #define CONFIG_OF_BOARD_SETUP	1
>  #if defined(CONFIG_OF_LIBFDT)
> -#define OF_CPU			"cpu at 0"
>  #define OF_TBCLK		(bd->bi_busfreq / 4)
>  #endif
>  
> diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
> index 2feb3ae..16b464c 100644
> --- a/include/configs/linkstation.h
> +++ b/include/configs/linkstation.h
> @@ -96,8 +96,6 @@
>  
>  #define CONFIG_OF_LIBFDT	1
>  
> -#define OF_CPU			"PowerPC,603e"
> -#define OF_SOC			"soc10x at 80000000"
>  #define OF_STDOUT_PATH		"/soc10x/serial at 80004600"
>  
>  /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
> diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
> index b955749..55d1fc9 100644
> --- a/include/configs/mgcoge.h
> +++ b/include/configs/mgcoge.h
> @@ -347,8 +347,6 @@
>  #define CONFIG_OF_LIBFDT	1
>  #define CONFIG_OF_BOARD_SETUP	1
>  
> -#define OF_CPU			"PowerPC,8247 at 0"
> -#define OF_SOC			"soc at f0000000"
>  #define OF_TBCLK		(bd->bi_busfreq / 4)
>  #define OF_STDOUT_PATH		"/soc/cpm/serial at 11a90"
>  
> diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
> index 4f98ba4..be12186 100644
> --- a/include/configs/mpc7448hpc2.h
> +++ b/include/configs/mpc7448hpc2.h
> @@ -79,7 +79,6 @@
>  #define CONFIG_OF_LIBFDT	1
>  #define CONFIG_OF_BOARD_SETUP	1
>  
> -#define OF_CPU			"PowerPC,7448 at 0"
>  #define OF_TSI			"tsi108 at c0000000"
>  #define OF_TBCLK		(bd->bi_busfreq / 8)
>  #define OF_STDOUT_PATH		"/tsi108 at c0000000/serial at 7808"
> diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
> index ae033b2..c94daa3 100644
> --- a/include/configs/muas3001.h
> +++ b/include/configs/muas3001.h
> @@ -405,8 +405,6 @@
>  #define CONFIG_OF_LIBFDT	1
>  #define CONFIG_OF_BOARD_SETUP	1
>  
> -#define OF_CPU			"PowerPC,8270 at 0"
> -#define OF_SOC			"soc at f0000000"
>  #define OF_TBCLK		(bd->bi_busfreq / 4)
>  #if defined(CONFIG_MUAS_DEV_BOARD)
>  #define OF_STDOUT_PATH		"/soc/cpm/serial at 11a90"
> diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
> index d16262b..5854366 100644
> --- a/include/configs/stxxtc.h
> +++ b/include/configs/stxxtc.h
> @@ -509,7 +509,6 @@ typedef unsigned int led_id_t;
>  /* pass open firmware flattened device tree */
>  #define CONFIG_OF_LIBFDT	1
>  
> -#define OF_CPU			"PowerPC,MPC870 at 0"
>  #define OF_TBCLK		(MPC8XX_HZ / 16)
>  
>  #endif	/* __CONFIG_H */
> -- 
> 1.6.4.2
> 
> 
> 

---
Guennadi Liakhovetski