From 8fcb0f99f79eeaaabbe5d43a23d4f2ea68848bbf Mon Sep 17 00:00:00 2001 From: Stefan Eichenberger Date: Thu, 30 Mar 2017 15:13:19 +0200 Subject: [PATCH] netbird_v2: pxe boot: update environment --- include/configs/am335x_netbird_v2.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/configs/am335x_netbird_v2.h b/include/configs/am335x_netbird_v2.h index ec9a173594..f6e439b86f 100644 --- a/include/configs/am335x_netbird_v2.h +++ b/include/configs/am335x_netbird_v2.h @@ -57,12 +57,11 @@ "fdt_addr=" FDT_ADDR "\0" \ "kernel_addr=" KERNEL_ADDR "\0" \ "load_addr=" LOAD_ADDR "\0" \ - "root_part=1\0" /* Default root partition, overwritte in board/mv_ebu/a38x/nbhw14_env.c */ \ + "root_part=1\0" /* Default root partition, overwritte in board file */ \ "add_sd_bootargs=setenv bootargs $bootargs root=/dev/mmcblk0p$root_part rootfstype=ext4 console=ttyS1,115200 rootwait loglevel=4\0" \ "add_version_bootargs=setenv bootargs $bootargs\0" \ "fdt_skip_update=yes\0" \ "ethprime=cpsw\0" \ - "bootpretryperiod=1000\0" \ "sdbringup=echo Try bringup boot && ext4load mmc 1:$root_part $kernel_addr /boot/zImage && " \ "ext4load mmc 1:$root_part $fdt_addr /boot/$fdt_image && setenv bootargs $bootargs rw;\0" \ "sdprod=ext4load mmc 1:$root_part $kernel_addr /boot/$kernel_image && " \ @@ -79,8 +78,13 @@ "fdt_addr_r=" FDT_ADDR "\0" \ "kernel_addr_r=" KERNEL_ADDR "\0" \ "ramdisk_addr_r=" LOAD_ADDR "\0" \ + "bootpretryperiod=1000\0" \ + "tftptimeout=2000\0" \ + "tftptimeoutcountmax=5\0" \ + "bootpretryperiod=2000\0" \ + "autoload=false\0" \ "tftp_recovery=tftpboot $kernel_addr recovery-image; tftpboot $fdt_addr recovery-dtb; setenv bootargs rdinit=/etc/preinit console=ttyO1,115200 debug; bootz $kernel_addr - $fdt_addr\0" \ - "pxe_recovery=setenv autoload false && dhcp && pxe get && pxe boot\0" \ + "pxe_recovery=sleep 3 && dhcp && pxe get && pxe boot\0" \ "recovery=run pxe_recovery || setenv ipaddr $ipaddr; setenv serverip $serverip; run tftp_recovery\0" /* setenv ipaddr and serverip is necessary, because dhclient can destroy the IPs inernally */ #endif