|
|
@@ -1,6 +1,5 @@
|
|
|
-diff -Nur a/arch/powerpc/boot/cuboot-magicboxv1.c b/arch/powerpc/boot/cuboot-magicboxv1.c
|
|
|
---- a/arch/powerpc/boot/cuboot-magicboxv1.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
-+++ b/arch/powerpc/boot/cuboot-magicboxv1.c 2008-11-23 20:13:57.000000000 +0100
|
|
|
+--- /dev/null
|
|
|
++++ b/arch/powerpc/boot/cuboot-magicboxv1.c
|
|
|
@@ -0,0 +1,40 @@
|
|
|
+/*
|
|
|
+ * Old U-boot compatibility for Magicbox v1
|
|
|
@@ -42,9 +41,8 @@ diff -Nur a/arch/powerpc/boot/cuboot-magicboxv1.c b/arch/powerpc/boot/cuboot-mag
|
|
|
+ fdt_init(_dtb_start);
|
|
|
+ serial_console_init();
|
|
|
+}
|
|
|
-diff -Nur a/arch/powerpc/boot/dts/magicboxv1.dts b/arch/powerpc/boot/dts/magicboxv1.dts
|
|
|
---- a/arch/powerpc/boot/dts/magicboxv1.dts 1970-01-01 01:00:00.000000000 +0100
|
|
|
-+++ b/arch/powerpc/boot/dts/magicboxv1.dts 2008-11-26 09:14:46.000000000 +0100
|
|
|
+--- /dev/null
|
|
|
++++ b/arch/powerpc/boot/dts/magicboxv1.dts
|
|
|
@@ -0,0 +1,217 @@
|
|
|
+/*
|
|
|
+ * Device Tree Source for Magicbox v1
|
|
|
@@ -263,10 +261,9 @@ diff -Nur a/arch/powerpc/boot/dts/magicboxv1.dts b/arch/powerpc/boot/dts/magicbo
|
|
|
+ linux,stdout-path = "/plb/opb/serial@ef600300";
|
|
|
+ };
|
|
|
+};
|
|
|
-diff -Nur a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
|
|
|
---- a/arch/powerpc/boot/Makefile 2008-11-26 09:14:31.000000000 +0100
|
|
|
-+++ b/arch/powerpc/boot/Makefile 2008-11-22 21:21:01.000000000 +0100
|
|
|
-@@ -69,7 +69,7 @@
|
|
|
+--- a/arch/powerpc/boot/Makefile
|
|
|
++++ b/arch/powerpc/boot/Makefile
|
|
|
+@@ -69,7 +69,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
|
|
|
cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
|
|
|
cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
|
|
|
virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
|
|
|
@@ -275,7 +272,7 @@ diff -Nur a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
|
|
|
src-boot := $(src-wlib) $(src-plat) empty.c
|
|
|
|
|
|
src-boot := $(addprefix $(obj)/, $(src-boot))
|
|
|
-@@ -213,6 +213,7 @@
|
|
|
+@@ -213,6 +213,7 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImag
|
|
|
image-$(CONFIG_EP405) += dtbImage.ep405
|
|
|
image-$(CONFIG_WALNUT) += treeImage.walnut
|
|
|
image-$(CONFIG_ACADIA) += cuImage.acadia
|
|
|
@@ -283,10 +280,9 @@ diff -Nur a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
|
|
|
|
|
|
# Board ports in arch/powerpc/platform/44x/Kconfig
|
|
|
image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony
|
|
|
-diff -Nur a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
|
|
|
---- a/arch/powerpc/platforms/40x/Kconfig 2008-11-26 09:14:31.000000000 +0100
|
|
|
-+++ b/arch/powerpc/platforms/40x/Kconfig 2008-11-18 14:28:06.000000000 +0100
|
|
|
-@@ -41,6 +41,16 @@
|
|
|
+--- a/arch/powerpc/platforms/40x/Kconfig
|
|
|
++++ b/arch/powerpc/platforms/40x/Kconfig
|
|
|
+@@ -41,6 +41,16 @@ config KILAUEA
|
|
|
help
|
|
|
This option enables support for the AMCC PPC405EX evaluation board.
|
|
|
|
|
|
@@ -303,10 +299,9 @@ diff -Nur a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kcon
|
|
|
config MAKALU
|
|
|
bool "Makalu"
|
|
|
depends on 40x
|
|
|
-diff -Nur a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
|
|
|
---- a/arch/powerpc/platforms/40x/ppc40x_simple.c 2008-11-26 09:14:31.000000000 +0100
|
|
|
-+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c 2008-11-18 14:29:59.000000000 +0100
|
|
|
-@@ -51,7 +51,8 @@
|
|
|
+--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
|
|
|
++++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
|
|
|
+@@ -51,7 +51,8 @@ machine_device_initcall(ppc40x_simple, p
|
|
|
* board.c file for it rather than adding it to this list.
|
|
|
*/
|
|
|
static char *board[] __initdata = {
|
Gabor Juhos