summaryrefslogtreecommitdiffstats
path: root/include/configs/MVBC_P.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-12 16:13:12 +0200
committerWolfgang Denk <wd@denx.de>2008-09-12 16:13:12 +0200
commitafbc526336447a7357e9c82852df0377d09a8089 (patch)
tree63360d749d3f02916a1239b3862c68d41d3f3d19 /include/configs/MVBC_P.h
parentb476b032562aae5a09985f7e22232a5ee7042746 (diff)
parentdeeec4991a55de243787002ede24d2331d234fc8 (diff)
downloadtalos-obmc-uboot-afbc526336447a7357e9c82852df0377d09a8089.tar.gz
talos-obmc-uboot-afbc526336447a7357e9c82852df0377d09a8089.zip
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/MVBC_P.h')
-rw-r--r--include/configs/MVBC_P.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 0ce88d6be6..21475fb665 100644
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -215,14 +215,14 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#undef CFG_FLASH_PROTECTION
-#define CFG_ENV_ADDR 0xFFFE0000
-#define CFG_ENV_SIZE 0x10000
-#define CFG_ENV_SECT_SIZE 0x10000
-#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR 0xFFFE0000
+#define CONFIG_ENV_SIZE 0x10000
+#define CONFIG_ENV_SECT_SIZE 0x10000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
/*
* Memory map
@@ -243,7 +243,7 @@
#define CFG_RAMBOOT 1
#endif
-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (512 << 10)
#define CFG_MALLOC_LEN (512 << 10)
#define CFG_BOOTMAPSZ (8 << 20)
OpenPOWER on IntegriCloud