summaryrefslogtreecommitdiff
path: root/board/dave
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-04-18 19:43:36 +0000
committerwdenk <wdenk>2004-04-18 19:43:36 +0000
commit998eaaecd46ee5f00550e30e606cb5556e0b9345 (patch)
tree3b9784427a7c1ffd08d8b912d81c78681943b82c /board/dave
parent6e5923851ec5c11a36136abc77160d834537c4dd (diff)
* Configure PPChameleon board to use redundand environment in flashLABEL_2004_04_18_2135
* Configure PPChameleon board to use JFFS2 NAND support. * Added support for JFFS2 filesystem (read-only) on top of NAND flash
Diffstat (limited to 'board/dave')
-rw-r--r--board/dave/PPChameleonEVB/u-boot.lds10
-rw-r--r--board/dave/common/flash.c3
2 files changed, 8 insertions, 5 deletions
diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds
index 1ba6d1787cd..f4feb33c297 100644
--- a/board/dave/PPChameleonEVB/u-boot.lds
+++ b/board/dave/PPChameleonEVB/u-boot.lds
@@ -73,9 +73,6 @@ SECTIONS
lib_ppc/extable.o (.text)
lib_generic/zlib.o (.text)
-/* . = env_offset;*/
-/* common/environment.o(.text)*/
-
*(.text)
*(.fixup)
*(.got1)
@@ -142,6 +139,13 @@ SECTIONS
*(.bss)
*(COMMON)
}
+
+ . = 0xFFFF8000;
+ .ppcenv :
+ {
+ common/environment.o(.ppcenv);
+ }
+
_end = . ;
PROVIDE (end = .);
}
diff --git a/board/dave/common/flash.c b/board/dave/common/flash.c
index b0e411617f2..446defc4b9b 100644
--- a/board/dave/common/flash.c
+++ b/board/dave/common/flash.c
@@ -669,8 +669,7 @@ static int write_word (flash_info_t *info, ulong dest, ulong data)
int i;
/* Check if Flash is (sufficiently) erased */
- if ((*((volatile CFG_FLASH_WORD_SIZE *)dest) &
- (CFG_FLASH_WORD_SIZE)data) != (CFG_FLASH_WORD_SIZE)data) {
+ if ((*((volatile ulong *)dest) & data) != data) {
return (2);
}
/* Disable interrupts which might cause a timeout here */