Message ID | 20190625140643.365-3-igor.opaniuk@toradex.com |
---|---|
State | Accepted |
Commit | 0dff26aeee7fee18105b091ec7649019579fc756 |
Delegated to: | Stefano Babic |
Headers | show |
Series | Remove obsolete usbboot wrapper usage | expand |
+ 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/apalis_imx6.h | 22 ---------------------- > 1 file changed, 22 deletions(-) > > diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h > index 4b0a3fb26b..3898d411c1 100644 > --- a/include/configs/apalis_imx6.h > +++ b/include/configs/apalis_imx6.h > @@ -175,27 +175,6 @@ > "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ > "sdrootpart=2\0" > > - > -#define USB_BOOTCMD \ > - "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} ro,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" > - > - > #ifndef CONFIG_TDX_APALIS_IMX6_V1_0 > #define FDT_FILE "imx6q-apalis-eval.dtb" > #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb" > @@ -218,7 +197,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 >
On Wed, 10 Jul 2019 at 14:58, 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/apalis_imx6.h | 22 ---------------------- > > 1 file changed, 22 deletions(-) > > > > diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h > > index 4b0a3fb26b..3898d411c1 100644 > > --- a/include/configs/apalis_imx6.h > > +++ b/include/configs/apalis_imx6.h > > @@ -175,27 +175,6 @@ > > "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ > > "sdrootpart=2\0" > > > > - > > -#define USB_BOOTCMD \ > > - "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} ro,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" > > - > > - > > #ifndef CONFIG_TDX_APALIS_IMX6_V1_0 > > #define FDT_FILE "imx6q-apalis-eval.dtb" > > #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb" > > @@ -218,7 +197,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>
> 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 --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 4b0a3fb26b..3898d411c1 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -175,27 +175,6 @@ "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ "sdrootpart=2\0" - -#define USB_BOOTCMD \ - "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} ro,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" - - #ifndef CONFIG_TDX_APALIS_IMX6_V1_0 #define FDT_FILE "imx6q-apalis-eval.dtb" #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb" @@ -218,7 +197,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" \
Remove obsolete legacy usbboot wrapper, as distroboot can handle booting from USB drivers. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> --- include/configs/apalis_imx6.h | 22 ---------------------- 1 file changed, 22 deletions(-)