| Message ID | 20180216201401.2703-1-bradleyb@fuzziesquirrel.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [u-boot,v2016.07-aspeed-openbmc,v2] aspeed: Drop bootcmd support for legacy images | expand |
On Sat, Feb 17, 2018 at 6:44 AM, Brad Bishop <bradleyb@fuzziesquirrel.com> wrote: > Assume booting from a FIT image by default. This allows image builders > to use arbitrary configuration names like > /configurations/conf@foo. > > Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Applied. Thanks! Cheers, Joel > --- > v2: > - Reworked to drop legacy image support entirely. > - Updated commit message accordingly. > > include/configs/ast-common.h | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h > index 89b0cd8533..eff6d2b529 100644 > --- a/include/configs/ast-common.h > +++ b/include/configs/ast-common.h > @@ -108,11 +108,7 @@ > #define CONFIG_ENV_OFFSET 0x60000 /* environment starts here */ > #define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ > > -#define CONFIG_BOOTCOMMAND \ > - "fdt addr 20080000; " \ > - "if fdt get value ramdisk_conf /configurations/conf@1 ramdisk; then " \ > - " bootm 20080000; else bootm 20080000 20300000; " \ > - "fi" > +#define CONFIG_BOOTCOMMAND "bootm 20080000" > #define CONFIG_ENV_OVERWRITE > > #define ASPEED_ENV_SETTINGS \ > -- > 2.14.3
diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h index 89b0cd8533..eff6d2b529 100644 --- a/include/configs/ast-common.h +++ b/include/configs/ast-common.h @@ -108,11 +108,7 @@ #define CONFIG_ENV_OFFSET 0x60000 /* environment starts here */ #define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ -#define CONFIG_BOOTCOMMAND \ - "fdt addr 20080000; " \ - "if fdt get value ramdisk_conf /configurations/conf@1 ramdisk; then " \ - " bootm 20080000; else bootm 20080000 20300000; " \ - "fi" +#define CONFIG_BOOTCOMMAND "bootm 20080000" #define CONFIG_ENV_OVERWRITE #define ASPEED_ENV_SETTINGS \
Assume booting from a FIT image by default. This allows image builders to use arbitrary configuration names like /configurations/conf@foo. Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> --- v2: - Reworked to drop legacy image support entirely. - Updated commit message accordingly. include/configs/ast-common.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)