V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

board/BuR/common: rename "usbupdate" environment to "usbscript" 

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>
This commit is contained in:
Hannes Petermaier 2015-04-24 14:49:39 +02:00 committed by Tom Rini
parent 4e2a341566
commit 5094befd84
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/BuR/kwb/board.c
View File

@ -214,8 +214,8 @@ int board_late_init(void)
gpio_get_value(PUSH_KEY) && 1 == cnt) { gpio_get_value(PUSH_KEY) && 1 == cnt) {
lcd_position_cursor(1, 8); lcd_position_cursor(1, 8);
lcd_puts( lcd_puts(
"updating U-BOOT from USB ... "); "starting u-boot script from USB ... ");
setenv("bootcmd", "run usbupdate"); setenv("bootcmd", "run usbscript");
cnt = 4; cnt = 4;
break; break;
} else if ((!gpio_get_value(ESC_KEY) && } else if ((!gpio_get_value(ESC_KEY) &&

1
include/configs/bur_am335x_common.h
View File

@ -13,6 +13,7 @@
#define __BUR_AM335X_COMMON_H__ #define __BUR_AM335X_COMMON_H__
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
#define BUR_COMMON_ENV \ #define BUR_COMMON_ENV \
"usbscript=usb start && fatload usb 0 0x80000000 usbscript.img && source\0" \
"defaultip=192.168.60.253\0" \ "defaultip=192.168.60.253\0" \
"defaultsip=192.168.60.254\0" \ "defaultsip=192.168.60.254\0" \
"netconsole=echo switching to network console ...; " \ "netconsole=echo switching to network console ...; " \

6
include/configs/kwb.h
View File

@ -80,10 +80,6 @@ BUR_COMMON_ENV \
"run loadromfs; " \ "run loadromfs; " \
"tftp ${loadaddr} arimg && go ${loadaddr}; " \ "tftp ${loadaddr} arimg && go ${loadaddr}; " \
"puts 'networkboot failed!';\0" \ "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) ...; " \ "netscript=echo running script from network (tftp) ...; " \
"tftp 0x80000000 netscript.img && source; " \ "tftp 0x80000000 netscript.img && source; " \
"puts 'netscript load failed!'\0" \ "puts 'netscript load failed!'\0" \
@ -101,7 +97,7 @@ BUR_COMMON_ENV \
#endif /* !CONFIG_SPL_BUILD*/ #endif /* !CONFIG_SPL_BUILD*/
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"run usbupdate;" "run usbscript;"
#define CONFIG_BOOTDELAY 0 #define CONFIG_BOOTDELAY 0
/* undefine command which we not need here */ /* undefine command which we not need here */

4
include/configs/tseries.h
View File

@ -140,7 +140,7 @@
"run mmcroot1; bootz ${loadaddr} - ${dtbaddr};\0" \ "run mmcroot1; bootz ${loadaddr} - ${dtbaddr};\0" \
"defboot=ext4load mmc 0:2 ${loadaddr} /boot/PPTImage.md5 && run mmcboot1; " \ "defboot=ext4load mmc 0:2 ${loadaddr} /boot/PPTImage.md5 && run mmcboot1; " \
"ext4load mmc 0:1 ${dtbaddr} /$dtb && run mmcboot0; " \ "ext4load mmc 0:1 ${dtbaddr} /$dtb && run mmcboot0; " \
"run ramboot; run usbupdate;\0" \ "run ramboot; run usbscript;\0" \
"bootlimit=1\0" \ "bootlimit=1\0" \
"altbootcmd=run mmcboot0;\0" \ "altbootcmd=run mmcboot0;\0" \
"upduboot=dhcp; " \ "upduboot=dhcp; " \
@ -185,8 +185,6 @@ BUR_COMMON_ENV \
"then; else tftp ${dtbaddr} ${dtb}; fi;" \ "then; else tftp ${dtbaddr} ${dtb}; fi;" \
"run mmcroot0; " \ "run mmcroot0; " \
"bootz ${loadaddr} ${ramaddr} ${dtbaddr}; fi;\0" \ "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) ...; " \ "netupdate=echo Updating UBOOT from Network (TFTP) ...; " \
"setenv autoload 0; " \ "setenv autoload 0; " \
"dhcp && tftp 0x80000000 updateUBOOT.img && source;\0" \ "dhcp && tftp 0x80000000 updateUBOOT.img && source;\0" \