diff mbox series

[U-Boot,v1,3/3] colibri_imx6: configs: remove legacy usbboot command

Message ID 20190625140643.365-4-igor.opaniuk@toradex.com
State Accepted
Commit 48b09848bfa342a526eb8034f067a6d163b8a6d0
Delegated to: Stefano Babic
Headers show
Series Remove obsolete usbboot wrapper usage | expand

Commit Message

Igor Opaniuk June 25, 2019, 2:06 p.m. UTC
Remove obsolete legacy usbboot wrapper, as distroboot can handle
booting from USB drivers.

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

---

 include/configs/colibri_imx6.h | 20 --------------------
 1 file changed, 20 deletions(-)

Comments

Igor Opaniuk July 10, 2019, 11:57 a.m. UTC | #1
+ Oleksandr

On Tue, Jun 25, 2019 at 5:07 PM Igor Opaniuk <igor.opaniuk@toradex.com> wrote:
>
> Remove obsolete legacy usbboot wrapper, as distroboot can handle
> booting from USB drivers.
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
>
> ---
>
>  include/configs/colibri_imx6.h | 20 --------------------
>  1 file changed, 20 deletions(-)
>
> diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
> index 86f3f0d4fa..147f801353 100644
> --- a/include/configs/colibri_imx6.h
> +++ b/include/configs/colibri_imx6.h
> @@ -165,25 +165,6 @@
>         "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
>         "sdrootpart=2\0"
>
> -#define USB_BOOTCMD \
> -       "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} rw,noatime " \
> -               "rootfstype=ext4 rootwait\0" \
> -       "usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \
> -               "setenv bootargs ${defargs} ${setupargs} " \
> -               "${usbargs} ${vidargs}; echo Booting from USB stick...; " \
> -               "run usbdtbload; " \
> -               "load usb ${usbdev}:${usbbootpart} ${kernel_addr_r} " \
> -               "${boot_file} && run fdt_fixup && " \
> -               "bootz ${kernel_addr_r} ${dtbparam}\0" \
> -       "usbbootpart=1\0" \
> -       "usbdev=0\0" \
> -       "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \
> -               "${fdt_addr_r} " \
> -               "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && " \
> -               "true\0" \
> -       "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
> -       "usbrootpart=2\0"
> -
>  #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
>  #define CONFIG_EXTRA_ENV_SETTINGS \
>         BOOTENV \
> @@ -201,7 +182,6 @@
>         MEM_LAYOUT_ENV_SETTINGS \
>         NFS_BOOTCMD \
>         SD_BOOTCMD \
> -       USB_BOOTCMD \
>         "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
>                 "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
>                 "flash_eth.img && source ${loadaddr}\0" \
> --
> 2.17.1
>
Oleksandr Suvorov July 10, 2019, 12:20 p.m. UTC | #2
On Wed, 10 Jul 2019 at 14:57, Igor Opaniuk <igor.opaniuk@toradex.com> wrote:
>
> + Oleksandr
>
> On Tue, Jun 25, 2019 at 5:07 PM Igor Opaniuk <igor.opaniuk@toradex.com> wrote:
> >
> > Remove obsolete legacy usbboot wrapper, as distroboot can handle
> > booting from USB drivers.
> >
> > Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> >
> > ---
> >
> >  include/configs/colibri_imx6.h | 20 --------------------
> >  1 file changed, 20 deletions(-)
> >
> > diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
> > index 86f3f0d4fa..147f801353 100644
> > --- a/include/configs/colibri_imx6.h
> > +++ b/include/configs/colibri_imx6.h
> > @@ -165,25 +165,6 @@
> >         "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
> >         "sdrootpart=2\0"
> >
> > -#define USB_BOOTCMD \
> > -       "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} rw,noatime " \
> > -               "rootfstype=ext4 rootwait\0" \
> > -       "usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \
> > -               "setenv bootargs ${defargs} ${setupargs} " \
> > -               "${usbargs} ${vidargs}; echo Booting from USB stick...; " \
> > -               "run usbdtbload; " \
> > -               "load usb ${usbdev}:${usbbootpart} ${kernel_addr_r} " \
> > -               "${boot_file} && run fdt_fixup && " \
> > -               "bootz ${kernel_addr_r} ${dtbparam}\0" \
> > -       "usbbootpart=1\0" \
> > -       "usbdev=0\0" \
> > -       "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \
> > -               "${fdt_addr_r} " \
> > -               "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && " \
> > -               "true\0" \
> > -       "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
> > -       "usbrootpart=2\0"
> > -
> >  #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
> >  #define CONFIG_EXTRA_ENV_SETTINGS \
> >         BOOTENV \
> > @@ -201,7 +182,6 @@
> >         MEM_LAYOUT_ENV_SETTINGS \
> >         NFS_BOOTCMD \
> >         SD_BOOTCMD \
> > -       USB_BOOTCMD \
> >         "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
> >                 "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
> >                 "flash_eth.img && source ${loadaddr}\0" \
> > --
> > 2.17.1
> >
>
>
> --
> Best regards - Freundliche GrĂ¼sse - Meilleures salutations
>
> Senior Development Engineer,
> Igor Opaniuk
>
> Toradex AG
> Altsagenstrasse 5 | 6048 Horw/Luzern | Switzerland | T: +41 41 500 48
> 00 (main line)
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot

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

--
Best regards

Oleksandr Suvorov


Toradex AG
Altsagenstrasse 5 | 6048 Horw/Luzern | Switzerland | T: +41 41 500
4800 (main line)
Stefano Babic July 20, 2019, 8:45 a.m. UTC | #3
> Remove obsolete legacy usbboot wrapper, as distroboot can handle
> booting from USB drivers.
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 86f3f0d4fa..147f801353 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -165,25 +165,6 @@ 
 	"sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
 	"sdrootpart=2\0"
 
-#define USB_BOOTCMD \
-	"set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} rw,noatime " \
-		"rootfstype=ext4 rootwait\0" \
-	"usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \
-		"setenv bootargs ${defargs} ${setupargs} " \
-		"${usbargs} ${vidargs}; echo Booting from USB stick...; " \
-		"run usbdtbload; " \
-		"load usb ${usbdev}:${usbbootpart} ${kernel_addr_r} " \
-		"${boot_file} && run fdt_fixup && " \
-		"bootz ${kernel_addr_r} ${dtbparam}\0" \
-	"usbbootpart=1\0" \
-	"usbdev=0\0" \
-	"usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \
-		"${fdt_addr_r} " \
-		"${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && " \
-		"true\0" \
-	"usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
-	"usbrootpart=2\0"
-
 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
@@ -201,7 +182,6 @@ 
 	MEM_LAYOUT_ENV_SETTINGS \
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
-	USB_BOOTCMD \
 	"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
 		"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
 		"flash_eth.img && source ${loadaddr}\0" \