Message ID | 20190625140643.365-2-igor.opaniuk@toradex.com |
---|---|
State | Accepted |
Delegated to: | Tom Warren |
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-tk1.h | 19 ------------------- > 1 file changed, 19 deletions(-) > > diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h > index b4ddd1bdc6..cead0412cf 100644 > --- a/include/configs/apalis-tk1.h > +++ b/include/configs/apalis-tk1.h > @@ -90,23 +90,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 " \ > - "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 && " \ > - "bootm ${kernel_addr_r} - ${dtbparam}\0" \ > - "usbbootpart=1\0" \ > - "usbdev=0\0" \ > - "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \ > - "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \ > - "&& setenv dtbparam ${fdt_addr_r}\0" \ > - "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \ > - "usbrootpart=2\0" > - > #define BOARD_EXTRA_ENV_SETTINGS \ > "boot_file=uImage\0" \ > "console=ttyS0\0" \ > @@ -118,7 +101,6 @@ > "fdt_fixup=;\0" \ > NFS_BOOTCMD \ > SD_BOOTCMD \ > - USB_BOOTCMD \ > "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ > "00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \ > "flash_eth.img && source ${loadaddr}\0" \ > @@ -135,7 +117,6 @@ > "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \ > "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ > "source ${loadaddr}\0" \ > - USB_BOOTCMD \ > "vidargs=video=tegrafb0:640x480-16@60 fbcon=map:1\0" > > /* Increase console I/O buffer size */ > -- > 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-tk1.h | 19 ------------------- > > 1 file changed, 19 deletions(-) > > > > diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h > > index b4ddd1bdc6..cead0412cf 100644 > > --- a/include/configs/apalis-tk1.h > > +++ b/include/configs/apalis-tk1.h > > @@ -90,23 +90,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 " \ > > - "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 && " \ > > - "bootm ${kernel_addr_r} - ${dtbparam}\0" \ > > - "usbbootpart=1\0" \ > > - "usbdev=0\0" \ > > - "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \ > > - "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \ > > - "&& setenv dtbparam ${fdt_addr_r}\0" \ > > - "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \ > > - "usbrootpart=2\0" > > - > > #define BOARD_EXTRA_ENV_SETTINGS \ > > "boot_file=uImage\0" \ > > "console=ttyS0\0" \ > > @@ -118,7 +101,6 @@ > > "fdt_fixup=;\0" \ > > NFS_BOOTCMD \ > > SD_BOOTCMD \ > > - USB_BOOTCMD \ > > "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ > > "00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \ > > "flash_eth.img && source ${loadaddr}\0" \ > > @@ -135,7 +117,6 @@ > > "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \ > > "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ > > "source ${loadaddr}\0" \ > > - USB_BOOTCMD \ > > "vidargs=video=tegrafb0:640x480-16@60 fbcon=map:1\0" > > > > /* Increase console I/O buffer size */ > > -- > > 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)
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index b4ddd1bdc6..cead0412cf 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -90,23 +90,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 " \ - "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 && " \ - "bootm ${kernel_addr_r} - ${dtbparam}\0" \ - "usbbootpart=1\0" \ - "usbdev=0\0" \ - "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \ - "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \ - "&& setenv dtbparam ${fdt_addr_r}\0" \ - "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \ - "usbrootpart=2\0" - #define BOARD_EXTRA_ENV_SETTINGS \ "boot_file=uImage\0" \ "console=ttyS0\0" \ @@ -118,7 +101,6 @@ "fdt_fixup=;\0" \ NFS_BOOTCMD \ SD_BOOTCMD \ - USB_BOOTCMD \ "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ "00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \ "flash_eth.img && source ${loadaddr}\0" \ @@ -135,7 +117,6 @@ "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \ "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ "source ${loadaddr}\0" \ - USB_BOOTCMD \ "vidargs=video=tegrafb0:640x480-16@60 fbcon=map:1\0" /* Increase console I/O buffer size */
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-tk1.h | 19 ------------------- 1 file changed, 19 deletions(-)