From 29f4a694602008b87dc87dc887128001cb4b3d87 Mon Sep 17 00:00:00 2001 From: Rene Straub Date: Wed, 28 Feb 2018 14:56:29 +0100 Subject: [PATCH] nrhw20: update default environment - fix DTB file name - change boot partition to /dev/mmcblk1 - cleanup --- include/configs/am335x_nrhw20.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/include/configs/am335x_nrhw20.h b/include/configs/am335x_nrhw20.h index 742d3d0d48..27346ff665 100644 --- a/include/configs/am335x_nrhw20.h +++ b/include/configs/am335x_nrhw20.h @@ -57,14 +57,15 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_image=kernel.bin\0" \ - "fdt_image=openwrt-nbhw16-nb800.dtb\0" \ + "fdt_image=openwrt-nrhw20-nb1601.dtb\0"\ "modeboot=sdboot\0" \ "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 file */ \ + "root_part=1\0" /* Default root partition, overwritten in board file */ \ "defaultconsole=ttyS1\0" /* Default output console */ \ - "add_sd_bootargs=setenv bootargs $bootargs root=/dev/mmcblk0p$root_part rootfstype=ext4 console=$defaultconsole,115200 rootwait loglevel=4 ti_cpsw.rx_packet_max=1526\0" \ + "add_sd_bootargs=setenv bootargs $bootargs root=/dev/mmcblk1p$root_part rootfstype=ext4 " \ + "console=$defaultconsole,115200 rootwait loglevel=4 ti_cpsw.rx_packet_max=1526\0" \ "add_version_bootargs=setenv bootargs $bootargs\0" \ "fdt_skip_update=yes\0" \ "ethprime=cpsw\0" \ @@ -94,9 +95,13 @@ "shieldcmd=\0" \ "fdtshieldcmd=\0" \ "modifyfdtcmd=fdt addr $fdt_addr; run fdtshieldcmd;\0" \ - "tftp_recovery=tftpboot $kernel_addr recovery-image; tftpboot $fdt_addr recovery-dtb; setenv bootargs rdinit=/etc/preinit console=$defaultconsole,115200 debug ti_cpsw.rx_packet_max=1526; run shieldcmd; run modifyfdtcmd; bootz $kernel_addr - $fdt_addr\0" \ + "tftp_recovery=tftpboot $kernel_addr recovery-image; tftpboot $fdt_addr recovery-dtb; " \ + "setenv bootargs rdinit=/etc/preinit console=$defaultconsole,115200 " \ + "debug ti_cpsw.rx_packet_max=1526; run shieldcmd; run modifyfdtcmd; " \ + "bootz $kernel_addr - $fdt_addr\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 */ + "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 /* UART Configuration */