[PATCH linux] dts: aspeed: merge initrd into kernel in flash layout

[Joel Stanley]

On Wed, Feb 1, 2017 at 5:09 AM, Rick Altherr via openbmc
<openbmc at lists.ozlabs.org> wrote:
> openbmc/openbmc commit 1ed6fe335cda50cf60b7afddbe530077a1b25d27 includes
> the initrd in the kernel image.  Update the flash layout used by OpenBMC
> dts accordingly.  This is required for OpenBMC's kernel update mechanism
> to work as the kernel image now exceeds the size of the original kernel
> partition.

Brad, Patrick: This change will mean new kernels can't boot on old
flash layouts, and vice versa.

All users will need to do a full-flash update to move to this version,
and a full flash update to downgrade.

Are we ok to proceed?

Cheers,

Joel

>
> Signed-off-by: Rick Altherr <raltherr at google.com>
> ---
>  arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
> index 65095a40a203..4bcfd1bf8dc5 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
> @@ -12,13 +12,9 @@
>                                         label = "u-boot-env";
>                                 };
>                                 kernel at 80000 {
> -                                       reg = < 0x80000 0x280000 >;
> +                                       reg = < 0x80000 0x440000 >;
>                                         label = "kernel";
>                                 };
> -                               initramfs at 300000 {
> -                                       reg = < 0x300000 0x1c0000 >;
> -                                       label = "initramfs";
> -                               };
>                                 rofs at 0c0000 {
>                                         reg = < 0x4c0000 0x1740000 >;
>                                         label = "rofs";
> --
> 2.11.0.483.g087da7b7c-goog
>
> _______________________________________________
> openbmc mailing list
> openbmc at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc