]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
ARM: ultrascale: Enable bootdelay with netboot command
authorMichal Simek <michal.simek@xilinx.com>
Fri, 23 May 2014 11:21:35 +0000 (13:21 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 23 May 2014 11:21:35 +0000 (13:21 +0200)
Run netboot by default when bootdelay expires.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
include/configs/xilinx_ultrascale.h

index 6d7405ca209a7c80cef9e1334be220c9ec05aaa7..f0bd4a91a7c92b0cf7ef0dd8baf00a161efba656 100644 (file)
        "initrd_size=0x2000000\0"       \
        "fdt_addr=0x100000\0"           \
        "fdt_high=0x10000000\0"         \
-       "netboot=tftpboot 1000000 image.ub && bootm\0"  \
+       "netboot=tftpboot 10000000 image.ub && bootm\0" \
        "jtagboot=tftpboot 1000000 uImage && "          \
                "tftpboot 20000000 system.dtb && "      \
                "bootm 1000000 - 20000000\0"
 
 #define CONFIG_BOOTARGS                        "console=ttyPS0"
-#define CONFIG_BOOTCOMMAND             "echo Hello Xilinx UltraScale MP"
-#define CONFIG_BOOTDELAY               -1
+#define CONFIG_BOOTCOMMAND             "echo Hello Xilinx UltraScale MP; run netboot"
+#define CONFIG_BOOTDELAY               5
 
 /* Do not preserve environment */
 #define CONFIG_ENV_IS_NOWHERE          1