ColdFire: Fix the compile issue for M52277

After commit 327474f854a33b5b7a11c374b0446d1d40d9f673, the
M52277EVB_stmicro configuration fail to build. Fix it by moving
the env outside the flash and update the lds file.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>

diff --git a/board/freescale/m52277evb/u-boot.lds b/board/freescale/m52277evb/u-boot.lds
index e7b22e3fc3dd2a4c21239303819b804b5c518f8c..3e9f4c3460ed163cf9fe2df5bf3845a26c2c7252 100644 (file)
--- a/board/freescale/m52277evb/u-boot.lds
+++ b/board/freescale/m52277evb/u-boot.lds
@@ -32,9 +32,6 @@ SECTIONS
     arch/m68k/cpu/mcf5227x/libmcf5227x.o       (.text*)
     arch/m68k/lib/libm68k.o            (.text*)
 
-    . = DEFINED(env_offset) ? env_offset : .;
-    common/env_embedded.o      (.text*)
-
     *(.text*)
   }
   _etext = .;

diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 57225447fb3133d0939d1188b226dac36c9894b1..bfbb06c008559a71cf15902cafd2da4b7932b615 100644 (file)
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -246,7 +246,8 @@
 
 /*
  * Configuration for environment
- * Environment is embedded in u-boot in the second sector of the flash
+ * Environment is not embedded in u-boot. First time runing may have env
+ * crc error warning if there is no correct environment on the flash.
  */
 #ifdef CONFIG_CF_SBF
 #      define CONFIG_ENV_IS_IN_SPI_FLASH
@@ -261,6 +262,7 @@
  */
 #ifdef CONFIG_SYS_STMICRO_BOOT
 #      define CONFIG_SYS_FLASH_BASE    CONFIG_SYS_CS0_BASE
+#      define CONFIG_SYS_FLASH0_BASE   CONFIG_SYS_CS0_BASE
 #      define CONFIG_ENV_OFFSET        0x30000
 #      define CONFIG_ENV_SIZE          0x1000
 #      define CONFIG_ENV_SECT_SIZE     0x10000
@@ -268,7 +270,7 @@
 #ifdef CONFIG_SYS_SPANSION_BOOT
 #      define CONFIG_SYS_FLASH_BASE    CONFIG_SYS_CS0_BASE
 #      define CONFIG_SYS_FLASH0_BASE   CONFIG_SYS_CS0_BASE
-#      define CONFIG_ENV_ADDR          (CONFIG_SYS_FLASH_BASE + 0x8000)
+#      define CONFIG_ENV_ADDR          (CONFIG_SYS_FLASH_BASE + 0x40000)
 #      define CONFIG_ENV_SIZE          0x1000
 #      define CONFIG_ENV_SECT_SIZE     0x8000
 #endif