Skip to contentSkip to conversation

FDT: remove obsolete OF_CPU and OF_SOC macros.

PATCH New Marcel Ziswiler 3 participants 10 messages Sep 8, 2009 – Sep 22, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 FDT: remove obsolete OF_CPU and OF_SOC macros.

---
 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(-)
README +4 -2
index ff4ed8b..3cb7786 100644
@@ -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
 
include/configs/IDS8247.h +0 -2
index 4c4af05..147a8b2 100644
@@ -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"
 
include/configs/MPC8260ADS.h +0 -1
index 942a4cc..677a143 100644
@@ -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
 
(quoted diff) +0 -0

b/include/configs/linkstation.h
index 2feb3ae..16b464c 100644

include/configs/linkstation.h +0 -2
@@ -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) */

include/configs/mgcoge.h +0 -2
index ea14948..99ac8c1 100644
@@ -346,8 +346,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"
 
(quoted diff) +0 -0

b/include/configs/mpc7448hpc2.h
index 4f98ba4..be12186 100644

include/configs/mpc7448hpc2.h +0 -1
@@ -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"
include/configs/muas3001.h +0 -2
index f031a17..f2d117c 100644
@@ -404,8 +404,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"
include/configs/stxxtc.h +0 -1
index d16262b..5854366 100644
@@ -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 */
Signature · 1 line
1.6.0.4
#1 lore raw

PATCH 1/1 FDT: remove obsolete OF_CPU and OF_SOC macros.

Dear Marcel Ziswiler,

Quoted 11 lines · In message <1252423607.5386.10.camel@com-21> you wrote:
---
 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(-)

Please put the affected board maintainers on Cc:

How much testing has this patch seen?

Quoted 6 lines
README +0 -0
index ff4ed8b..3cb7786 100644
@@ -368,8 +368,10 @@ The following options need to be configured:
 		 * Adds the "fdt" command

README The following options need to be configured: · line 376

Quoted 10 lines
README +4 -2
 		 * 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

What about the other boards then? Say MPC8260ADS or mpc7448hpc2?

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Oh dear, I think you'll find reality's on the blink again."
- Marvin The Paranoid Android
#2 lore raw

PATCH 1/1 FDT: remove obsolete OF_CPU and OF_SOC macros.

Hi Wolfgang Denk

Quoted 1 line · Wolfgang Denk

Please put the affected board maintainers on Cc:

OK, sorry. Added them now.

Quoted 1 line

How much testing has this patch seen?

Tested on ep8248. Unfortunately I don't have access to any of the other boards.

Quoted 1 line

What about the other boards then? Say MPC8260ADS or mpc7448hpc2?

As OF_CPU and OF_SOC is only ever used in cpu/mpc512x/cpu.c and cpu/mpc5xxx/cpu.c there is no impact whatever on any of the other boards.

Cheers

Marcel Ziswiler

#3 lore raw

PATCH 1/1 FDT: remove obsolete OF_CPU and OF_SOC macros.

Dear Marcel Ziswiler,

Quoted 6 lines · In message <1252443024.5386.76.camel@com-21> you wrote:
Quoted 2 lines

What about the other boards then? Say MPC8260ADS or mpc7448hpc2?

As OF_CPU and OF_SOC is only ever used in cpu/mpc512x/cpu.c and cpu/mpc5xxx/cpu.c there is no impact whatever on any of the other boards.

The patch should remove the macros then from the respective config files.

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I don't mind criticism. You know me. I've  never  been  one  to  take
offence  at  criticism. No one could say I'm the sort to take offence
at criticism -- Not twice, anyway. Not without blowing bubbles.
                                  - Terry Pratchett, _Witches Abroad_
#4 lore raw

PATCH 1/1 FDT: remove obsolete OF_CPU and OF_SOC macros.

Dear Wolfang Denk

Quoted 2 lines · Wolfgang Denk

The patch should remove the macros then from the respective config files.

Isn't that exactly what my patch does?

Cheers

Marcel Ziswiler

#5 lore raw

