aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/taishan.dts
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2008-02-25 19:43:20 -0500
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-03-26 08:19:16 -0400
commitecc6cd73b7ccfa10c1f07d017fc7f62fe78eaab5 (patch)
treea98a3e830ad2e59959c156fb79f5c2c25024eb44 /arch/powerpc/boot/dts/taishan.dts
parent54f53f2b94feb72622bec7a8563fc487d9f97720 (diff)
[POWERPC] Start removing linux,network-index in favour of aliases
This patch alters the bootwrapper for a number of machines (roubhly all 4xx based cuboot or treeboot platforms) to use aliases instead of the linux,network-index hack to work out which MAC address to attach to which ethernet device node. The now obsolete linux,network-index properties are removed from the corresponding device trees. This won't break backwards compatiblity, because in cases where this fixup code is relevant, the device tree is part of the kernel image. The references to linux,network-index are removed from booting-without-of.txt. Not only is it now deprecated, but as a hack applicable only when the device tree blob and fixup code were in the same image, this property never belonged in booting-without-of.txt which describes the interface between the kernel and firmware or bootloaders which produce a device tree. By the time the device tree reaches the kernel, all the MAC addresses must be fully filled in. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/boot/dts/taishan.dts')
-rw-r--r--arch/powerpc/boot/dts/taishan.dts4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts
index 8278068c802..466c3f35ce1 100644
--- a/arch/powerpc/boot/dts/taishan.dts
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -235,7 +235,6 @@
235 235
236 EMAC0: ethernet@40000800 { 236 EMAC0: ethernet@40000800 {
237 unused = <1>; 237 unused = <1>;
238 linux,network-index = <2>;
239 device_type = "network"; 238 device_type = "network";
240 compatible = "ibm,emac-440gx", "ibm,emac4"; 239 compatible = "ibm,emac-440gx", "ibm,emac4";
241 interrupt-parent = <&UIC1>; 240 interrupt-parent = <&UIC1>;
@@ -256,7 +255,6 @@
256 }; 255 };
257 EMAC1: ethernet@40000900 { 256 EMAC1: ethernet@40000900 {
258 unused = <1>; 257 unused = <1>;
259 linux,network-index = <3>;
260 device_type = "network"; 258 device_type = "network";
261 compatible = "ibm,emac-440gx", "ibm,emac4"; 259 compatible = "ibm,emac-440gx", "ibm,emac4";
262 interrupt-parent = <&UIC1>; 260 interrupt-parent = <&UIC1>;
@@ -277,7 +275,6 @@
277 }; 275 };
278 276
279 EMAC2: ethernet@40000c00 { 277 EMAC2: ethernet@40000c00 {
280 linux,network-index = <0>;
281 device_type = "network"; 278 device_type = "network";
282 compatible = "ibm,emac-440gx", "ibm,emac4"; 279 compatible = "ibm,emac-440gx", "ibm,emac4";
283 interrupt-parent = <&UIC2>; 280 interrupt-parent = <&UIC2>;
@@ -300,7 +297,6 @@
300 }; 297 };
301 298
302 EMAC3: ethernet@40000e00 { 299 EMAC3: ethernet@40000e00 {
303 linux,network-index = <1>;
304 device_type = "network"; 300 device_type = "network";
305 compatible = "ibm,emac-440gx", "ibm,emac4"; 301 compatible = "ibm,emac-440gx", "ibm,emac4";
306 interrupt-parent = <&UIC2>; 302 interrupt-parent = <&UIC2>;