summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJason Hobbs <jason.hobbs@calxeda.com>2012-02-01 16:57:56 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-03-28 23:34:13 +0200
commita34e8549480c41057aa47cea50c0785fd9ce4f4a (patch)
tree131028ece3022e411fc851df04ad48e332ba4627 /include
parent0c34e69f57ad94e0ba66ace657eda2fb80bc5847 (diff)
downloadu-boot-imx-a34e8549480c41057aa47cea50c0785fd9ce4f4a.zip
u-boot-imx-a34e8549480c41057aa47cea50c0785fd9ce4f4a.tar.gz
u-boot-imx-a34e8549480c41057aa47cea50c0785fd9ce4f4a.tar.bz2
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/highbank.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 801f4ae..520fa4c 100644
--- 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