Merge with http://www.psyent.com/git/uboot (NIOS2 - Scott McNutt)

diff --git a/CHANGELOG b/CHANGELOG
index 79dfde547c65aca167e88b476da8a63059b38044..3b81ff618ddcd1f717dcd058d49eba7d2f7dda35 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,8 @@ Changes since U-Boot 1.1.4:
   -Fix mini-app stubs and force no small data
   Patch by Scott McNutt, 08 Jun 2006
 
+* Fix U-Boot environment sector protection on MCC200 board
+
 * Minor cleanup for PCS440EP board
 
 * Update PCS440EP port to fit into one flash device (incl. environment)

diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index 5fe239f23472c6cfafa8c519bfed9d5940711757..87427e4e0d689418e0a28b514ca1caef8dd9dcc2 100644 (file)
--- a/board/mcc200/mcc200.c
+++ b/board/mcc200/mcc200.c
@@ -242,7 +242,7 @@ int misc_init_r (void)
                /* Unprotect the upper bank of the Flash */
                *(volatile int*)MPC5XXX_CS0_CFG |= (1 << 6);
                flash_protect (FLAG_PROTECT_CLEAR,
-                              flash_info[0].start[0],
+                              flash_info[0].start[0] + flash_info[0].size / 2,
                               (flash_info[0].start[0] + flash_info[0].size) / 2 - 1,
                               &flash_info[0]);
                *(volatile int*)MPC5XXX_CS0_CFG &= ~(1 << 6);