Merge branch 'master' of git://git.denx.de/u-boot-at91

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index fceb8a229267b0b99f2f429fa1485dd38e8d0c6c..e4a184fdc089c71588f01b2f98de82d4f0933a5b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1293,6 +1293,24 @@ ERIC_config:     unconfig
 EXBITGEN_config:       unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx exbitgen
 
+fx12mm_flash_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
+       @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
+               > $(obj)board/avnet/fx12mm/config.tmp
+       @echo "TEXT_BASE := 0xFFCB0000" \
+               >> $(obj)board/avnet/fx12mm/config.tmp
+       @$(MKCONFIG) fx12mm ppc ppc4xx fx12mm avnet
+
+fx12mm_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
+       @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
+               > $(obj)board/avnet/fx12mm/config.tmp
+       @echo "TEXT_BASE := 0x03000000" \
+               >> $(obj)board/avnet/fx12mm/config.tmp
+       @$(MKCONFIG) fx12mm ppc ppc4xx fx12mm avnet
+
 G2000_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
 
@@ -1518,6 +1536,22 @@ sycamore_config: unconfig
 WUH405_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx wuh405 esd
 
+xilinx-ppc405-generic_flash_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
+               > $(obj)board/xilinx/ppc405-generic/config.tmp
+       @echo "TEXT_BASE := 0xFE360000" \
+               >> $(obj)board/xilinx/ppc405-generic/config.tmp
+       @$(MKCONFIG) xilinx-ppc405-generic ppc ppc4xx ppc405-generic xilinx
+
+xilinx-ppc405-generic_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
+       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
+               > $(obj)board/xilinx/ppc405-generic/config.tmp
+       @echo "TEXT_BASE := 0x04000000" \
+               >> $(obj)board/xilinx/ppc405-generic/config.tmp
+       @$(MKCONFIG) xilinx-ppc405-generic ppc ppc4xx ppc405-generic xilinx
+
 xilinx-ppc440-generic_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
@@ -1898,7 +1932,27 @@ ZPC1900_config: unconfig
 ## Coldfire
 #########################################################################
 
-M52277EVB_config:      unconfig
+M52277EVB_config \
+M52277EVB_spansion_config \
+M52277EVB_stmicro_config :     unconfig
+       @case "$@" in \
+       M52277EVB_config)               FLASH=SPANSION;; \
+       M52277EVB_spansion_config)      FLASH=SPANSION;; \
+       M52277EVB_stmicro_config)       FLASH=STMICRO;; \
+       esac; \
+       if [ "$${FLASH}" = "SPANSION" ] ; then \
+               echo "#define CONFIG_SYS_SPANSION_BOOT" >> $(obj)include/config.h ; \
+               echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m52277evb/config.tmp ; \
+               cp $(obj)board/freescale/m52277evb/u-boot.spa $(obj)board/freescale/m52277evb/u-boot.lds ; \
+               $(XECHO) "... with SPANSION boot..." ; \
+       fi; \
+       if [ "$${FLASH}" = "STMICRO" ] ; then \
+               echo "#define CONFIG_CF_SBF"    >> $(obj)include/config.h ; \
+               echo "#define CONFIG_SYS_STMICRO_BOOT"  >> $(obj)include/config.h ; \
+               echo "TEXT_BASE = 0x43E00000" > $(obj)board/freescale/m52277evb/config.tmp ; \
+               cp $(obj)board/freescale/m52277evb/u-boot.stm $(obj)board/freescale/m52277evb/u-boot.lds ; \
+               $(XECHO) "... with ST Micro boot..." ; \
+       fi
        @$(MKCONFIG) -a M52277EVB m68k mcf5227x m52277evb freescale
 
 M5235EVB_config \
@@ -1958,6 +2012,9 @@ M5275EVB_config :         unconfig
 M5282EVB_config :              unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5282evb freescale
 
+M53017EVB_config :             unconfig
+       @$(MKCONFIG) $(@:_config=) m68k mcf532x m53017evb freescale
+
 M5329AFEE_config \
 M5329BFEE_config :     unconfig
        @case "$@" in \
@@ -2493,15 +2550,6 @@ shannon_config   :       unconfig
 at91rm9200dk_config    :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
 
-at91sam9261ek_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91
-
-at91sam9263ek_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91
-
-at91sam9rlek_config    :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91
-
 cmc_pu2_config :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
 
@@ -2521,12 +2569,24 @@ mp2usb_config   :       unconfig
 ## Atmel ARM926EJ-S Systems
 #########################################################################
 
+afeb9260_config:       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs afeb9260 NULL at91
+
 at91cap9adk_config     :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91
 
 at91sam9260ek_config   :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91
 
+at91sam9261ek_config   :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91
+
+at91sam9263ek_config   :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91
+
+at91sam9rlek_config    :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91
+
 ########################################################################
 ## ARM Integrator boards - see doc/README-integrator for more info.
 integratorap_config    \
@@ -3087,7 +3147,7 @@ mimc200_config            :       unconfig
 rsk7203_config: unconfig
        @ >include/config.h
        @echo "#define CONFIG_RSK7203 1" >> include/config.h
-       @./mkconfig -a $(@:_config=) sh sh2 rsk7203
+       @./mkconfig -a $(@:_config=) sh sh2 rsk7203 renesas
 
 #########################################################################
 ## sh3 (Renesas SuperH)
@@ -3110,7 +3170,7 @@ ms7720se_config: unconfig
 MigoR_config :       unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_MIGO_R 1" > $(obj)include/config.h
-       @./mkconfig -a $(@:_config=) sh sh4 MigoR
+       @./mkconfig -a $(@:_config=) sh sh4 MigoR renesas
 
 ms7750se_config: unconfig
        @mkdir -p $(obj)include
@@ -3125,27 +3185,27 @@ ms7722se_config :       unconfig
 r2dplus_config  :   unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_R2DPLUS 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) sh sh4 r2dplus
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 r2dplus renesas
 
 r7780mp_config: unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_R7780MP 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) sh sh4 r7780mp
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 r7780mp renesas
 
 sh7763rdp_config  :   unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_SH7763RDP 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) sh sh4 sh7763rdp
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 sh7763rdp renesas
 
 sh7785lcr_config  :   unconfig
        @ >include/config.h
        @echo "#define CONFIG_SH7785LCR 1" >> include/config.h
-       @$(MKCONFIG) -a $(@:_config=) sh sh4 sh7785lcr
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 sh7785lcr renesas
 
 ap325rxa_config  :   unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_AP325RXA 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) sh sh4 ap325rxa
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 ap325rxa renesas
 
 #========================================================================
 # SPARC