| Message ID | 1479939895-5264-1-git-send-email-aford173@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Adam Ford <aford173@gmail.com> [161123 14:25]: > This update creates a new partition to store device tree as well as > growing the kernel partition size from 4MB to 6MB. This matches > the partition map already approved in U-Boot Is this a fix? If so, please add the fixes tag for this one too so it gets properly backported to the stable releases. Tony > Signed-off-by: Adam Ford <aford173@gmail.com> > > diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi > index 8f9a69c..767a5d6 100644 > --- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi > +++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi > @@ -73,7 +73,7 @@ > /* u-boot uses mtdparts=omap2-nand.0:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs) */ > > x-loader@0 { > - label = "x-loader"; > + label = "mlo"; > reg = <0 0x80000>; > }; > > @@ -82,6 +82,11 @@ > reg = <0x80000 0x1e0000>; > }; > > + bootloaders_env@240000 { > + label = "spl-os"; > + reg = <0x240000 0x20000>; > + }; > + > bootloaders_env@260000 { > label = "u-boot-env"; > reg = <0x260000 0x20000>; > @@ -89,12 +94,12 @@ > > kernel@280000 { > label = "kernel"; > - reg = <0x280000 0x400000>; > + reg = <0x280000 0x600000>; > }; > > - filesystem@680000 { > + filesystem@880000 { > label = "fs"; > - reg = <0x680000 0>; /* 0 = MTDPART_SIZ_FULL */ > + reg = <0x880000 0>; /* 0 = MTDPART_SIZ_FULL */ > }; > }; > }; > -- > 2.7.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Dec 2, 2016 at 11:04 AM, Adam Ford <aford173@gmail.com> wrote: > > > On Fri, Dec 2, 2016 at 10:56 AM, Tony Lindgren <tony@atomide.com> wrote: >> >> * Adam Ford <aford173@gmail.com> [161123 14:25]: >> > This update creates a new partition to store device tree as well as >> > growing the kernel partition size from 4MB to 6MB. This matches >> > the partition map already approved in U-Boot >> >> Is this a fix? If so, please add the fixes tag for this one >> too so it gets properly backported to the stable releases. > > > No, the change in U-Boot was very recent. This does not need to be > backported. Thank you for asking. > Ping? Tony - I didn't see this in the 4.10-RC candidate yet. Any change this can get added? This allows the partition table to match a newly updated U-Boot partition table, adds a device tree partition, and allows for a slightly larger kernel. adam > adam >> >> >> Tony >> >> > Signed-off-by: Adam Ford <aford173@gmail.com> >> > >> > diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi >> > b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi >> > index 8f9a69c..767a5d6 100644 >> > --- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi >> > +++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi >> > @@ -73,7 +73,7 @@ >> > /* u-boot uses >> > mtdparts=omap2-nand.0:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs) >> > */ >> > >> > x-loader@0 { >> > - label = "x-loader"; >> > + label = "mlo"; >> > reg = <0 0x80000>; >> > }; >> > >> > @@ -82,6 +82,11 @@ >> > reg = <0x80000 0x1e0000>; >> > }; >> > >> > + bootloaders_env@240000 { >> > + label = "spl-os"; >> > + reg = <0x240000 0x20000>; >> > + }; >> > + >> > bootloaders_env@260000 { >> > label = "u-boot-env"; >> > reg = <0x260000 0x20000>; >> > @@ -89,12 +94,12 @@ >> > >> > kernel@280000 { >> > label = "kernel"; >> > - reg = <0x280000 0x400000>; >> > + reg = <0x280000 0x600000>; >> > }; >> > >> > - filesystem@680000 { >> > + filesystem@880000 { >> > label = "fs"; >> > - reg = <0x680000 0>; /* 0 = MTDPART_SIZ_FULL */ >> > + reg = <0x880000 0>; /* 0 = MTDPART_SIZ_FULL */ >> > }; >> > }; >> > }; >> > -- >> > 2.7.4 >> > > > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Adam Ford <aford173@gmail.com> [161231 03:48]: > On Fri, Dec 2, 2016 at 11:04 AM, Adam Ford <aford173@gmail.com> wrote: > > > > > > On Fri, Dec 2, 2016 at 10:56 AM, Tony Lindgren <tony@atomide.com> wrote: > >> > >> * Adam Ford <aford173@gmail.com> [161123 14:25]: > >> > This update creates a new partition to store device tree as well as > >> > growing the kernel partition size from 4MB to 6MB. This matches > >> > the partition map already approved in U-Boot > >> > >> Is this a fix? If so, please add the fixes tag for this one > >> too so it gets properly backported to the stable releases. > > > > > > No, the change in U-Boot was very recent. This does not need to be > > backported. Thank you for asking. > > > > Ping? > > Tony - I didn't see this in the 4.10-RC candidate yet. Any change > this can get added? This allows the partition table to match a newly > updated U-Boot partition table, adds a device tree partition, and > allows for a slightly larger kernel. Hmm so now it's a fix then? What about people with existing partitions? If the partitions keep changing then the information should be populated by the bootloader. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi index 8f9a69c..767a5d6 100644 --- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi +++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi @@ -73,7 +73,7 @@ /* u-boot uses mtdparts=omap2-nand.0:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs) */ x-loader@0 { - label = "x-loader"; + label = "mlo"; reg = <0 0x80000>; }; @@ -82,6 +82,11 @@ reg = <0x80000 0x1e0000>; }; + bootloaders_env@240000 { + label = "spl-os"; + reg = <0x240000 0x20000>; + }; + bootloaders_env@260000 { label = "u-boot-env"; reg = <0x260000 0x20000>; @@ -89,12 +94,12 @@ kernel@280000 { label = "kernel"; - reg = <0x280000 0x400000>; + reg = <0x280000 0x600000>; }; - filesystem@680000 { + filesystem@880000 { label = "fs"; - reg = <0x680000 0>; /* 0 = MTDPART_SIZ_FULL */ + reg = <0x880000 0>; /* 0 = MTDPART_SIZ_FULL */ }; }; };
This update creates a new partition to store device tree as well as growing the kernel partition size from 4MB to 6MB. This matches the partition map already approved in U-Boot Signed-off-by: Adam Ford <aford173@gmail.com>