usbupdate in real does allways load some script from usb-storage and execute it, on all B&R targets.
So we do following 2 things: - rename it to what it really does - move it from boards to common environment
Signed-off-by: Hannes Petermaier oe5hpm@oevsv.at ---
board/BuR/kwb/board.c | 4 ++-- include/configs/bur_am335x_common.h | 1 + include/configs/kwb.h | 6 +----- include/configs/tseries.h | 4 +--- 4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/board/BuR/kwb/board.c b/board/BuR/kwb/board.c index 6eed7e0..01dd1d9 100644 --- a/board/BuR/kwb/board.c +++ b/board/BuR/kwb/board.c @@ -214,8 +214,8 @@ int board_late_init(void) gpio_get_value(PUSH_KEY) && 1 == cnt) { lcd_position_cursor(1, 8); lcd_puts( - "updating U-BOOT from USB ... "); - setenv("bootcmd", "run usbupdate"); + "starting u-boot script from USB ... "); + setenv("bootcmd", "run usbscript"); cnt = 4; break; } else if ((!gpio_get_value(ESC_KEY) && diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index c74140b..b441fa0 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -13,6 +13,7 @@ #define __BUR_AM335X_COMMON_H__ /* ------------------------------------------------------------------------- */ #define BUR_COMMON_ENV \ +"usbscript=usb start && fatload usb 0 0x80000000 usbscript.img && source\0" \ "defaultip=192.168.60.253\0" \ "defaultsip=192.168.60.254\0" \ "netconsole=echo switching to network console ...; " \ diff --git a/include/configs/kwb.h b/include/configs/kwb.h index 7798b80..d1c745e 100644 --- a/include/configs/kwb.h +++ b/include/configs/kwb.h @@ -80,10 +80,6 @@ BUR_COMMON_ENV \ "run loadromfs; " \ "tftp ${loadaddr} arimg && go ${loadaddr}; " \ "puts 'networkboot failed!';\0" \ -"usbupdate=echo updating u-boot from usb ...; " \ - "usb start; " \ - "fatload usb 0 0x80000000 updateubootusb.img && source; " \ - "puts 'usbupdate failed!'\0" \ "netscript=echo running script from network (tftp) ...; " \ "tftp 0x80000000 netscript.img && source; " \ "puts 'netscript load failed!'\0" \ @@ -101,7 +97,7 @@ BUR_COMMON_ENV \ #endif /* !CONFIG_SPL_BUILD*/
#define CONFIG_BOOTCOMMAND \ - "run usbupdate;" + "run usbscript;" #define CONFIG_BOOTDELAY 0
/* undefine command which we not need here */ diff --git a/include/configs/tseries.h b/include/configs/tseries.h index 115fd5b..9218533 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -140,7 +140,7 @@ "run mmcroot1; bootz ${loadaddr} - ${dtbaddr};\0" \ "defboot=ext4load mmc 0:2 ${loadaddr} /boot/PPTImage.md5 && run mmcboot1; " \ "ext4load mmc 0:1 ${dtbaddr} /$dtb && run mmcboot0; " \ - "run ramboot; run usbupdate;\0" \ + "run ramboot; run usbscript;\0" \ "bootlimit=1\0" \ "altbootcmd=run mmcboot0;\0" \ "upduboot=dhcp; " \ @@ -185,8 +185,6 @@ BUR_COMMON_ENV \ "then; else tftp ${dtbaddr} ${dtb}; fi;" \ "run mmcroot0; " \ "bootz ${loadaddr} ${ramaddr} ${dtbaddr}; fi;\0" \ -"usbupdate=echo Updating UBOOT from USB-Stick ...; " \ - "usb start && fatload usb 0 0x80000000 updateubootusb.img && source\0" \ "netupdate=echo Updating UBOOT from Network (TFTP) ...; " \ "setenv autoload 0; " \ "dhcp && tftp 0x80000000 updateUBOOT.img && source;\0" \