From 998eaaecd46ee5f00550e30e606cb5556e0b9345 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 18 Apr 2004 19:43:36 +0000
Subject: * Configure PPChameleon board to use redundand environment in flash

* Configure PPChameleon board to use JFFS2 NAND support.

* Added support for JFFS2 filesystem (read-only) on top of NAND flash
---
 board/dave/PPChameleonEVB/u-boot.lds | 10 +++++++---
 board/dave/common/flash.c            |  3 +--
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'board/dave')

diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds
index 1ba6d1787c..f4feb33c29 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 b0e411617f..446defc4b9 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 */
-- 
cgit v1.2.3