aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ppc44x/patches-3.18
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-03-10 10:00:41 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-03-10 10:00:41 +0000
commit7ad0ed98b681d8fcf9d4e9e855dbdfa7da6d6a99 (patch)
treef61fb264df941c0bc41e88c731cb768f762d72a3 /target/linux/ppc44x/patches-3.18
parent3a2fbeb9964b31b6fa911a0350173e4e439a89cc (diff)
downloadupstream-7ad0ed98b681d8fcf9d4e9e855dbdfa7da6d6a99.tar.gz
upstream-7ad0ed98b681d8fcf9d4e9e855dbdfa7da6d6a99.tar.bz2
upstream-7ad0ed98b681d8fcf9d4e9e855dbdfa7da6d6a99.zip
ppc44x: upgrade and switch to 3.18
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44637 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ppc44x/patches-3.18')
-rw-r--r--target/linux/ppc44x/patches-3.18/100-openwrt_flashmap.patch56
-rw-r--r--target/linux/ppc44x/patches-3.18/110-openwrt_dts_cmdline.patch9
2 files changed, 65 insertions, 0 deletions
diff --git a/target/linux/ppc44x/patches-3.18/100-openwrt_flashmap.patch b/target/linux/ppc44x/patches-3.18/100-openwrt_flashmap.patch
new file mode 100644
index 0000000000..471e686d32
--- /dev/null
+++ b/target/linux/ppc44x/patches-3.18/100-openwrt_flashmap.patch
@@ -0,0 +1,56 @@
+--- a/arch/powerpc/boot/dts/taishan.dts
++++ b/arch/powerpc/boot/dts/taishan.dts
+@@ -195,15 +195,15 @@
+ #size-cells = <1>;
+ partition@0 {
+ label = "kernel";
+- reg = <0x0 0x180000>;
++ reg = <0x0 0x200000>;
+ };
+- partition@180000 {
+- label = "root";
+- reg = <0x180000 0x200000>;
++ partition@200000 {
++ label = "rootfs";
++ reg = <0x200000 0x3c00000>;
+ };
+- partition@380000 {
+- label = "user";
+- reg = <0x380000 0x3bc0000>;
++ partition@3e00000 {
++ label = "diagnostics";
++ reg = <0x3e00000 0x140000>;
+ };
+ partition@3f40000 {
+ label = "env";
+--- a/arch/powerpc/boot/dts/canyonlands.dts
++++ b/arch/powerpc/boot/dts/canyonlands.dts
+@@ -222,24 +222,12 @@
+ #address-cells = <1>;
+ #size-cells = <1>;
+ partition@0 {
+- label = "kernel";
+- reg = <0x00000000 0x001e0000>;
+- };
+- partition@1e0000 {
+- label = "dtb";
+- reg = <0x001e0000 0x00020000>;
++ label = "kernel+dtb";
++ reg = <0x00000000 0x00200000>;
+ };
+ partition@200000 {
+- label = "ramdisk";
+- reg = <0x00200000 0x01400000>;
+- };
+- partition@1600000 {
+- label = "jffs2";
+- reg = <0x01600000 0x00400000>;
+- };
+- partition@1a00000 {
+- label = "user";
+- reg = <0x01a00000 0x02560000>;
++ label = "rootfs";
++ reg = <0x00200000 0x03d60000>;
+ };
+ partition@3f60000 {
+ label = "env";
diff --git a/target/linux/ppc44x/patches-3.18/110-openwrt_dts_cmdline.patch b/target/linux/ppc44x/patches-3.18/110-openwrt_dts_cmdline.patch
new file mode 100644
index 0000000000..e61943014c
--- /dev/null
+++ b/target/linux/ppc44x/patches-3.18/110-openwrt_dts_cmdline.patch
@@ -0,0 +1,9 @@
+--- a/arch/powerpc/boot/dts/taishan.dts
++++ b/arch/powerpc/boot/dts/taishan.dts
+@@ -423,5 +423,6 @@
+
+ chosen {
+ linux,stdout-path = "/plb/opb/serial@40000300";
++ bootargs = "console=ttyS1,115200 root=/dev/mtdblock1 rootfstype=squashfs noinitrd";
+ };
+ };