summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-26 00:06:13 +0200
committerWolfgang Denk <wd@denx.de>2008-04-26 00:06:13 +0200
commit1d907e66fdd5d2f192a9f4fad6812ff0d0e9683a (patch)
tree59e09371286cb870fafad2c88d796062ba540447 /board
parentd0d91ae3acb4f29d1a2a3a766747478ed54e2848 (diff)
parent8e048c438e20ec89b49da5f085f8f756eba6e587 (diff)
downloadtalos-obmc-uboot-1d907e66fdd5d2f192a9f4fad6812ff0d0e9683a.tar.gz
talos-obmc-uboot-1d907e66fdd5d2f192a9f4fad6812ff0d0e9683a.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'board')
-rw-r--r--board/esd/apc405/apc405.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c
index b663184b6d..2cb743ef49 100644
--- a/board/esd/apc405/apc405.c
+++ b/board/esd/apc405/apc405.c
@@ -385,11 +385,16 @@ int misc_init_r(void)
}
out_be16((u16 *)(FUJI_BASE + LCDBL_PWM), 0xff);
- if (getenv("usb_self") == NULL) {
+ /*
+ * fix environment for field updated units
+ */
+ if (getenv("altbootcmd") == NULL) {
setenv("usb_load", CFG_USB_LOAD_COMMAND);
setenv("usbargs", CFG_USB_ARGS);
setenv("bootcmd", CONFIG_BOOTCOMMAND);
setenv("usb_self", CFG_USB_SELF_COMMAND);
+ setenv("bootlimit", CFG_BOOTLIMIT);
+ setenv("altbootcmd", CFG_ALT_BOOTCOMMAND);
saveenv();
}
OpenPOWER on IntegriCloud