On 05/08/2021 17:17, Mattijs Korpershoek wrote: > BOOT_CMD might be different based on CONFIG_CMD_ABOOTIMG. > > To prepare for abootimg support, extract the boot command > to a dedicated macro. > > Signed-off-by: Guillaume La Roque <[email protected]> > Signed-off-by: Mattijs Korpershoek <[email protected]> > --- > include/configs/meson64_android.h | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/include/configs/meson64_android.h > b/include/configs/meson64_android.h > index 83fa25bfb1..0ce616c17e 100644 > --- a/include/configs/meson64_android.h > +++ b/include/configs/meson64_android.h > @@ -81,6 +81,8 @@ > #define RECOVERY_PARTITION "recovery" > #endif > > +#define BOOT_CMD "bootm ${loadaddr};" > + > #define BOOTENV_DEV_FASTBOOT(devtypeu, devtypel, instance) \ > "bootcmd_fastboot=" \ > "setenv run_fastboot 0;" \ > @@ -152,7 +154,7 @@ > "part size mmc ${mmcdev} " RECOVERY_PARTITION > "${slot_suffix} boot_size;" \ > "if mmc read ${loadaddr} ${boot_start} ${boot_size}; > then " \ > "echo Running Android Recovery...;" \ > - "bootm ${loadaddr};" \ > + BOOT_CMD \ > "fi;" \ > "echo Failed to boot Android...;" \ > "reset;" \ > @@ -174,7 +176,7 @@ > "if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \ > "setenv bootargs \"${bootargs} " AB_BOOTARGS "\" ; " \ > "echo Running Android...;" \ > - "bootm ${loadaddr};" \ > + BOOT_CMD \ > "fi;" \ > "echo Failed to boot Android...;" \ > "reset\0" >
Acked-by: Neil Armstrong <[email protected]>
