ARM: highbank: change env config to use nvram

Update the highbank config to use env from NVRAM. Also remove extra env
settings as they are not used unless the default env is used.

Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 801f4ae67c16de111695b106b50aff0d31733ea0..520fa4cc9ed2523b41389b5172f4fb9f14d8b4f9 100644 (file)
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -93,12 +93,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x800000
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
-               "fdtaddr_r=0x600000\0" \
-               "pxefile_addr_r=0x700000\0" \
-               "kernel_addr_r=0x800000\0" \
-               "ramdisk_addr_r=0x01000000\0" \
-
 /*-----------------------------------------------------------------------
  * Stack sizes
  *
@@ -118,9 +112,13 @@
 #define CONFIG_SYS_MEMTEST_START       0x100000
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1_SIZE - 0x100000)
 
-/* Room required on the stack for the environment data */
-#define CONFIG_ENV_SIZE                        0x2000
-#define CONFIG_ENV_IS_NOWHERE
+/* Environment data setup
+*/
+#define CONFIG_ENV_IS_IN_NVRAM
+#define CONFIG_SYS_NVRAM_BASE_ADDR     0xfff88000      /* NVRAM base address */
+#define CONFIG_SYS_NVRAM_SIZE          0x8000          /* NVRAM size */
+#define CONFIG_ENV_SIZE                        0x2000          /* Size of Environ */
+#define CONFIG_ENV_ADDR                        CONFIG_SYS_NVRAM_BASE_ADDR
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_TEXT_BASE           0x00008000