| Message ID | 1424307674-30507-3-git-send-email-mathieu@codeaurora.org |
|---|---|
| State | Changes Requested |
| Headers | show |
On Thu, 19 Feb 2015 02:01:14 +0100, Mathieu Olivari <mathieu@codeaurora.org> wrote: > This will simplify the boot process by avoiding the bootloader > bootargs configuration process. > > Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> > --- ... > ++ chosen { > ++ bootargs = "console=ttyMSM0,115200 root=/dev/mtdblock12 > rootfstype=squashfs,jffs2"; > ++ }; > ++ > + soc { > + pinmux@800000 { > + i2c4_pins: i2c4_pinmux { There's no need to specify the root partition if you follow "the OpenWrt way" :) > +@@ -70,13 +74,68 @@ > + reg = <0>; > + > + partition@0 { > +- label = "rootfs"; > +- reg = <0x0 0x1000000>; > ++ label = "0:SBL1"; > ++ reg = <0x0 0x20000>; > + }; > + > + partition@1 { > +- label = "scratch"; > +- reg = <0x1000000 0x1000000>; > ++ label = "0:MIBIB"; > ++ reg = <0x20000 0x20000>; > ++ }; > ++ > ++ partition@2 { > ++ label = "0:SBL2"; > ++ reg = <0x40000 0x40000>; > ++ }; > ++ > ++ partition@3 { > ++ label = "0:DDR"; > ++ reg = <0x80000 0x10000>; > ++ }; > ++ > ++ partition@4 { > ++ label = "0:DDRCONFIG"; > ++ reg = <0x90000 0x10000>; > ++ }; > ++ > ++ partition@5 { > ++ label = "0:SSD"; > ++ reg = <0xa0000 0x10000>; > ++ }; > ++ > ++ partition@6 { > ++ label = "0:TZ"; > ++ reg = <0xb0000 0x80000>; > ++ }; > ++ > ++ partition@7 { > ++ label = "0:RPM"; > ++ reg = <0x130000 0x80000>; > ++ }; > ++ > ++ partition@8 { > ++ label = "0:APSSBL"; > ++ reg = <0x1b0000 0x80000>; > ++ }; > ++ > ++ partition@9 { > ++ label = "0:APSSBLENV"; > ++ reg = <0x230000 0x40000>; > ++ }; > ++ > ++ partition@a { > ++ label = "0:ART"; > ++ reg = <0x270000 0x40000>; > ++ }; > ++ > ++ partition@b { > ++ label = "0:HLOS"; > ++ reg = <0x2b0000 0x300000>; > ++ }; > ++ > ++ partition@c { > ++ label = "rootfs"; > ++ reg = <0x5b0000 0x1a50000>; > + }; > + }; > + }; Well, first of all this should be part of a separate patch. Second, although the original partition definition seems weird a bit, this new one is... well, pretty close to being unacceptable. What are these partitions? From where are you loading the kernel? Imre
diff --git a/target/linux/ipq806x/patches/004-add-ap148-bootargs.patch b/target/linux/ipq806x/patches/004-add-ap148-bootargs.patch new file mode 100644 index 0000000..0b2ccec --- /dev/null +++ b/target/linux/ipq806x/patches/004-add-ap148-bootargs.patch @@ -0,0 +1,86 @@ +--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts ++++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +@@ -14,6 +14,10 @@ + }; + }; + ++ chosen { ++ bootargs = "console=ttyMSM0,115200 root=/dev/mtdblock12 rootfstype=squashfs,jffs2"; ++ }; ++ + soc { + pinmux@800000 { + i2c4_pins: i2c4_pinmux { +@@ -70,13 +74,68 @@ + reg = <0>; + + partition@0 { +- label = "rootfs"; +- reg = <0x0 0x1000000>; ++ label = "0:SBL1"; ++ reg = <0x0 0x20000>; + }; + + partition@1 { +- label = "scratch"; +- reg = <0x1000000 0x1000000>; ++ label = "0:MIBIB"; ++ reg = <0x20000 0x20000>; ++ }; ++ ++ partition@2 { ++ label = "0:SBL2"; ++ reg = <0x40000 0x40000>; ++ }; ++ ++ partition@3 { ++ label = "0:DDR"; ++ reg = <0x80000 0x10000>; ++ }; ++ ++ partition@4 { ++ label = "0:DDRCONFIG"; ++ reg = <0x90000 0x10000>; ++ }; ++ ++ partition@5 { ++ label = "0:SSD"; ++ reg = <0xa0000 0x10000>; ++ }; ++ ++ partition@6 { ++ label = "0:TZ"; ++ reg = <0xb0000 0x80000>; ++ }; ++ ++ partition@7 { ++ label = "0:RPM"; ++ reg = <0x130000 0x80000>; ++ }; ++ ++ partition@8 { ++ label = "0:APSSBL"; ++ reg = <0x1b0000 0x80000>; ++ }; ++ ++ partition@9 { ++ label = "0:APSSBLENV"; ++ reg = <0x230000 0x40000>; ++ }; ++ ++ partition@a { ++ label = "0:ART"; ++ reg = <0x270000 0x40000>; ++ }; ++ ++ partition@b { ++ label = "0:HLOS"; ++ reg = <0x2b0000 0x300000>; ++ }; ++ ++ partition@c { ++ label = "rootfs"; ++ reg = <0x5b0000 0x1a50000>; + }; + }; + };
This will simplify the boot process by avoiding the bootloader bootargs configuration process. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> --- .../ipq806x/patches/004-add-ap148-bootargs.patch | 86 ++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 target/linux/ipq806x/patches/004-add-ap148-bootargs.patch