| Message ID | 20181115202617.14941-1-semen.protsenko@linaro.org |
|---|---|
| State | Accepted |
| Commit | 1e4fb783b32437049baed460b3b899f3f5df77a5 |
| Headers | show |
| Series | arm: ti: boot: Fix U-Boot environment partition address | expand |
Hi Tom, Can you please pull this in? It fixes the regression I introduced by accident earlier... Thanks! On Thu, Nov 15, 2018 at 10:26 PM Sam Protsenko <semen.protsenko@linaro.org> wrote: > > Recent removal of obsolete partition led to shifting of starting address > of "reserved" partition (which reflects U-Boot environment). Fix its > start address to keep it in sync with ENV_OFFSET and DFU environment. > > This patch also provides fixed start address for "reserved" partition, > so that we can track when it's shifted next time. > > While at it, move it before "misc" partition to keep all Android > partitions together. > > Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> > --- > include/environment/ti/boot.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h > index 3c9c87f21b..5891009a5a 100644 > --- a/include/environment/ti/boot.h > +++ b/include/environment/ti/boot.h > @@ -34,9 +34,9 @@ > "partitions_android=" \ > "uuid_disk=${uuid_gpt_disk};" \ > "name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \ > - "name=bootloader,size=1792K,uuid=${uuid_gpt_bootloader};" \ > + "name=bootloader,size=2048K,uuid=${uuid_gpt_bootloader};" \ > + "name=reserved,start=2432K,size=256K,uuid=${uuid_gpt_reserved};" \ > "name=misc,size=128K,uuid=${uuid_gpt_misc};" \ > - "name=reserved,size=256K,uuid=${uuid_gpt_reserved};" \ > "name=efs,size=16M,uuid=${uuid_gpt_efs};" \ > "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \ > "name=recovery,size=40M,uuid=${uuid_gpt_recovery};" \ > -- > 2.19.1 >
On 11/26/2018 8:27 AM, Sam Protsenko wrote: > Hi Tom, > > Can you please pull this in? It fixes the regression I introduced by > accident earlier... > > Thanks! > > On Thu, Nov 15, 2018 at 10:26 PM Sam Protsenko > <semen.protsenko@linaro.org> wrote: >> Recent removal of obsolete partition led to shifting of starting address >> of "reserved" partition (which reflects U-Boot environment). Fix its >> start address to keep it in sync with ENV_OFFSET and DFU environment. >> >> This patch also provides fixed start address for "reserved" partition, >> so that we can track when it's shifted next time. >> >> While at it, move it before "misc" partition to keep all Android >> partitions together. >> >> Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Acked-By: Praneeth Bajjuri <praneeth@ti.com> >> --- >> include/environment/ti/boot.h | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h >> index 3c9c87f21b..5891009a5a 100644 >> --- a/include/environment/ti/boot.h >> +++ b/include/environment/ti/boot.h >> @@ -34,9 +34,9 @@ >> "partitions_android=" \ >> "uuid_disk=${uuid_gpt_disk};" \ >> "name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \ >> - "name=bootloader,size=1792K,uuid=${uuid_gpt_bootloader};" \ >> + "name=bootloader,size=2048K,uuid=${uuid_gpt_bootloader};" \ >> + "name=reserved,start=2432K,size=256K,uuid=${uuid_gpt_reserved};" \ >> "name=misc,size=128K,uuid=${uuid_gpt_misc};" \ >> - "name=reserved,size=256K,uuid=${uuid_gpt_reserved};" \ >> "name=efs,size=16M,uuid=${uuid_gpt_efs};" \ >> "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \ >> "name=recovery,size=40M,uuid=${uuid_gpt_recovery};" \ >> -- >> 2.19.1 >>
On Thu, Nov 15, 2018 at 10:26:17PM +0200, Sam Protsenko wrote: > Recent removal of obsolete partition led to shifting of starting address > of "reserved" partition (which reflects U-Boot environment). Fix its > start address to keep it in sync with ENV_OFFSET and DFU environment. > > This patch also provides fixed start address for "reserved" partition, > so that we can track when it's shifted next time. > > While at it, move it before "misc" partition to keep all Android > partitions together. > > Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> > Acked-By: Praneeth Bajjuri <praneeth@ti.com> Applied to u-boot/master, thanks! -- Tom
diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h index 3c9c87f21b..5891009a5a 100644 --- a/include/environment/ti/boot.h +++ b/include/environment/ti/boot.h @@ -34,9 +34,9 @@ "partitions_android=" \ "uuid_disk=${uuid_gpt_disk};" \ "name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \ - "name=bootloader,size=1792K,uuid=${uuid_gpt_bootloader};" \ + "name=bootloader,size=2048K,uuid=${uuid_gpt_bootloader};" \ + "name=reserved,start=2432K,size=256K,uuid=${uuid_gpt_reserved};" \ "name=misc,size=128K,uuid=${uuid_gpt_misc};" \ - "name=reserved,size=256K,uuid=${uuid_gpt_reserved};" \ "name=efs,size=16M,uuid=${uuid_gpt_efs};" \ "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \ "name=recovery,size=40M,uuid=${uuid_gpt_recovery};" \
Recent removal of obsolete partition led to shifting of starting address of "reserved" partition (which reflects U-Boot environment). Fix its start address to keep it in sync with ENV_OFFSET and DFU environment. This patch also provides fixed start address for "reserved" partition, so that we can track when it's shifted next time. While at it, move it before "misc" partition to keep all Android partitions together. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> --- include/environment/ti/boot.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)