FSL DDR: Convert MPC8548CDS to new DDR code.

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 7d8b2ba11729c6ea56633d60e2d9d59fcb3bb0e1..89fea72e08fe2c883b342abfb331c8fa927344c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -236,6 +236,10 @@ LIBS += drivers/qe/qe.a
 endif
 ifeq ($(CPU),mpc85xx)
 LIBS += drivers/qe/qe.a
+LIBS += cpu/mpc8xxx/ddr/libddr.a
+endif
+ifeq ($(CPU),mpc86xx)
+LIBS += cpu/mpc8xxx/ddr/libddr.a
 endif
 LIBS += drivers/rtc/librtc.a
 LIBS += drivers/serial/libserial.a
@@ -459,6 +463,8 @@ CHANGELOG:
        git log --no-merges U-Boot-1_1_5.. | \
        unexpand -a | sed -e 's/\s\s*$$//' > $@
 
+include/license.h: tools/bin2header COPYING
+        cat COPYING | gzip -9 -c | ./tools/bin2header license_gzip > include/license.h
 #########################################################################
 
 unconfig:
@@ -912,9 +918,6 @@ mgsuvd_config:              unconfig
 MHPC_config:           unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx mhpc eltec
 
-MVS1_config :          unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx mvs1
-
 xtract_NETVIA = $(subst _V2,,$(subst _config,,$1))
 
 NETVIA_V2_config \
@@ -1687,6 +1690,15 @@ PQ2FADS-ZU_66MHz_lowboot_config  \
 MPC8266ADS_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8260 mpc8266ads freescale
 
+muas3001_dev_config \
+muas3001_config        :       unconfig
+       @mkdir -p $(obj)include
+       @mkdir -p $(obj)board/muas3001
+       @if [ "$(findstring dev,$@)" ] ; then \
+               echo "#define CONFIG_MUAS_DEV_BOARD" > $(obj)include/config.h ; \
+       fi
+       @$(MKCONFIG) -a muas3001 ppc mpc8260 muas3001
+
 # PM825/PM826 default configuration:  small (= 8 MB) Flash / boot from 64-bit flash
 PM825_config   \
 PM825_ROMBOOT_config   \
@@ -1876,16 +1888,16 @@ idmr_config :                   unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 idmr
 
 M5271EVB_config :              unconfig
-       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5271evb
+       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5271evb freescale
 
 M5272C3_config :               unconfig
-       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5272c3
+       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5272c3 freescale
 
 M5275EVB_config :              unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5275evb freescale
 
 M5282EVB_config :              unconfig
-       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5282evb
+       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5282evb freescale
 
 M5329AFEE_config \
 M5329BFEE_config :     unconfig
@@ -1907,6 +1919,30 @@ M5373EVB_config :        unconfig
        fi
        @$(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_stmicro_config)       FLASH=STMICRO;; \
+       esac; \
+       if [ "$${FLASH}" = "SPANSION" ] ; then \
+               echo "#define CFG_SPANSION_BOOT"        >> $(obj)include/config.h ; \
+               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..." ; \
+       fi; \
+       if [ "$${FLASH}" = "STMICRO" ] ; then \
+               echo "#define CONFIG_CF_SBF"    >> $(obj)include/config.h ; \
+               echo "#define CFG_STMICRO_BOOT" >> $(obj)include/config.h ; \
+               echo "TEXT_BASE = 0x47E00000" > $(obj)board/freescale/m54451evb/config.tmp ; \
+               cp $(obj)board/freescale/m54451evb/u-boot.stm $(obj)board/freescale/m54451evb/u-boot.lds ; \
+               $(XECHO) "... with ST Micro boot..." ; \
+       fi; \
+       echo "#define CFG_INPUT_CLKSRC 24000000" >> $(obj)include/config.h ;
+       @$(MKCONFIG) -a M54451EVB m68k mcf5445x m54451evb freescale
+
 M54455EVB_config \
 M54455EVB_atmel_config \
 M54455EVB_intel_config \
@@ -2039,7 +2075,7 @@ MPC8313ERDB_NAND_66_config: unconfig
        fi ; \
        if [ "$(findstring _NAND_,$@)" ] ; then \
                $(XECHO) -n "...NAND..." ; \
-               echo "TEXT_BASE = 0x00100000" > $(obj)/board/freescale/mpc8313erdb/config.tmp ; \
+               echo "TEXT_BASE = 0x00100000" > $(obj)board/freescale/mpc8313erdb/config.tmp ; \
                echo "#define CONFIG_NAND_U_BOOT" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb freescale
@@ -2154,7 +2190,7 @@ MPC837XERDB_config:       unconfig
        @$(MKCONFIG) -a MPC837XERDB ppc mpc83xx mpc837xerdb freescale
 
 MVBLM7_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc83xx mvblm7
+       @$(MKCONFIG) $(@:_config=) ppc mpc83xx mvblm7 matrix_vision
 
 sbc8349_config:                unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc83xx sbc8349
@@ -2947,6 +2983,15 @@ atstk1004_config :       unconfig
 atstk1006_config       :       unconfig
        @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
 
+favr-32-ezkit_config   :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap favr-32-ezkit earthlcd at32ap700x
+
+hammerhead_config      :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap hammerhead miromico at32ap700x
+
+mimc200_config         :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap mimc200 mimc at32ap700x
+
 #========================================================================
 # SH3 (SuperH)
 #========================================================================
@@ -3077,9 +3122,9 @@ clobber:  clean
        @rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h}
        @rm -f $(obj)cpu/mpc824x/bedbug_603e.c
        @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
-       @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f
-       @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -lname "*" -print | xargs rm -f
-       @[ ! -d $(obj)api_examples ] || find $(obj)api_examples -lname "*" -print | xargs rm -f
+       @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
+       @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f
+       @[ ! -d $(obj)api_examples ] || find $(obj)api_examples -name "*" -type l -print | xargs rm -f
 
 ifeq ($(OBJTREE),$(SRCTREE))
 mrproper \