diff options
Diffstat (limited to 'board/dave')
| -rw-r--r-- | board/dave/PPChameleonEVB/u-boot.lds | 10 | ||||
| -rw-r--r-- | board/dave/common/flash.c | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds index 1ba6d1787..f4feb33c2 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 b0e411617..446defc4b 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 */ |