From 2320866b978fc12904eeba37236f35d12b4aec30 Mon Sep 17 00:00:00 2001 From: "Cooper Jr., Franklin" Date: Tue, 21 Apr 2015 07:51:04 -0500 Subject: ti: am335x/am437x/omap5 devices: Unify network environment variables Across several devices network environment variables are duplicated. Move these variables to a common include file which insures the environment variables are reused and insures devices across product lines share the same values. Signed-off-by: Franklin S Cooper Jr Reviewed-by: Tom Rini --- include/configs/am335x_evm.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'include/configs/am335x_evm.h') diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index a87059c..8da3325 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -83,10 +83,6 @@ "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 ro\0" \ "mmcrootfstype=ext4 rootwait\0" \ - "rootpath=/export/rootfs\0" \ - "nfsopts=nolock\0" \ - "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ - "::off\0" \ "ramroot=/dev/ram0 rw\0" \ "ramrootfstype=ext2\0" \ "mmcargs=setenv bootargs console=${console} " \ @@ -102,11 +98,6 @@ "${optargs} " \ "root=${spiroot} " \ "rootfstype=${spirootfstype}\0" \ - "netargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "root=/dev/nfs " \ - "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ - "ip=dhcp\0" \ "bootenv=uEnv.txt\0" \ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ @@ -159,13 +150,6 @@ "sf probe ${spibusno}:0; " \ "sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \ "bootz ${loadaddr}\0" \ - "netboot=echo Booting from network ...; " \ - "setenv autoload no; " \ - "dhcp; " \ - "tftp ${loadaddr} ${bootfile}; " \ - "tftp ${fdtaddr} ${fdtfile}; " \ - "run netargs; " \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ "ramboot=echo Booting from ramdisk ...; " \ "run ramargs; " \ "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ @@ -181,6 +165,7 @@ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ NANDARGS \ + NETARGS \ DFUARGS #endif -- cgit v1.1