Small 4xx updates for 2.6.24

Add a cuboot wrapper for the Bamboo board. This also removes some obsoleted linker declarations that have been moved into ops.h

Signed-off-by Josh Boyer <[email protected]>

Acked-by David Gibson <[email protected]>

arch/powerpc/boot/bamboo.c +4 -1

 static void bamboo_fixups(void)
 {

@@ -34,12 +33,15 @@ static void bamboo_fixups(void)
 	ibm440ep_fixup_clocks(sysclk, 11059200);
 	ibm4xx_fixup_memsize();
 	ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
+	dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1);
 }
 
-void bamboo_init(void)
+void bamboo_init(void *mac0, void *mac1)
 {
 	platform_ops.fixups = bamboo_fixups;
 	platform_ops.exit = ibm44x_dbcr_reset;
+	bamboo_mac0 = mac0;
+	bamboo_mac1 = mac1;
 	ft_init(_dtb_start, 0, 32);
 	serial_console_init();
 }

arch/powerpc/boot/treeboot-bamboo.c +19 -3

@@ -12,16 +12,32 @@
 #include "ops.h"
 #include "stdio.h"
 #include "44x.h"
-
-extern char _end[];
+#include "stdlib.h"
 
 BSS_STACK(4096);
 
+#define PIBS_MAC0 0xfffc0400
+#define PIBS_MAC1 0xfffc0500
+char pibs_mac0[6];
+char pibs_mac1[6];
+
+static void read_pibs_mac(void)
+{
+	unsigned long long mac64;
+
+	mac64 = strtoull((char *)PIBS_MAC0, 0, 16);
+	memcpy(&pibs_mac0, (char *)&mac64+2, 6);
+
+	mac64 = strtoull((char *)PIBS_MAC1, 0, 16);
+	memcpy(&pibs_mac1, (char *)&mac64+2, 6);
+}
+
 void platform_init(void)
 {
 	unsigned long end_of_ram = 0x8000000;
 	unsigned long avail_ram = end_of_ram - (unsigned long)_end;
 
 	simple_alloc_init(_end, avail_ram, 32, 64);
-	bamboo_init();
+	read_pibs_mac();
+	bamboo_init((u8 *)&pibs_mac0, (u8 *)&pibs_mac1);
 }

Quoted 5 lines · Josh Boyer

Add a cuboot wrapper for the Bamboo board. This also removes some obsoleted linker declarations that have been moved into ops.h

Signed-off-by Josh Boyer <[email protected]>

Acked-by David Gibson <[email protected]>

Heh, well, I know I acked this already, but...

[snip]

arch/powerpc/boot/cuboot-bamboo.c line 2

Quoted 5 lines

arch/powerpc/boot/cuboot-bamboo.c new file +2 -0

