diff options
author | Timur Tabi <timur@freescale.com> | 2007-02-14 16:29:07 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-02-15 22:00:20 -0500 |
commit | 32aed2a5ce31dc8f42811a0e74020f230241165a (patch) | |
tree | a7e359ee245ca162d23643adeb07c081a430d6e6 | |
parent | c243f983a52eca8eb2a73113222887149836d45c (diff) |
[POWERPC] Delete boot-cpu property from all DTS files
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.
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
Acked-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | Documentation/powerpc/booting-without-of.txt | 5 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/kuroboxHD.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/kuroboxHG.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc7448hpc2.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8272ads.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8323emds.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8360emds.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8560ads.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8641_hpcn.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc866ads.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc885ads.dts | 1 |
11 files changed, 2 insertions, 13 deletions
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index 3b514672b80e..1e1abaf83712 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
@@ -497,7 +497,7 @@ looks like in practice. | |||
497 | | |- device_type = "cpu" | 497 | | |- device_type = "cpu" |
498 | | |- reg = <0> | 498 | | |- reg = <0> |
499 | | |- clock-frequency = <5f5e1000> | 499 | | |- clock-frequency = <5f5e1000> |
500 | | |- linux,boot-cpu | 500 | | |- 64-bit |
501 | | |- linux,phandle = <2> | 501 | | |- linux,phandle = <2> |
502 | | | 502 | | |
503 | o memory@0 | 503 | o memory@0 |
@@ -519,7 +519,7 @@ physical memory layout. It also includes misc information passed | |||
519 | through /chosen, like in this example, the platform type (mandatory) | 519 | through /chosen, like in this example, the platform type (mandatory) |
520 | and the kernel command line arguments (optional). | 520 | and the kernel command line arguments (optional). |
521 | 521 | ||
522 | The /cpus/PowerPC,970@0/linux,boot-cpu property is an example of a | 522 | The /cpus/PowerPC,970@0/64-bit property is an example of a |
523 | property without a value. All other properties have a value. The | 523 | property without a value. All other properties have a value. The |
524 | significance of the #address-cells and #size-cells properties will be | 524 | significance of the #address-cells and #size-cells properties will be |
525 | explained in chapter IV which defines precisely the required nodes and | 525 | explained in chapter IV which defines precisely the required nodes and |
@@ -778,7 +778,6 @@ address which can extend beyond that limit. | |||
778 | bytes | 778 | bytes |
779 | - d-cache-size : one cell, size of L1 data cache in bytes | 779 | - d-cache-size : one cell, size of L1 data cache in bytes |
780 | - i-cache-size : one cell, size of L1 instruction cache in bytes | 780 | - i-cache-size : one cell, size of L1 instruction cache in bytes |
781 | - linux, boot-cpu : Should be defined if this cpu is the boot cpu. | ||
782 | 781 | ||
783 | Recommended properties: | 782 | Recommended properties: |
784 | 783 | ||
diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts index 096e94ac415f..b89791802e86 100644 --- a/arch/powerpc/boot/dts/kuroboxHD.dts +++ b/arch/powerpc/boot/dts/kuroboxHD.dts | |||
@@ -35,7 +35,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" | |||
35 | 35 | ||
36 | PowerPC,603e { /* Really 8241 */ | 36 | PowerPC,603e { /* Really 8241 */ |
37 | linux,phandle = <2100>; | 37 | linux,phandle = <2100>; |
38 | linux,boot-cpu; | ||
39 | device_type = "cpu"; | 38 | device_type = "cpu"; |
40 | reg = <0>; | 39 | reg = <0>; |
41 | clock-frequency = <bebc200>; /* Fixed by bootwrapper */ | 40 | clock-frequency = <bebc200>; /* Fixed by bootwrapper */ |
diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts index d06b0b018899..753102752d8b 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 kuroboxHG.dtb -V 16 kuroboxHG.dts" | |||
35 | 35 | ||
36 | PowerPC,603e { /* Really 8241 */ | 36 | PowerPC,603e { /* Really 8241 */ |
37 | linux,phandle = <2100>; | 37 | linux,phandle = <2100>; |
38 | linux,boot-cpu; | ||
39 | device_type = "cpu"; | 38 | device_type = "cpu"; |
40 | reg = <0>; | 39 | reg = <0>; |
41 | clock-frequency = <fdad680>; /* Fixed by bootwrapper */ | 40 | clock-frequency = <fdad680>; /* Fixed by bootwrapper */ |
diff --git a/arch/powerpc/boot/dts/mpc7448hpc2.dts b/arch/powerpc/boot/dts/mpc7448hpc2.dts index c4d9562cbaad..41d0720c5900 100644 --- a/arch/powerpc/boot/dts/mpc7448hpc2.dts +++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts | |||
@@ -36,7 +36,6 @@ | |||
36 | bus-frequency = <0>; // From U-Boot | 36 | bus-frequency = <0>; // From U-Boot |
37 | 32-bit; | 37 | 32-bit; |
38 | linux,phandle = <201>; | 38 | linux,phandle = <201>; |
39 | linux,boot-cpu; | ||
40 | }; | 39 | }; |
41 | }; | 40 | }; |
42 | 41 | ||
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts index 26b44f7513dc..260b2e447779 100644 --- a/arch/powerpc/boot/dts/mpc8272ads.dts +++ b/arch/powerpc/boot/dts/mpc8272ads.dts | |||
@@ -34,7 +34,6 @@ | |||
34 | clock-frequency = <0>; | 34 | clock-frequency = <0>; |
35 | 32-bit; | 35 | 32-bit; |
36 | linux,phandle = <201>; | 36 | linux,phandle = <201>; |
37 | linux,boot-cpu; | ||
38 | }; | 37 | }; |
39 | }; | 38 | }; |
40 | 39 | ||
diff --git a/arch/powerpc/boot/dts/mpc8323emds.dts b/arch/powerpc/boot/dts/mpc8323emds.dts index fa7ef24d205b..57a3665f82ed 100644 --- a/arch/powerpc/boot/dts/mpc8323emds.dts +++ b/arch/powerpc/boot/dts/mpc8323emds.dts | |||
@@ -34,7 +34,6 @@ | |||
34 | clock-frequency = <0>; | 34 | clock-frequency = <0>; |
35 | 32-bit; | 35 | 32-bit; |
36 | linux,phandle = <201>; | 36 | linux,phandle = <201>; |
37 | linux,boot-cpu; | ||
38 | }; | 37 | }; |
39 | }; | 38 | }; |
40 | 39 | ||
diff --git a/arch/powerpc/boot/dts/mpc8360emds.dts b/arch/powerpc/boot/dts/mpc8360emds.dts index 9022192155b9..303bd668deb7 100644 --- a/arch/powerpc/boot/dts/mpc8360emds.dts +++ b/arch/powerpc/boot/dts/mpc8360emds.dts | |||
@@ -39,7 +39,6 @@ | |||
39 | clock-frequency = <1F78A400>; | 39 | clock-frequency = <1F78A400>; |
40 | 32-bit; | 40 | 32-bit; |
41 | linux,phandle = <201>; | 41 | linux,phandle = <201>; |
42 | linux,boot-cpu; | ||
43 | }; | 42 | }; |
44 | }; | 43 | }; |
45 | 44 | ||
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts index 119bd5d3a834..c74d6ebc5c8a 100644 --- a/arch/powerpc/boot/dts/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/mpc8560ads.dts | |||
@@ -35,7 +35,6 @@ | |||
35 | clock-frequency = <312c8040>; | 35 | clock-frequency = <312c8040>; |
36 | 32-bit; | 36 | 32-bit; |
37 | linux,phandle = <201>; | 37 | linux,phandle = <201>; |
38 | linux,boot-cpu; | ||
39 | }; | 38 | }; |
40 | }; | 39 | }; |
41 | 40 | ||
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index f0c7731743ea..8c75e4e1258f 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts | |||
@@ -32,7 +32,6 @@ | |||
32 | bus-frequency = <0>; // From uboot | 32 | bus-frequency = <0>; // From uboot |
33 | clock-frequency = <0>; // From uboot | 33 | clock-frequency = <0>; // From uboot |
34 | 32-bit; | 34 | 32-bit; |
35 | linux,boot-cpu; | ||
36 | }; | 35 | }; |
37 | PowerPC,8641@1 { | 36 | PowerPC,8641@1 { |
38 | device_type = "cpu"; | 37 | device_type = "cpu"; |
diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts index 5d4005239b83..2b56b5df451a 100644 --- a/arch/powerpc/boot/dts/mpc866ads.dts +++ b/arch/powerpc/boot/dts/mpc866ads.dts | |||
@@ -37,7 +37,6 @@ | |||
37 | interrupts = <f 2>; // decrementer interrupt | 37 | interrupts = <f 2>; // decrementer interrupt |
38 | interrupt-parent = <ff000000>; | 38 | interrupt-parent = <ff000000>; |
39 | linux,phandle = <201>; | 39 | linux,phandle = <201>; |
40 | linux,boot-cpu; | ||
41 | }; | 40 | }; |
42 | }; | 41 | }; |
43 | 42 | ||
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts index cf1a19f962c5..faecd08c54da 100644 --- a/arch/powerpc/boot/dts/mpc885ads.dts +++ b/arch/powerpc/boot/dts/mpc885ads.dts | |||
@@ -37,7 +37,6 @@ | |||
37 | interrupts = <f 2>; // decrementer interrupt | 37 | interrupts = <f 2>; // decrementer interrupt |
38 | interrupt-parent = <ff000000>; | 38 | interrupt-parent = <ff000000>; |
39 | linux,phandle = <201>; | 39 | linux,phandle = <201>; |
40 | linux,boot-cpu; | ||
41 | }; | 40 | }; |
42 | }; | 41 | }; |
43 | 42 | ||