2.6.25-rc3 on mpc8548amc doesn't boot

["maxime louvel" <m.louvel@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 2003 bytes --]

Hi,

I am still trying to make a 2.6.25-rc3 vanilla kernel boot (an work fine in
a second time) on a mpc8548amc board.
I have add the platform specific stuff from the sources of the current
kernel running on the cards.
What I have basically add is:
- arch/powerpc/platforms/85xx/mpc85xx_amc.c
- arch/powerpc/boot/dts/mpc8548amc.dts
I have also changed the Kconfig and Makefile in the
arch/powerpc/platforms/85xx to make the kernel try to support my board

I have encountered some problem when compiling a uImage that I have
basically solve like this (in arch/powerpc/boot/Makefile)
#$(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
#$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
#$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
#$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
#$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405

I have a gcc-3.4.3 embedded compiler with some stuff specific to the
platform.

After the previous hack, I have been able to compile a uImage.

I have tried to boot it and this is what I got:
AMC=> bootm 0x1000000
## Booting image at 01000000 ...
  Image Name:   Linux-2.6.24
  Image Type:   PowerPC Linux Kernel Image (gzip compressed)
  Data Size:    1802038 Bytes =  1.7 MB
  Load Address: 00000000
  Entry Point:  00000000
  Verifying Checksum ... OK
  Uncompressing Kernel Image ... OK

No further messages...

I have recently updated the uboot of the cards (to support the new image
version) and I am capable of booting a 2.6.23.6 image.
This last image has been compiled from a vanilla kernel where I have add the
platform specific stuff (cf beginning of this mail).

Since my 2.6.23.6 image works fine, I have tried to adapt the file I have
added to the 2.6.25-rc3 kernel.

I have made some changes in the arch/powerpc/platforms/85xx/mpc85xx_amc.c
file and in the mpc8548amc.dts file.
I have attached the changes I have done on both files.

Do you have an idea ?

cheers,
Maxime

-- 
Maxime Louvel
0044 7964 5555 80
43 Allen road
Whitemore reans
WV60AW Wolverhampton
United Kingdom

[-- Attachment #1.2: Type: text/html, Size: 2322 bytes --]

[-- Attachment #2: 2.6.23.6.mpc8548_amc_2.6.25-rc3.mpc85xx_amc --]
[-- Type: application/octet-stream, Size: 1263 bytes --]

--- ../../srcChanges/2.6.23.6/mpc8548_amc.c	2008-02-27 12:27:33.000000000 +0000
+++ linux-2.6.25-rc3_changed/arch/powerpc/platforms/85xx/mpc85xx_amc.c	2008-02-27 10:29:13.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * MPC8548 AMC board specific routines
+ * MPC85xx AMC board specific routines
  *
  * Copyright 2006 Freescale Semiconductor Inc.
  *
@@ -23,14 +23,20 @@
 #include <asm/prom.h>
 #include <mm/mmu_decl.h>
 #include <asm/udbg.h>
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
+/* #include <asm/of_device.h> */
+/* #include <asm/of_platform.h> */
+/* commit:
+ * [POWERPC] 8xxx: Convert #include of asm/of_{platform, device}.h
+                   into linux/of_{platform, device}.h.
+ */
+#include <linux/of_device.h>  
+#include <linux/of_platform.h>
 
 #include <asm/mpic.h>
 
 #include <sysdev/fsl_soc.h>
-/*#include <sysdev/fsl_rio.h>*/
-#include "mpc85xx.h"
+#include <sysdev/fsl_rio.h>
+/* #include "mpc85xx.h" */
 
 #ifndef CONFIG_PCI
 unsigned long isa_io_base = 0;
@@ -141,7 +147,7 @@
 	.init_IRQ		= mpc85xx_amc_pic_init,
 	.show_cpuinfo		= mpc85xx_amc_show_cpuinfo,
 	.get_irq		= mpic_get_irq,
-	.restart		= mpc85xx_restart,
+	.restart		= fsl_rstcr_restart,
 	.calibrate_decr		= generic_calibrate_decr,
 	.progress		= udbg_progress,
 };

[-- Attachment #3: 2.6.23.6.mpc8548dts_2.6.25-rc3.mpc8548dts --]
[-- Type: application/octet-stream, Size: 2593 bytes --]

--- ../../srcChanges/2.6.23.6/mpc8548amc.dts	2008-02-27 12:27:46.000000000 +0000
+++ linux-2.6.25-rc3_changed/arch/powerpc/boot/dts/mpc8548amc.dts	2008-02-27 10:22:13.000000000 +0000
@@ -15,6 +15,12 @@
 	compatible = "MPC8548AMC";
 	#address-cells = <1>;
 	#size-cells = <1>;
+	aliases {
+	        ethernet0 = &enet0;
+		ethernet1 = &enet1;
+		ethernet2 = &enet2;
+		ethernet3 = &enet3;
+        };
 
 	cpus {
 		#cpus = <1>;
@@ -31,7 +37,6 @@
 			timebase-frequency = <0>;	// 33 MHz, from uboot
 			bus-frequency = <0>;		// From uboot
 			clock-frequency = <0>;		// From uboot
-			32-bit;
 		};
 	};
 
@@ -43,14 +48,15 @@
 	soc8548@e0000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		#interrupt-cells = <2>;
 		device_type = "soc";
 		ranges = <0 e0000000 00100000>;
 		reg = <e0000000 00100000>;	// CCSRBAR 1M
 		bus-frequency = <0>;
-
+	
 		i2c@3000 {
-			device_type = "i2c";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			cell-index = <0>
 			compatible = "fsl-i2c";
 			reg = <3000 100>;
 			interrupts = <1b 2>;
@@ -58,13 +64,24 @@
 			dfsrr;
 		};
 
+		i2c@3100 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			cell-index = <1>;
+			compatible = "fsl-i2c";
+			reg = <3100 100>;
+			interrupts = <1b 2>;
+			interrupt-parent = <&mpic>;
+			dfsrr;
+		};
+
 		mdio@24520 {
 			#address-cells = <1>;
 			#size-cells = <0>;
-			device_type = "mdio";
-			compatible = "gianfar";
+			compatible = "fsl,gianfar-mdio";
 			reg = <24520 20>;
 			linux,phandle = <24520>;
+			
 			phy0: ethernet-phy@10 {
 				interrupt-parent = <&mpic>;
 				interrupts = <34 1>;
@@ -91,9 +108,8 @@
 			};
 		};
 
-		ethernet@24000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
+		enet0: ethernet@24000 {
+		        cell-index = <0>;
 			device_type = "network";
 			model = "eTSEC";
 			compatible = "gianfar";
@@ -104,9 +120,8 @@
 			phy-handle = <&phy0>;
 		};
 
-		ethernet@25000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
+		enet1: ethernet@25000 {
+		        cell-index = <1>;
 			device_type = "network";
 			model = "eTSEC";
 			compatible = "gianfar";
@@ -117,9 +132,8 @@
 			phy-handle = <&phy1>;
 		};
 		
-		ethernet@26000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
+		enet3: ethernet@26000 {
+		        cell-index = <2>;
 			device_type = "network";
 			model = "eTSEC";
 			compatible = "gianfar";
@@ -130,9 +144,8 @@
 			phy-handle = <&phy2>;
 		};
 
-		ethernet@27000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
+		enet4: ethernet@27000 {
+		        cell-index = <3>;
 			device_type = "network";
 			model = "eTSEC";
 			compatible = "gianfar";