@@ -0,0 +1,30 @@
+/*
+ * Old U-boot compatibility for Ebony

Error in the comment here.

[snip]

Quoted 6 lines

arch/powerpc/boot/bamboo.c +0 -0

@@ -24,8 +24,7 @@
 #include "4xx.h"
 #include "44x.h"
 

arch/powerpc/boot/bamboo.c line 27

Quoted 3 lines

arch/powerpc/boot/bamboo.c +1 -2

-extern char _dtb_start[];
-extern char _dtb_end[];
+static u8 *bamboo_mac0, *bamboo_mac1;

This additional handling of the MAC addresses should really also be mentioned in the commit comment.

The latest physmap_of driver has a small error where it will fail the probe with:

physmap-flash: probe of fff00000.small-flas failed with error -2

if there are no partition subnodes in the device tree and the old style binding is not used. Since partition definitions are optional, the probe should still succeed.

Signed-off-by Josh Boyer <[email protected]>

A new binding for flash devices was recently introduced. This updates the Walnut DTS to use the new binding.

Signed-off-by Josh Boyer <[email protected]>

Quoted 4 lines · Josh Boyer

A new binding for flash devices was recently introduced. This updates the Walnut DTS to use the new binding.

Signed-off-by Josh Boyer <[email protected]>

Acked-by David Gibson <[email protected]>

We should both really figure out the vendor/device ids of the JEDEC flash chips in use here and on Ebony, and add the appropriate properties as per the binding.

A new binding for flash devices was recently introduced. This updates the Walnut DTS to use the new binding.

Signed-off-by Josh Boyer <[email protected]>

---
 arch/powerpc/boot/dts/walnut.dts |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

arch/powerpc/boot/dts/walnut.dts +5 -3

@@ -137,6 +137,10 @@
 			dcr-reg = <012 2>;
 			#address-cells = <2>;
 			#size-cells = <1>;
+			/* The ranges property is supplied by the bootwrapper
+			 * and is based on the firmware's configuration of the
+			 * EBC bridge
+			 */
 			clock-frequency = <0>; /* Filled in by zImage */
 
 			sram@0,0 {

@@ -144,13 +148,16 @@
 			};
 
 			flash@0,80000 {
-				device_type = "rom";
-				compatible = "direct-mapped";
-				probe-type = "JEDEC";
+				compatible = "jedec-flash";
 				bank-width = <1>;

Quoted 36 lines · Josh Boyer

A new binding for flash devices was recently introduced. This updates the Walnut DTS to use the new binding.

Signed-off-by Josh Boyer <[email protected]>

---
 arch/powerpc/boot/dts/walnut.dts |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

arch/powerpc/boot/dts/walnut.dts +8 -5

@@ -137,6 +137,10 @@
 			dcr-reg = <012 2>;
 			#address-cells = <2>;
 			#size-cells = <1>;
+			/* The ranges property is supplied by the bootwrapper
+			 * and is based on the firmware's configuration of the
+			 * EBC bridge
+			 */
 			clock-frequency = <0>; /* Filled in by zImage */
 
 			sram@0,0 {

@@ -144,13 +148,16 @@
 			};
 
 			flash@0,80000 {
-				device_type = "rom";
-				compatible = "direct-mapped";
-				probe-type = "JEDEC";
+				compatible = "jedec-flash";
 				bank-width = <1>;
-				partitions = <0 80000>;
-				partition-names = "OpenBIOS";
 				reg = <0 80000 80000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				partition@0 {

arch/powerpc/boot/dts/walnut.dts line 160

Quoted 4 lines

arch/powerpc/boot/dts/walnut.dts +4 -0

+					label = "OpenBIOS";
+					reg = <0 80000>;
+					read-only;
+				};

There are not only Bamboo board running PIBS, but running U-Boot too. How should we handle this different FLASH partitioning? Same goes for Ebony too btw.

On Sat, 2007-09-15 at 05:23 +0200, Stefan Roese wrote:

Quoted 3 lines

There are not only Bamboo board running PIBS, but running U-Boot too. How should we handle this different FLASH partitioning? Same goes for Ebony too btw.

That's a good question. I'm working on making the NOR flash show up for Bamboo right now, and I had intended to just leave the partition subnodes missing.

Quoted 1 line · In message <[email protected]> Josh Boyer wrote:

On Sat, 2007-09-15 at 05:23 +0200, Stefan Roese wrote:

...

Quoted 4 lines

Quoted 3 lines

There are not only Bamboo board running PIBS, but running U-Boot too. How should we handle this different FLASH partitioning? Same goes for Ebony too btw.

Quoted 3 lines

That's a good question. I'm working on making the NOR flash show up for Bamboo right now, and I had intended to just leave the partition subnodes missing.

Maybe we can have U-Boot add the partition information if it's missing in the device tree, and extend the mtdparts command in U-Boot to add / adjust settings so they match what is defined in U-Boot.

Quoted 3 lines

Maybe we can have U-Boot add the partition information if it's missing in the device tree, and extend the mtdparts command in U-Boot to add / adjust settings so they match what is defined in U-Boot.

That would be great for newer U-Boots. For existing older ones, it doesn't really solve the problem. But then again, there's no way to possibly define all the partitioning schemes people may have adopted to their needs on their boards. And I believe that is why David has RedBoot and command line partitioning override what is in the DTS today.

Quoted 10 lines

Quoted 3 lines

Maybe we can have U-Boot add the partition information if it's missing in the device tree, and extend the mtdparts command in U-Boot to add / adjust settings so they match what is defined in U-Boot.

That would be great for newer U-Boots. For existing older ones, it doesn't really solve the problem. But then again, there's no way to possibly define all the partitioning schemes people may have adopted to their needs on their boards. And I believe that is why David has RedBoot and command line partitioning override what is in the DTS today.

Yeah, partitioning information really doesn't belong in the device tree -- with the possible exception of the partitions that the firmware (uboot in this case) needs to know about anyway.

You *can* put all partitioning info in the device tree, but that doesn't mean you *should* :-)

Quoted 1 line · In message <[email protected]> Josh Boyer wrote:

On Sat, 2007-09-15 at 05:23 +0200, Stefan Roese wrote:

...

Quoted 7 lines

Quoted 3 lines

There are not only Bamboo board running PIBS, but running U-Boot too. How should we handle this different FLASH partitioning? Same goes for Ebony too btw.

That's a good question. I'm working on making the NOR flash show up for Bamboo right now, and I had intended to just leave the partition subnodes missing.

Maybe we can have U-Boot add the partition information if it's missing in the device tree, and extend the mtdparts command in U-Boot to add / adjust settings so they match what is defined in U-Boot.

Stefan, what do you think?

A new binding for flash devices was recently introduced. This updates the Sequoia DTS to use the new binding and enabled MTD in the defconfig.

Signed-off-by Josh Boyer <[email protected]>

Quoted 4 lines · Josh Boyer

A new binding for flash devices was recently introduced. This updates the Sequoia DTS to use the new binding and enabled MTD in the defconfig.

Signed-off-by Josh Boyer <[email protected]>

Acked-by David Gibson <[email protected]>