diff options
author | Wolfgang Denk <wd@denx.de> | 2009-08-04 21:54:11 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-08-04 21:54:11 +0200 |
commit | cb32ed1fc298875845f166d326a3f2704a0d5364 (patch) | |
tree | 0bfddffa6c6457f87fffd4dd49ebf9698d45bf87 /Makefile | |
parent | 06bffc6ea52d4b390843d295d438b2037d12e5fd (diff) | |
parent | 052c08916532d1d9c2f69eb9229709c7b2fc1f02 (diff) | |
download | u-boot-imx-cb32ed1fc298875845f166d326a3f2704a0d5364.zip u-boot-imx-cb32ed1fc298875845f166d326a3f2704a0d5364.tar.gz u-boot-imx-cb32ed1fc298875845f166d326a3f2704a0d5364.tar.bz2 |
Merge branch 'next' of git://git.denx.de/u-boot-coldfire
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1993,6 +1993,9 @@ ZPC1900_config: unconfig ## Coldfire ######################################################################### +M5208EVBE_config : unconfig + @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5208evbe freescale + M52277EVB_config \ M52277EVB_spansion_config \ M52277EVB_stmicro_config : unconfig @@ -2097,18 +2100,15 @@ M5373EVB_config : unconfig @$(MKCONFIG) -a M5373EVB m68k mcf532x m5373evb freescale M54451EVB_config \ -M54451EVB_spansion_config \ M54451EVB_stmicro_config : unconfig @case "$@" in \ - M54451EVB_config) FLASH=SPANSION;; \ - M54451EVB_spansion_config) FLASH=SPANSION;; \ + M54451EVB_config) FLASH=NOR;; \ M54451EVB_stmicro_config) FLASH=STMICRO;; \ esac; \ - if [ "$${FLASH}" = "SPANSION" ] ; then \ - echo "#define CONFIG_SYS_SPANSION_BOOT" >> $(obj)include/config.h ; \ + if [ "$${FLASH}" = "NOR" ] ; then \ echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54451evb/config.tmp ; \ cp $(obj)board/freescale/m54451evb/u-boot.spa $(obj)board/freescale/m54451evb/u-boot.lds ; \ - $(XECHO) "... with SPANSION boot..." ; \ + $(XECHO) "... with NOR boot..." ; \ fi; \ if [ "$${FLASH}" = "STMICRO" ] ; then \ echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \ |