Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

[u-boot] / board / esd / apc405 / apc405.c

diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c
index b663184b6d8c15ab64726875eb310aeed03ebe0a..2cb743ef49643853424bc1480d16bf0e5a0be800 100644 (file)
--- 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();
        }