diff options
Diffstat (limited to 'target/linux/ppc40x')
| -rw-r--r-- | target/linux/ppc40x/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ppc40x/patches/003-ppc40x_simple_platform_support.patch | 7 | ||||
| -rw-r--r-- | target/linux/ppc40x/patches/004-acadia_cuboot.patch | 9 | ||||
| -rw-r--r-- | target/linux/ppc40x/patches/005-magicboxv1.patch | 33 | ||||
| -rw-r--r-- | target/linux/ppc40x/patches/006-magicboxv2.patch | 33 |
5 files changed, 31 insertions, 53 deletions
diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 163e5add95..44a4af86f2 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -11,7 +11,7 @@ BOARD:=ppc40x BOARDNAME:=AMCC/IBM PPC40x FEATURES:=squashfs -LINUX_VERSION:=2.6.27.7 +LINUX_VERSION:=2.6.27.8 LINUX_KARCH:=powerpc include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/patches/003-ppc40x_simple_platform_support.patch b/target/linux/ppc40x/patches/003-ppc40x_simple_platform_support.patch index 3f07ee5e8a..1f7fe7efd6 100644 --- a/target/linux/ppc40x/patches/003-ppc40x_simple_platform_support.patch +++ b/target/linux/ppc40x/patches/003-ppc40x_simple_platform_support.patch @@ -1,5 +1,3 @@ -diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig -index a9260e2..72ba3a7 100644 --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig @@ -14,6 +14,15 @@ @@ -45,8 +43,6 @@ index a9260e2..72ba3a7 100644 config 405GPR bool -diff --git a/arch/powerpc/platforms/40x/Makefile b/arch/powerpc/platforms/40x/Makefile -index 5533a5c..1d93273 100644 --- a/arch/powerpc/platforms/40x/Makefile +++ b/arch/powerpc/platforms/40x/Makefile @@ -3,3 +3,4 @@ obj-$(CONFIG_MAKALU) += makalu.o @@ -54,9 +50,6 @@ index 5533a5c..1d93273 100644 obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD) += virtex.o obj-$(CONFIG_EP405) += ep405.o +obj-$(CONFIG_PPC40x_SIMPLE) += ppc40x_simple.o -diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c -new file mode 100644 -index 0000000..4498a86 --- /dev/null +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c @@ -0,0 +1,80 @@ diff --git a/target/linux/ppc40x/patches/004-acadia_cuboot.patch b/target/linux/ppc40x/patches/004-acadia_cuboot.patch index 6c415ea655..1962d34add 100644 --- a/target/linux/ppc40x/patches/004-acadia_cuboot.patch +++ b/target/linux/ppc40x/patches/004-acadia_cuboot.patch @@ -1,8 +1,6 @@ -diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile -index 6403275..5f4a59c 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -68,7 +68,8 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c +@@ -68,7 +68,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82 fixed-head.S ep88xc.c ep405.c cuboot-c2k.c \ cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \ cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \ @@ -12,7 +10,7 @@ index 6403275..5f4a59c 100644 src-boot := $(src-wlib) $(src-plat) empty.c src-boot := $(addprefix $(obj)/, $(src-boot)) -@@ -211,6 +212,7 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImage +@@ -211,6 +212,7 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImag # Board ports in arch/powerpc/platform/40x/Kconfig image-$(CONFIG_EP405) += dtbImage.ep405 image-$(CONFIG_WALNUT) += treeImage.walnut @@ -20,9 +18,6 @@ index 6403275..5f4a59c 100644 # Board ports in arch/powerpc/platform/44x/Kconfig image-$(CONFIG_EBONY) += treeImage.ebony cuImage.ebony -diff --git a/arch/powerpc/boot/cuboot-acadia.c b/arch/powerpc/boot/cuboot-acadia.c -new file mode 100644 -index 0000000..0634aba --- /dev/null +++ b/arch/powerpc/boot/cuboot-acadia.c @@ -0,0 +1,174 @@ diff --git a/target/linux/ppc40x/patches/005-magicboxv1.patch b/target/linux/ppc40x/patches/005-magicboxv1.patch index 4193b196c4..159e4f8a65 100644 --- a/target/linux/ppc40x/patches/005-magicboxv1.patch +++ b/target/linux/ppc40x/patches/005-magicboxv1.patch @@ -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 = { diff --git a/target/linux/ppc40x/patches/006-magicboxv2.patch b/target/linux/ppc40x/patches/006-magicboxv2.patch index 47ddd11290..686c0efdb6 100644 --- a/target/linux/ppc40x/patches/006-magicboxv2.patch +++ b/target/linux/ppc40x/patches/006-magicboxv2.patch @@ -1,6 +1,5 @@ -diff -Nur a/arch/powerpc/boot/cuboot-magicboxv2.c b/arch/powerpc/boot/cuboot-magicboxv2.c ---- a/arch/powerpc/boot/cuboot-magicboxv2.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/arch/powerpc/boot/cuboot-magicboxv2.c 2008-11-26 09:29:02.000000000 +0100 +--- /dev/null ++++ b/arch/powerpc/boot/cuboot-magicboxv2.c @@ -0,0 +1,40 @@ +/* + * Old U-boot compatibility for Magicbox v2 @@ -42,9 +41,8 @@ diff -Nur a/arch/powerpc/boot/cuboot-magicboxv2.c b/arch/powerpc/boot/cuboot-mag + fdt_init(_dtb_start); + serial_console_init(); +} -diff -Nur a/arch/powerpc/boot/dts/magicboxv2.dts b/arch/powerpc/boot/dts/magicboxv2.dts ---- a/arch/powerpc/boot/dts/magicboxv2.dts 1970-01-01 01:00:00.000000000 +0100 -+++ b/arch/powerpc/boot/dts/magicboxv2.dts 2008-11-26 09:28:10.000000000 +0100 +--- /dev/null ++++ b/arch/powerpc/boot/dts/magicboxv2.dts @@ -0,0 +1,250 @@ +/* + * Device Tree Source for Magicbox v2 @@ -296,10 +294,9 @@ diff -Nur a/arch/powerpc/boot/dts/magicboxv2.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:15:15.000000000 +0100 -+++ b/arch/powerpc/boot/Makefile 2008-11-26 09:17: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 \ @@ -308,7 +305,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)) -@@ -214,6 +214,7 @@ +@@ -214,6 +214,7 @@ image-$(CONFIG_EP405) += dtbImage.ep40 image-$(CONFIG_WALNUT) += treeImage.walnut image-$(CONFIG_ACADIA) += cuImage.acadia image-$(CONFIG_MAGICBOXV1) += cuImage.magicboxv1 @@ -316,10 +313,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:15:15.000000000 +0100 -+++ b/arch/powerpc/platforms/40x/Kconfig 2008-11-26 09:16:08.000000000 +0100 -@@ -51,6 +51,16 @@ +--- a/arch/powerpc/platforms/40x/Kconfig ++++ b/arch/powerpc/platforms/40x/Kconfig +@@ -51,6 +51,16 @@ config MAGICBOXV1 help This option enables support for the Magicbox v1 board. @@ -336,10 +332,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:15:15.000000000 +0100 -+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c 2008-11-26 09:15:46.000000000 +0100 -@@ -52,7 +52,8 @@ +--- a/arch/powerpc/platforms/40x/ppc40x_simple.c ++++ b/arch/powerpc/platforms/40x/ppc40x_simple.c +@@ -52,7 +52,8 @@ machine_device_initcall(ppc40x_simple, p */ static char *board[] __initdata = { "amcc,acadia", |