[U-Boot,v1,1/2] colibri_imx6/imx7/imx8x: use distroboot by default
diff mbox series

Message ID 20190823170049.23870-1-igor.opaniuk@gmail.com
State New
Delegated to: Stefano Babic
Headers show
Series
  • [U-Boot,v1,1/2] colibri_imx6/imx7/imx8x: use distroboot by default
Related show

Commit Message

Igor Opaniuk Aug. 23, 2019, 5 p.m. UTC
From: Igor Opaniuk <igor.opaniuk@toradex.com>

Use distro_bootcmd as defauult bootcmd instead of legacy wrappers.

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---

 include/configs/colibri-imx8x.h | 1 +
 include/configs/colibri_imx6.h  | 4 ++--
 include/configs/colibri_imx7.h  | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

Comments

Oleksandr Suvorov Aug. 27, 2019, 9:29 a.m. UTC | #1
On Fri, Aug 23, 2019 at 8:01 PM Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
>
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
>
> Use distro_bootcmd as defauult bootcmd instead of legacy wrappers.
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>

In general:
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

But if you will push a new version, please fix the typo in comment msg:
s/defauult/default/

> ---
>
>  include/configs/colibri-imx8x.h | 1 +
>  include/configs/colibri_imx6.h  | 4 ++--
>  include/configs/colibri_imx7.h  | 5 +++--
>  3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
> index 2469066849..2b093efb2c 100644
> --- a/include/configs/colibri-imx8x.h
> +++ b/include/configs/colibri-imx8x.h
> @@ -82,6 +82,7 @@
>         CONFIG_MFG_ENV_SETTINGS \
>         M4_BOOT_ENV \
>         MEM_LAYOUT_ENV_SETTINGS \
> +       "boot_file=Image\0" \
>         "console=ttyLP3 earlycon\0" \
>         "fdt_addr=0x83000000\0" \
>         "fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \
> diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
> index 147f801353..a719a4eadc 100644
> --- a/include/configs/colibri_imx6.h
> +++ b/include/configs/colibri_imx6.h
> @@ -92,6 +92,7 @@
>
>  #ifndef CONFIG_SPL_BUILD
>  #define BOOT_TARGET_DEVICES(func) \
> +       func(MMC, mmc, 0) \
>         func(MMC, mmc, 1) \
>         func(USB, usb, 0) \
>         func(DHCP, dhcp, na)
> @@ -168,8 +169,7 @@
>  #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
>  #define CONFIG_EXTRA_ENV_SETTINGS \
>         BOOTENV \
> -       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
> -               "setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
> +       "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \
>                 "usb start ; " \
>                 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
>         "boot_file=zImage\0" \
> diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
> index 49cdd61038..760e36fac9 100644
> --- a/include/configs/colibri_imx7.h
> +++ b/include/configs/colibri_imx7.h
> @@ -109,7 +109,8 @@
>         "fdt_high=0xffffffff\0" \
>         "initrd_high=0xffffffff\0" \
>         "kernel_addr_r=0x81000000\0" \
> -       "ramdisk_addr_r=0x82100000\0"
> +       "ramdisk_addr_r=0x82100000\0" \
> +       "scriptaddr=0x82500000\0"
>
>  #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
>  #define SD_BOOTDEV 0
> @@ -160,7 +161,7 @@
>         "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
>         UBI_BOOTCMD
>  #elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
> -#define CONFIG_BOOTCOMMAND "run emmcboot ; echo ; echo emmcboot failed ; " \
> +#define CONFIG_BOOTCOMMAND \
>         "setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run distro_bootcmd;"
>  #define MODULE_EXTRA_ENV_SETTINGS \
>         "variant=-emmc\0" \
> --
> 2.17.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot

Patch
diff mbox series

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 2469066849..2b093efb2c 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -82,6 +82,7 @@ 
 	CONFIG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	MEM_LAYOUT_ENV_SETTINGS \
+	"boot_file=Image\0" \
 	"console=ttyLP3 earlycon\0" \
 	"fdt_addr=0x83000000\0"	\
 	"fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 147f801353..a719a4eadc 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -92,6 +92,7 @@ 
 
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
 	func(MMC, mmc, 1) \
 	func(USB, usb, 0) \
 	func(DHCP, dhcp, na)
@@ -168,8 +169,7 @@ 
 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
-	"bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-		"setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
+	"bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \
 		"usb start ; " \
 		"setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
 	"boot_file=zImage\0" \
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 49cdd61038..760e36fac9 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -109,7 +109,8 @@ 
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
 	"kernel_addr_r=0x81000000\0" \
-	"ramdisk_addr_r=0x82100000\0"
+	"ramdisk_addr_r=0x82100000\0" \
+	"scriptaddr=0x82500000\0"
 
 #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
 #define SD_BOOTDEV 0
@@ -160,7 +161,7 @@ 
 	"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
 	UBI_BOOTCMD
 #elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
-#define CONFIG_BOOTCOMMAND "run emmcboot ; echo ; echo emmcboot failed ; " \
+#define CONFIG_BOOTCOMMAND \
 	"setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run distro_bootcmd;"
 #define MODULE_EXTRA_ENV_SETTINGS \
 	"variant=-emmc\0" \