| Message ID | 20161205181134.9766-1-fparent@baylibre.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, Dec 05, 2016 at 07:11:34PM +0100, Fabien Parent wrote: > Stop booting legacy uImage and now boot zImage. > > Signed-off-by: Fabien Parent <fparent@baylibre.com> > --- > configs/omapl138_lcdk_defconfig | 1 + > include/configs/omapl138_lcdk.h | 8 ++++---- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig > index 52681c92d0..d030ffafc3 100644 > --- a/configs/omapl138_lcdk_defconfig > +++ b/configs/omapl138_lcdk_defconfig > @@ -13,6 +13,7 @@ CONFIG_SPL=y > CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xb5 > CONFIG_HUSH_PARSER=y > CONFIG_SYS_PROMPT="U-Boot > " > +CONFIG_CMD_BOOTZ=y > # CONFIG_CMD_IMLS is not set > CONFIG_CMD_ASKENV=y > # CONFIG_CMD_FLASH is not set > diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h > index 9e11f7dc95..2e81bc4f25 100644 > --- a/include/configs/omapl138_lcdk.h > +++ b/include/configs/omapl138_lcdk.h > @@ -247,7 +247,7 @@ > */ > #define CONFIG_MISC_INIT_R > #define CONFIG_BOARD_EARLY_INIT_F > -#define CONFIG_BOOTFILE "uImage" /* Boot file name */ > +#define CONFIG_BOOTFILE "zImage" /* Boot file name */ > #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ > #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) > #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ > @@ -276,19 +276,19 @@ > #define CONFIG_EXTRA_ENV_SETTINGS \ > "fdtaddr=0xc0600000\0" \ > "fdtfile=da850-lcdk.dtb\0" \ > - "fdtboot=bootm 0xc0700000 - ${fdtaddr};\0" \ > + "fdtboot=bootz 0xc0700000 - ${fdtaddr};\0" \ > "mmcboot=" \ > "if fatload mmc 0 0xc0600000 boot.scr; then " \ > "source 0xc0600000; " \ > "else " \ > - "fatload mmc 0 0xc0700000 uImage; " \ > + "fatload mmc 0 0xc0700000 zImage; " \ You should use __stringify(CONFIG_BOOTFILE) here, thanks!
diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 52681c92d0..d030ffafc3 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xb5 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " +CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 9e11f7dc95..2e81bc4f25 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -247,7 +247,7 @@ */ #define CONFIG_MISC_INIT_R #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_BOOTFILE "uImage" /* Boot file name */ +#define CONFIG_BOOTFILE "zImage" /* Boot file name */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ @@ -276,19 +276,19 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "fdtaddr=0xc0600000\0" \ "fdtfile=da850-lcdk.dtb\0" \ - "fdtboot=bootm 0xc0700000 - ${fdtaddr};\0" \ + "fdtboot=bootz 0xc0700000 - ${fdtaddr};\0" \ "mmcboot=" \ "if fatload mmc 0 0xc0600000 boot.scr; then " \ "source 0xc0600000; " \ "else " \ - "fatload mmc 0 0xc0700000 uImage; " \ + "fatload mmc 0 0xc0700000 zImage; " \ "fatload mmc 0 ${fdtaddr} ${fdtfile}; " \ "run fdtboot; " \ "fi;\0" \ "spiboot=" \ "sf probe 0; " \ "sf read 0xc0700000 0x80000 0x220000; " \ - "bootm 0xc0700000;\0" + "bootz 0xc0700000;\0" /* * U-Boot commands
Stop booting legacy uImage and now boot zImage. Signed-off-by: Fabien Parent <fparent@baylibre.com> --- configs/omapl138_lcdk_defconfig | 1 + include/configs/omapl138_lcdk.h | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-)