PATCH 1/1 FDT: remove obsolete OF_CPU and OF_SOC macros.

Dear Marcel Ziswiler,

Quoted 6 lines · In message <1252444556.5386.91.camel@com-21> you wrote:
Quoted 2 lines · Wolfgang Denk

The patch should remove the macros then from the respective config files.

Isn't that exactly what my patch does?

It doesn't do it for all affected boards. That's why I asked about for example MPC8260ADS or mpc7448hpc2:

-> grep OF_CPU include/configs/{MPC8260ADS,mpc7448hpc2}.h
include/configs/MPC8260ADS.h:#define OF_CPU "cpu at 0"
include/configs/mpc7448hpc2.h:#define OF_CPU "PowerPC,7448 at 0"

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The average woman would rather have beauty than brains,  because  the
average man can see better than he can think.
#6 lore raw

PATCH 1/1 FDT: remove obsolete OF_CPU and OF_SOC macros.

Quoted 5 lines · Wolfgang Denk

It doesn't do it for all affected boards. That's why I asked about for example MPC8260ADS or mpc7448hpc2:
-> grep OF_CPU include/configs/{MPC8260ADS,mpc7448hpc2}.h
include/configs/MPC8260ADS.h:#define OF_CPU "cpu at 0"
include/configs/mpc7448hpc2.h:#define OF_CPU "PowerPC,7448 at 0"

Yes it does. What are you talking about?

#7 lore raw

PATCH v2 1/1 FDT: remove obsolete OF_CPU and OF_SOC macros.

In reply to Marcel Ziswiler

---
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(-)
README +4 -2
index ff4ed8b..3cb7786 100644
@@ -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
 
include/configs/IDS8247.h +0 -2
index 4c4af05..147a8b2 100644
@@ -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"
 
include/configs/MPC8260ADS.h +0 -1
index 942a4cc..677a143 100644
@@ -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
 
include/configs/linkstation.h +0 -2
index 2feb3ae..16b464c 100644
@@ -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) */
include/configs/mgcoge.h +0 -2
index b955749..55d1fc9 100644
@@ -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"
 
include/configs/mpc7448hpc2.h +0 -1
index 4f98ba4..be12186 100644
@@ -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"
include/configs/muas3001.h +0 -2
index ae033b2..c94daa3 100644
@@ -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"
include/configs/stxxtc.h +0 -1
index d16262b..5854366 100644
@@ -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 */
Signature · 1 line
1.6.4.2
#8 lore raw

PATCH v2 1/1 FDT: remove obsolete OF_CPU and OF_SOC macros.

Quoted 1 line · Marcel Ziswiler
Quoted 124 lines

---
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(-)
README +4 -2
index ff4ed8b..3cb7786 100644
@@ -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
 
include/configs/IDS8247.h +0 -2
index 4c4af05..147a8b2 100644
@@ -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"
 
include/configs/MPC8260ADS.h +0 -1
index 942a4cc..677a143 100644
@@ -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
 
include/configs/linkstation.h +0 -2
index 2feb3ae..16b464c 100644
@@ -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) */
include/configs/mgcoge.h +0 -2
index b955749..55d1fc9 100644
@@ -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"
 
include/configs/mpc7448hpc2.h +0 -1
index 4f98ba4..be12186 100644
@@ -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"
include/configs/muas3001.h +0 -2
index ae033b2..c94daa3 100644
@@ -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"
include/configs/stxxtc.h +0 -1
index d16262b..5854366 100644
@@ -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 */
Signature · 1 line
1.6.4.2

---
Guennadi Liakhovetski

#9 lore raw

PATCH v2 1/1 FDT: remove obsolete OF_CPU and OF_SOC macros.

In reply to Marcel Ziswiler

Dear Marcel Ziswiler,

Quoted 5 lines · In message <1252523921.3643.8.camel@com-21> you wrote:

---
Changes since v1:
- CC all respective board maintainers

Quoted 9 lines
 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(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Oh, that sound of male ego.  You travel halfway across the galaxy and
it's still the same song.
	-- Eve McHuron, "Mudd's Women", stardate 1330.1