summaryrefslogtreecommitdiffstats
path: root/include/configs/PPChameleonEVB.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-09-16 17:10:04 +0200
committerWolfgang Denk <wd@denx.de>2007-09-16 17:20:37 +0200
commit67c31036acaaaa992fc346cc89db0909a7e733c4 (patch)
tree51c721627703ec40a724e1503061554401743f05 /include/configs/PPChameleonEVB.h
parenteb6da8050797c204c9d010548424186c7ce32fc1 (diff)
downloadblackbird-obmc-uboot-67c31036acaaaa992fc346cc89db0909a7e733c4.tar.gz
blackbird-obmc-uboot-67c31036acaaaa992fc346cc89db0909a7e733c4.zip
TQM8xx[LM]: Fix broken environment alignment.
With recent toolchains, the environment sectors were no longer aligned to sector boundaries. The reason was a combination of two bugs: 1) common/environment.c assumed that CONFIG_TQM8xxL would be defined for all TQM8xxL and TQM8xxM boards. But "include/common.h", where this gets defined, is not included here (and cannot be included without causing lots of problems). Added a new #define CFG_USE_PPCENV for all boards which really want to put the environment is a ".ppcenv" section. 2) The linker scripts just include environment.o, silently assuming that the objects in that file are really in the order in which they are coded in the C file, i. e. "environment" first, then "redundand_environment", and "env_size" last. However, current toolchains (GCC-4.x) reorder the objects, causing the environment data not to start on a flash sector boundary: Instead of: we got: 40008000 T environment 40008000 T env_size 4000c000 T redundand_environment 40008004 T redundand_environment 40010000 T env_size 4000c004 T environment Note: this patch fixes just the first part, and cures the alignment problem by making sure that "env_size" gets placed correctly. However, we still have a potential issue because primary and redundant environment sectors are actually swapped, i. e. we have now: 40008000 T redundand_environment 4000c000 T environment 40010000 T env_size This shall be fixed in the next version. Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/PPChameleonEVB.h')
-rw-r--r--include/configs/PPChameleonEVB.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index dd1decdcd9..8a74c4f5c9 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -429,6 +429,8 @@
#define CFG_ENV_ADDR_REDUND 0xFFFFA000
#define CFG_ENV_SIZE_REDUND 0x2000
+#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
+
#endif /* ENVIRONMENT_IN_EEPROM */
OpenPOWER on IntegriCloud