summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Jennejohn <garyj@denx.de>2008-05-14 13:39:22 +0200
committerStefan Roese <sr@denx.de>2008-05-14 14:02:42 +0200
commit0c11935cd62ca1f65eeb228ff4c848440d4553bf (patch)
tree7ed97a809b2e63c7184703b9ad37099008a9a0f6
parent73ccb3410a0785593cda7aee455dfc51f790e281 (diff)
downloadu-boot-0c11935cd62ca1f65eeb228ff4c848440d4553bf.tar.gz
u-boot-0c11935cd62ca1f65eeb228ff4c848440d4553bf.tar.bz2
u-boot-0c11935cd62ca1f65eeb228ff4c848440d4553bf.zip
ppc4xx: QUAD100HD: Allow the environment to be put into flash.
After moving TEXT_BASE the value for CFG_ENV_ADDR was incorrect. Also use a redundant environment. Signed-off-by: Gary Jennejohn <garyj@denx.de>
-rw-r--r--include/configs/quad100hd.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 00f80e4316..622a5d4ccc 100644
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -41,7 +41,9 @@
#define PLLMR0_DEFAULT PLLMR0_266_133_66 /* no PCI */
#define PLLMR1_DEFAULT PLLMR1_266_133_66 /* no PCI */
-#define CFG_ENV_IS_IN_EEPROM 1 /* use the EEPROM for environment vars */
+/* the environment is in the EEPROM by default */
+#define CFG_ENV_IS_IN_EEPROM
+#undef CFG_ENV_IS_IN_FLASH
#define CONFIG_NET_MULTI 1
#define CONFIG_HAS_ETH1 1
@@ -198,9 +200,12 @@
#ifdef CFG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
-#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
-#define CFG_ENV_OFFSET 0x00050000 /* Offset of Environment Sector */
-#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+/* the environment is located before u-boot */
+#define CFG_ENV_ADDR (TEXT_BASE - CFG_ENV_SECT_SIZE)
+
+/* Address and size of Redundant Environment Sector */
+#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE)
+#define CFG_ENV_SIZE_REDUND (CFG_ENV_SECT_SIZE)
#endif
#ifdef CFG_ENV_IS_IN_EEPROM