summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Moffett <Kyle.D.Moffett@boeing.com>2011-12-15 22:26:53 -0500
committerKumar Gala <galak@kernel.crashing.org>2012-01-11 13:57:51 -0600
commit7985f7e3ff51ad8024d69a209893f68a2a5d3983 (patch)
treed67bb8b0341e13e64aec0a00ba1401fc193c7c8f
parent9a420986cccc9bd2c37affd931d627b3c3e72952 (diff)
downloadblackbird-obmc-uboot-7985f7e3ff51ad8024d69a209893f68a2a5d3983.tar.gz
blackbird-obmc-uboot-7985f7e3ff51ad8024d69a209893f68a2a5d3983.zip
eXMeritus HWW-1U-1A: Minor environment variable tweaks
Most of the ethernet connections are internal links with specialized hardware and are not useful for "dhcp" or general-purpose networking; U-Boot should not be cycling through them. Force the primary external network interface in "ethprime" and disable the interface cycling with "ethrotate=no". Additionally, the environment variable "preboot" has its own config option and means something entirely different from what the HWW-1U-1A variable was intended for. Rename the board variable to "setbootargs" to avoid potential confusion. Finally, fix an incorrect address for the kernel in FLASH memory. Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com> Cc: Andy Fleming <afleming@gmail.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--include/configs/HWW1U1A.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/configs/HWW1U1A.h b/include/configs/HWW1U1A.h
index c7a835bbda..168f70feb9 100644
--- a/include/configs/HWW1U1A.h
+++ b/include/configs/HWW1U1A.h
@@ -438,11 +438,14 @@ const char *hww1u1a_get_ps1(void);
/* Extra environment parameters */
#define CONFIG_EXTRA_ENV_SETTINGS \
- "preboot=setenv bootargs \"${bootargs} "CONFIG_BOOTARGS_DYNAMIC"\"\0" \
+ "ethprime=e1000#0\0" \
+ "ethrotate=no\0" \
+ "setbootargs=setenv bootargs " \
+ "\"${bootargs} "CONFIG_BOOTARGS_DYNAMIC"\"\0" \
"perf_mode=performance\0" \
"hwconfig=" "fsl_ddr:ctlr_intlv=bank,bank_intlv=cs0_cs1;" \
"usb1:dr_mode=host,phy_type=ulpi\0" \
- "flkernel=0xe8020000\0" \
+ "flkernel=0xe8000000\0" \
"flinitramfs=0xe8800000\0" \
"fldevicetree=0xeff20000\0" \
"flbootm=bootm ${flkernel} ${flinitramfs} ${fldevicetree}\0" \
OpenPOWER on IntegriCloud