[PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[Paul Gortmaker]

The mpc7448hpc2 board doesn't have an alias block like
most of the other modern eval boards have.  We need this
block in order to have u-boot be able to make use of the
CONFIG_OF_STDOUT_VIA_ALIAS (vs. having a hard coded node)
in the future.

Also remove the old, redundant chosen node.  Of all the modern
Freescale eval boards (incl. 83xx, 85xx, 86xx) this is the only
one which still has it.  Its presence also breaks with some older
versions of u-boot, like 1.3.1 -- which try and insert a
second chosen node.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/powerpc/boot/dts/mpc7448hpc2.dts |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc7448hpc2.dts b/arch/powerpc/boot/dts/mpc7448hpc2.dts
index 705c23c..2544f3e 100644
--- a/arch/powerpc/boot/dts/mpc7448hpc2.dts
+++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts
@@ -18,6 +18,16 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
+	aliases {
+		ethernet0 = &enet0;
+		ethernet1 = &enet1;
+
+		serial0 = &serial0;
+		serial1 = &serial1;
+
+		pci0 = &pci0;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells =<0>;
@@ -78,7 +88,7 @@
 
 		};
 
-		ethernet@6200 {
+		enet0: ethernet@6200 {
 			linux,network-index = <0>;
 			#size-cells = <0>;
 			device_type = "network";
@@ -91,7 +101,7 @@
 			phy-handle = <&phy8>;
 		};
 
-		ethernet@6600 {
+		enet1: ethernet@6600 {
 			linux,network-index = <1>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -105,7 +115,7 @@
 			phy-handle = <&phy9>;
 		};
 
-		serial@7808 {
+		serial0: serial@7808 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <0x7808 0x200>;
@@ -114,7 +124,7 @@
 			interrupt-parent = <&mpic>;
 		};
 
-		serial@7c08 {
+		serial1: serial@7c08 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <0x7c08 0x200>;
@@ -131,7 +141,7 @@
 			compatible = "chrp,open-pic";
 			device_type = "open-pic";
 		};
-		pci@1000 {
+		pci0: pci@1000 {
 			compatible = "tsi108-pci";
 			device_type = "pci";
 			#interrupt-cells = <1>;
@@ -184,8 +194,4 @@
 			};
 		};
 	};
-	chosen {
-		linux,stdout-path = "/tsi108@c0000000/serial@7808";
-	};
-
 };
-- 
1.5.6.2

Re: [PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[Scott Wood]

Paul Gortmaker wrote:
> The mpc7448hpc2 board doesn't have an alias block like
> most of the other modern eval boards have.  We need this
> block in order to have u-boot be able to make use of the
> CONFIG_OF_STDOUT_VIA_ALIAS (vs. having a hard coded node)
> in the future.
> 
> Also remove the old, redundant chosen node.  Of all the modern
> Freescale eval boards (incl. 83xx, 85xx, 86xx) this is the only
> one which still has it.  Its presence also breaks with some older
> versions of u-boot, like 1.3.1 -- which try and insert a
> second chosen node.

The chosen node is still required for output from the cuboot wrapper.

-Scott

Re: [PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[Paul Gortmaker]

Scott Wood wrote:
> Paul Gortmaker wrote:
>> The mpc7448hpc2 board doesn't have an alias block like
>> most of the other modern eval boards have.  We need this
>> block in order to have u-boot be able to make use of the
>> CONFIG_OF_STDOUT_VIA_ALIAS (vs. having a hard coded node)
>> in the future.
>>
>> Also remove the old, redundant chosen node.  Of all the modern
>> Freescale eval boards (incl. 83xx, 85xx, 86xx) this is the only
>> one which still has it.  Its presence also breaks with some older
>> versions of u-boot, like 1.3.1 -- which try and insert a
>> second chosen node.
>
> The chosen node is still required for output from the cuboot wrapper.

OK, so does that mean that the cuboot wrapper is explicitly
not supported for all the 83xx, 85xx, and 86xx boards?

Thanks,
Paul.

>
> -Scott

Re: [PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[Scott Wood]

Paul Gortmaker wrote:
> OK, so does that mean that the cuboot wrapper is explicitly
> not supported for all the 83xx, 85xx, and 86xx boards?

No (except 86xx, which doesn't have cuboot, because it never existed in 
arch/ppc and thus there's no compatibility to maintain), it just means 
that chosen was never added to those dts files, and thus cuboot has no 
console output.

-Scott

Re: [PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[Jon Loeliger]

Scott Wood wrote:
> Paul Gortmaker wrote:
>> OK, so does that mean that the cuboot wrapper is explicitly
>> not supported for all the 83xx, 85xx, and 86xx boards?
> 
> No (except 86xx, which doesn't have cuboot, because it never existed in 
> arch/ppc and thus there's no compatibility to maintain), it just means 
> that chosen was never added to those dts files, and thus cuboot has no 
> console output.

Also note that nothing stops the causal kernel booter
from _starting_ with an arch/powerpc/boot/dts/ file,
adding a node to it, and using _that_.

jdl

Re: [PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[Scott Wood]

Jon Loeliger wrote:
> Scott Wood wrote:
>> Paul Gortmaker wrote:
>>> OK, so does that mean that the cuboot wrapper is explicitly
>>> not supported for all the 83xx, 85xx, and 86xx boards?
>>
>> No (except 86xx, which doesn't have cuboot, because it never existed 
>> in arch/ppc and thus there's no compatibility to maintain), it just 
>> means that chosen was never added to those dts files, and thus cuboot 
>> has no console output.
> 
> Also note that nothing stops the causal kernel booter

As opposed to the spontaneous kernel booter? :-)

> from _starting_ with an arch/powerpc/boot/dts/ file,
> adding a node to it, and using _that_.

The "casual" user shouldn't need to make any changes, especially for the 
kernel's own dts files to work with the kernel's own wrapper.

The decision on whether to put the chosen node in the device tree should 
be based on which version of u-boot it's more important to maintain 
compatibility with (for some platforms, no chosen-duplicating version of 
u-boot supported device trees on the platform), and what the 
consequences of each form of incompatibility are (e.g. no console output 
during the bootwrapper, versus no boot arguments or initrd in the kernel).

-Scott

Re: [PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[Paul Gortmaker]

Scott Wood wrote:
> Jon Loeliger wrote:
>> Scott Wood wrote:
>>> Paul Gortmaker wrote:
>>>> OK, so does that mean that the cuboot wrapper is explicitly
>>>> not supported for all the 83xx, 85xx, and 86xx boards?
>>>
>>> No (except 86xx, which doesn't have cuboot, because it never existed 
>>> in arch/ppc and thus there's no compatibility to maintain), it just 
>>> means that chosen was never added to those dts files, and thus 
>>> cuboot has no console output.
>>
>> Also note that nothing stops the causal kernel booter
>
> As opposed to the spontaneous kernel booter? :-)
>
>> from _starting_ with an arch/powerpc/boot/dts/ file,
>> adding a node to it, and using _that_.
>
> The "casual" user shouldn't need to make any changes, especially for 
> the kernel's own dts files to work with the kernel's own wrapper.
>
> The decision on whether to put the chosen node in the device tree 
> should be based on which version of u-boot it's more important to 
> maintain compatibility with (for some platforms, no chosen-duplicating 
> version of u-boot supported device trees on the platform), and what 
> the consequences of each form of incompatibility are (e.g. no console 
> output during the bootwrapper, versus no boot arguments or initrd in 
> the kernel).

Well, for the mpc7448hpc2, I can say for sure that there are
chosen-duplicating versions of u-boot 1.3.1 in use -- since
there wasn't a prebuilt, validated image newer than 1.1.3(?)
available anywhere back some 6 months ago, I'd built 1.3.1
and made it available with our 2.6.21 kernel.

If all the other boards run cuboot without console output,
then is it not consistent to have this one the same as well?
Or should we be adding chosen to the other boards instead?

Paul.

>
> -Scott

Re: [PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[Scott Wood]

Paul Gortmaker wrote:
> Well, for the mpc7448hpc2, I can say for sure that there are
> chosen-duplicating versions of u-boot 1.3.1 in use -- since
> there wasn't a prebuilt, validated image newer than 1.1.3(?)
> available anywhere back some 6 months ago, I'd built 1.3.1
> and made it available with our 2.6.21 kernel.

OK, if that version's in widespread use it probably makes sense to 
remove the chosen node.

> If all the other boards run cuboot without console output,

They don't *all* run without output -- see the 8xx, 82xx, and 4xx boards.

-Scott

Re: [PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[Paul Gortmaker]

Scott Wood wrote:
> Paul Gortmaker wrote:
>> Well, for the mpc7448hpc2, I can say for sure that there are
>> chosen-duplicating versions of u-boot 1.3.1 in use -- since
>> there wasn't a prebuilt, validated image newer than 1.1.3(?)
>> available anywhere back some 6 months ago, I'd built 1.3.1
>> and made it available with our 2.6.21 kernel.
>
> OK, if that version's in widespread use it probably makes sense to 
> remove the chosen node.

Sounds good - thanks.

>
>> If all the other boards run cuboot without console output,
>
> They don't *all* run without output -- see the 8xx, 82xx, and 4xx boards.

Yep, saw those when grepping around.  My "all" was implicitly still
referring to the newer 83xx/85xx/(86xx) reference boards, and
whether it made sense to be adding chosen nodes to those so the
cuImage had console output too -- if folks thought that was a better
route, then I could see leaving the 7448 as-is, adding the nodes
to the other boards, and just dealing with educating folks on the
chosen-duplicating version issue as it comes up.

Paul.


>
> -Scott
>

Re: [PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[Roy Zang]

On Fri, 2008-07-11 at 04:21 +0800, Paul Gortmaker wrote:
> The mpc7448hpc2 board doesn't have an alias block like 
> most of the other modern eval boards have.  We need this 
> block in order to have u-boot be able to make use of the 
> CONFIG_OF_STDOUT_VIA_ALIAS (vs. having a hard coded node) 
> in the future.
> 
> Also remove the old, redundant chosen node.  Of all the modern 
> Freescale eval boards (incl. 83xx, 85xx, 86xx) this is the only 
> one which still has it.  Its presence also breaks with some older 
> versions of u-boot, like 1.3.1 -- which try and insert a 
> second chosen node.
> 
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> 
> --- 
Acked-by: Roy Zang <tie-fei.zang@freescale.com>
Roy

Re: [PATCH] mpc7448: add alias list to DTS, clean out old chosen node

[Kumar Gala]

On Jul 10, 2008, at 3:21 PM, Paul Gortmaker wrote:

> The mpc7448hpc2 board doesn't have an alias block like
> most of the other modern eval boards have.  We need this
> block in order to have u-boot be able to make use of the
> CONFIG_OF_STDOUT_VIA_ALIAS (vs. having a hard coded node)
> in the future.
>
> Also remove the old, redundant chosen node.  Of all the modern
> Freescale eval boards (incl. 83xx, 85xx, 86xx) this is the only
> one which still has it.  Its presence also breaks with some older
> versions of u-boot, like 1.3.1 -- which try and insert a
> second chosen node.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> arch/powerpc/boot/dts/mpc7448hpc2.dts |   24 +++++++++++++++---------
> 1 files changed, 15 insertions(+), 9 deletions(-)

applied.

- k