Re: [PATCH] powerpc: delete boot-cpu and chosen nodes from all DTS files
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2007-02-13 23:58:26
On Tue, 2007-02-13 at 17:34 -0600, Timur Tabi wrote:
The 'linux,boot-cpu' property is obsolete, so remove it from all of the DTS files and from booting-without-of.txt. The boot CPU is actually defined in the device tree header, and U-Boot sets that field. The device tree compiler also complains if the property exists. Remove a stray 'chosen' section in mpc8272ads.dts. The 'chosen' section is initialized by U-Boot, so the definition in the DTS is not used anyway.
I think that: - The /chosen node should be present in the .dts even if empty - I don't see why you are removing linux,boot-cpu from the documentation ! It's a fairly important property. Bootloaders are supposed to provide it on SMP environments and it's used for kexec. Ben.
quoted hunk ↗ jump to hunk
Signed-off-by: Timur Tabi <redacted> Signed-off-by: Stuart Yoder <redacted> --- Note: The '64-bit' property is already defined by the OF PPC binding and is added to show an example of a property without a value. We're not actually adding a new property definition. Documentation/powerpc/booting-without-of.txt | 5 ++--- arch/powerpc/boot/dts/kuroboxHG.dts | 1 - arch/powerpc/boot/dts/mpc7448hpc2.dts | 5 ++--- arch/powerpc/boot/dts/mpc8272ads.dts | 8 -------- arch/powerpc/boot/dts/mpc8323emds.dts | 7 +++---- arch/powerpc/boot/dts/mpc8360emds.dts | 1 - arch/powerpc/boot/dts/mpc8560ads.dts | 1 - arch/powerpc/boot/dts/mpc8641_hpcn.dts | 3 +-- arch/powerpc/boot/dts/mpc866ads.dts | 1 - arch/powerpc/boot/dts/mpc885ads.dts | 1 - 10 files changed, 8 insertions(+), 25 deletions(-)diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index 3399427..310d267 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt@@ -497,7 +497,7 @@ looks like in practice. | |- device_type = "cpu" | |- reg = <0> | |- clock-frequency = <5f5e1000> - | |- linux,boot-cpu + | |- 64-bit | |- linux,phandle = <2> | o memory@0@@ -519,7 +519,7 @@ physical memory layout. It also include through /chosen, like in this example, the platform type (mandatory) and the kernel command line arguments (optional). -The /cpus/PowerPC,970@0/linux,boot-cpu property is an example of a +The /cpus/PowerPC,970@0/64-bit property is an example of a property without a value. All other properties have a value. The significance of the #address-cells and #size-cells properties will be explained in chapter IV which defines precisely the required nodes and@@ -778,7 +778,6 @@ address which can extend beyond that lim bytes - d-cache-size : one cell, size of L1 data cache in bytes - i-cache-size : one cell, size of L1 instruction cache in bytes - - linux, boot-cpu : Should be defined if this cpu is the boot cpu. Recommended properties:diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts index d06b0b0..7531027 100644 --- a/arch/powerpc/boot/dts/kuroboxHG.dts +++ b/arch/powerpc/boot/dts/kuroboxHG.dts@@ -35,7 +35,6 @@ build with: "dtc -f -I dts -O dtb -o kur PowerPC,603e { /* Really 8241 */ linux,phandle = <2100>; - linux,boot-cpu; device_type = "cpu"; reg = <0>; clock-frequency = <fdad680>; /* Fixed by bootwrapper */diff --git a/arch/powerpc/boot/dts/mpc7448hpc2.dts b/arch/powerpc/boot/dts/mpc7448hpc2.dts index c4d9562..4164351 100644 --- a/arch/powerpc/boot/dts/mpc7448hpc2.dts +++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts@@ -23,7 +23,7 @@ #address-cells = <1>; #size-cells =<0>; linux,phandle = <200>; - + PowerPC,7448@0 { device_type = "cpu"; reg = <0>;@@ -36,7 +36,6 @@ bus-frequency = <0>; // From U-Boot 32-bit; linux,phandle = <201>; - linux,boot-cpu; }; };@@ -152,7 +151,7 @@ #address-cells = <3>; reg = <1000 1000>; bus-range = <0 0>; - ranges = <02000000 0 e0000000 e0000000 0 1A000000 + ranges = <02000000 0 e0000000 e0000000 0 1A000000 01000000 0 00000000 fa000000 0 00010000>; clock-frequency = <7f28154>; interrupt-parent = <7400>;diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts index 26b44f7..c9ffc12 100644 --- a/arch/powerpc/boot/dts/mpc8272ads.dts +++ b/arch/powerpc/boot/dts/mpc8272ads.dts@@ -34,7 +34,6 @@ clock-frequency = <0>; 32-bit; linux,phandle = <201>; - linux,boot-cpu; }; };@@ -53,13 +52,6 @@ reg = <00000000 4000000 f4500000 00000020>; }; - chosen { - name = "chosen"; - linux,platform = <0>; - interrupt-controller = <10c00>; - linux,phandle = <400>; - }; - soc8272@f0000000 { #address-cells = <1>; #size-cells = <1>;diff --git a/arch/powerpc/boot/dts/mpc8323emds.dts b/arch/powerpc/boot/dts/mpc8323emds.dts index fa7ef24..eaf0f86 100644 --- a/arch/powerpc/boot/dts/mpc8323emds.dts +++ b/arch/powerpc/boot/dts/mpc8323emds.dts@@ -34,7 +34,6 @@ clock-frequency = <0>; 32-bit; linux,phandle = <201>; - linux,boot-cpu; }; };@@ -174,7 +173,7 @@ built-in; device_type = "ipic"; }; - + par_io@1400 { reg = <1400 100>; device_type = "par_io";@@ -237,11 +236,11 @@ reg = <e0100000 480>; brg-frequency = <0>; bus-frequency = <BCD3D80>; - + muram@10000 { device_type = "muram"; ranges = <0 00010000 00004000>; - + data-only@0 { reg = <0 4000>; };diff --git a/arch/powerpc/boot/dts/mpc8360emds.dts b/arch/powerpc/boot/dts/mpc8360emds.dts index 9022192..303bd66 100644 --- a/arch/powerpc/boot/dts/mpc8360emds.dts +++ b/arch/powerpc/boot/dts/mpc8360emds.dts@@ -39,7 +39,6 @@ clock-frequency = <1F78A400>; 32-bit; linux,phandle = <201>; - linux,boot-cpu; }; };diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts index 119bd5d..c74d6eb 100644 --- a/arch/powerpc/boot/dts/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/mpc8560ads.dts@@ -35,7 +35,6 @@ clock-frequency = <312c8040>; 32-bit; linux,phandle = <201>; - linux,boot-cpu; }; };diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index f0c7731..258fccb 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts@@ -32,7 +32,6 @@ bus-frequency = <0>; // From uboot clock-frequency = <0>; // From uboot 32-bit; - linux,boot-cpu; }; PowerPC,8641@1 { device_type = "cpu";@@ -142,7 +141,7 @@ interrupt-parent = <40000>; phy-handle = <2452001>; }; - + ethernet@26000 { #address-cells = <1>; #size-cells = <0>;diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts index 5d40052..2b56b5d 100644 --- a/arch/powerpc/boot/dts/mpc866ads.dts +++ b/arch/powerpc/boot/dts/mpc866ads.dts@@ -37,7 +37,6 @@ interrupts = <f 2>; // decrementer interrupt interrupt-parent = <ff000000>; linux,phandle = <201>; - linux,boot-cpu; }; };diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts index cf1a19f..faecd08 100644 --- a/arch/powerpc/boot/dts/mpc885ads.dts +++ b/arch/powerpc/boot/dts/mpc885ads.dts@@ -37,7 +37,6 @@ interrupts = <f 2>; // decrementer interrupt interrupt-parent = <ff000000>; linux,phandle = <201>; - linux,boot-cpu; }; };