Fix yet another recently introduced bug.

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index ba52bdd37768cb06840894ccabdcb94f48eafabb..996b1246bb44017d8359244353a2affbb4772b13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ export        TOPDIR
 ifeq (include/config.mk,$(wildcard include/config.mk))
 # load ARCH, BOARD, and CPU configuration
 include include/config.mk
-export ARCH CPU BOARD VENDOR
+export ARCH CPU BOARD VENDOR SOC
 # load other configuration
 include $(TOPDIR)/config.mk
 
@@ -72,6 +72,9 @@ endif
 ifeq ($(ARCH),nios)
 CROSS_COMPILE = nios-elf-
 endif
+ifeq ($(ARCH),nios2)
+CROSS_COMPILE = nios2-elf-
+endif
 ifeq ($(ARCH),m68k)
 CROSS_COMPILE = m68k-elf-
 endif
@@ -101,9 +104,12 @@ endif
 LIBS  = lib_generic/libgeneric.a
 LIBS += board/$(BOARDDIR)/lib$(BOARD).a
 LIBS += cpu/$(CPU)/lib$(CPU).a
+ifdef SOC
+LIBS += cpu/$(CPU)/$(SOC)/lib$(SOC).a
+endif
 LIBS += lib_$(ARCH)/lib$(ARCH).a
 LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \
-       fs/reiserfs/libreiserfs.a
+       fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a
 LIBS += net/libnet.a
 LIBS += disk/libdisk.a
 LIBS += rtc/librtc.a
@@ -115,7 +121,7 @@ LIBS += common/libcommon.a
 .PHONY : $(LIBS)
 
 # Add GCC lib
-PLATFORM_LIBS += --no-warn-mismatch -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
+PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
 
 
 # The "tools" are needed early, so put this first
@@ -133,6 +139,9 @@ ALL = u-boot.srec u-boot.bin System.map
 
 all:           $(ALL)
 
+u-boot.hex:    u-boot
+               $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@
+
 u-boot.srec:   u-boot
                $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@
 
@@ -152,7 +161,7 @@ u-boot.dis: u-boot
 u-boot:                depend $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
                UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed  -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
                $(LD) $(LDFLAGS) $$UNDEF_SYM $(OBJS) \
-                       --start-group $(LIBS) $(PLATFORM_LIBS) --end-group \
+                       --start-group $(LIBS) --end-group $(PLATFORM_LIBS) \
                        -Map u-boot.map -o u-boot
 
 $(LIBS):
@@ -252,6 +261,9 @@ icecube_5100_config:                        unconfig
                }
        @./mkconfig -a IceCube ppc mpc5xxx icecube
 
+inka4x0_config:                unconfig
+       @./mkconfig inka4x0 ppc mpc5xxx inka4x0
+
 PM520_config \
 PM520_DDR_config \
 PM520_ROMBOOT_config \
@@ -301,6 +313,7 @@ Total5200_Rev2_lowboot_config:      unconfig
                }
        @./mkconfig -a Total5200 ppc mpc5xxx total5200
 
+TQM5200_auto_config            \
 TQM5200_AA_config      \
 TQM5200_AB_config      \
 TQM5200_AC_config      \
@@ -325,6 +338,10 @@ MiniFAP_config:    unconfig
                  echo "... with 4 MB Flash, 128 MB SDRAM" ; \
                  echo "... with Graphics Controller"; \
                }
+       @[ -z "$(findstring auto,$@)" ] || \
+               { echo "#define CONFIG_CS_AUTOCONF"     >>include/config.h ; \
+                 echo "... with automatic CS configuration" ; \
+               }
        @./mkconfig -a TQM5200 ppc mpc5xxx tqm5200
 
 #########################################################################
@@ -553,6 +570,9 @@ QS823_config:       unconfig
 QS860T_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx qs860t snmc
 
+quantum_config:        unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx quantum
+
 R360MPI_config:        unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx r360mpi
 
@@ -650,6 +670,9 @@ TTTech_config:      unconfig
        @echo "#define CONFIG_SHARP_LQ104V7DS01" >>include/config.h
        @./mkconfig -a TQM823L ppc mpc8xx tqm8xx
 
+uc100_config   :       unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx uc100
+
 v37_config:    unconfig
        @echo "#define CONFIG_LCD" >include/config.h
        @echo "#define CONFIG_SHARP_LQ084V1DG21" >>include/config.h
@@ -668,6 +691,9 @@ xtract_4xx = $(subst _25,,$(subst _33,,$(subst _BA,,$(subst _ME,,$(subst _HI,,$(
 ADCIOP_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx adciop esd
 
+APC405_config: unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx apc405 esd
+
 AR405_config:  unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx ar405 esd
 
@@ -680,13 +706,24 @@ BUBINGA405EP_config:      unconfig
 CANBT_config:  unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx canbt esd
 
-CATcenter_config:      unconfig
+CATcenter_config       \
+CATcenter_25_config    \
+CATcenter_33_config:   unconfig
        @ echo "/* CATcenter uses PPChameleon Model ME */"  > include/config.h
        @ echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >> include/config.h
+       @[ -z "$(findstring _25,$@)" ] || \
+               { echo "#define CONFIG_PPCHAMELEON_CLK_25" >>include/config.h ; \
+                 echo "SysClk = 25MHz" ; \
+               }
+       @[ -z "$(findstring _33,$@)" ] || \
+               { echo "#define CONFIG_PPCHAMELEON_CLK_33" >>include/config.h ; \
+                 echo "SysClk = 33MHz" ; \
+               }
        @./mkconfig -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
 CPCI405_config \
 CPCI4052_config        \
+CPCI405DT_config       \
 CPCI405AB_config:      unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx cpci405 esd
        @echo "BOARD_REVISION = $(@:_config=)"  >>include/config.mk
@@ -724,6 +761,12 @@ ERIC_config:       unconfig
 EXBITGEN_config:       unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx exbitgen
 
+G2000_config:  unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx g2000
+
+HH405_config:  unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx hh405 esd
+
 HUB405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx hub405 esd
 
@@ -771,31 +814,37 @@ PPChameleonEVB_BA_33_config       \
 PPChameleonEVB_ME_33_config    \
 PPChameleonEVB_HI_33_config:   unconfig
        @ >include/config.h
-       @[ -z "$(findstring _MODEL_BA,$@)" ] || \
+       @[ -z "$(findstring EVB_BA,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 0" >>include/config.h ; \
                  echo "... BASIC model" ; \
                }
-       @[ -z "$(findstring _MODEL_ME,$@)" ] || \
+       @[ -z "$(findstring EVB_ME,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >>include/config.h ; \
                  echo "... MEDIUM model" ; \
                }
-       @[ -z "$(findstring _MODEL_HI,$@)" ] || \
+       @[ -z "$(findstring EVB_HI,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 2" >>include/config.h ; \
                  echo "... HIGH-END model" ; \
                }
        @[ -z "$(findstring _25,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_CLK_25" >>include/config.h ; \
-                 echo " SysClk = 25MHz" ; \
+                 echo "SysClk = 25MHz" ; \
                }
        @[ -z "$(findstring _33,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_CLK_33" >>include/config.h ; \
-                 echo " SysClk = 33MHz" ; \
+                 echo "SysClk = 33MHz" ; \
                }
        @./mkconfig -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
+sbc405_config: unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx sbc405
+
 VOH405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx voh405 esd
 
+VOM405_config: unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx vom405 esd
+
 W7OLMC_config  \
 W7OLMG_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx w7o
@@ -803,9 +852,21 @@ W7OLMG_config: unconfig
 WALNUT405_config:      unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx walnut405
 
+WUH405_config: unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx wuh405 esd
+
 XPEDITE1K_config:      unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx xpedite1k
 
+#########################################################################
+## MPC8220 Systems
+#########################################################################
+Alaska8220_config:     unconfig
+       @./mkconfig $(@:_config=) ppc mpc8220 alaska
+
+Yukon8220_config:      unconfig
+       @./mkconfig $(@:_config=) ppc mpc8220 yukon
+
 #########################################################################
 ## MPC824x Systems
 #########################################################################
@@ -869,6 +930,9 @@ SL8245_config: unconfig
 utx8245_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x utx8245
 
+cobra5272_config :             unconfig
+       @./mkconfig $(@:_config=) m68k mcf52x2 cobra5272
+
 #########################################################################
 ## MPC8260 Systems
 #########################################################################
@@ -1061,6 +1125,9 @@ M5272C3_config :          unconfig
 M5282EVB_config :              unconfig
        @./mkconfig $(@:_config=) m68k mcf52x2 m5282evb
 
+TASREG_config :                unconfig
+       @./mkconfig $(@:_config=) m68k mcf52x2 tasreg esd
+
 #########################################################################
 ## MPC85xx Systems
 #########################################################################
@@ -1071,14 +1138,29 @@ MPC8540ADS_config:      unconfig
 MPC8560ADS_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc85xx mpc8560ads
 
-stxgp3_config:         unconfig
-       @./mkconfig $(@:_config=) ppc mpc85xx stxgp3
+MPC8541CDS_config:     unconfig
+       @./mkconfig $(@:_config=) ppc mpc85xx mpc8541cds cds
+
+MPC8555CDS_config:     unconfig
+       @./mkconfig $(@:_config=) ppc mpc85xx mpc8555cds cds
+
+sbc8540_config \
+sbc8540_33_config \
+sbc8540_66_config:     unconfig
+       @if [ "$(findstring _66_,$@)" ] ; then \
+               echo "#define CONFIG_PCI_66"    >>include/config.h ; \
+               echo "... 66 MHz PCI" ; \
+       else \
+               >include/config.h ; \
+               echo "... 33 MHz PCI" ; \
+       fi
+       @./mkconfig -a SBC8540 ppc mpc85xx sbc8560
 
 sbc8560_config \
 sbc8560_33_config \
 sbc8560_66_config:      unconfig
        @if [ "$(findstring _66_,$@)" ] ; then \
-               echo "#define CONFIG_PCI_66"  >>include/config.h ; \
+               echo "#define CONFIG_PCI_66"    >>include/config.h ; \
                echo "... 66 MHz PCI" ; \
        else \
                >include/config.h ; \
@@ -1086,6 +1168,9 @@ sbc8560_66_config:      unconfig
        fi
        @./mkconfig -a sbc8560 ppc mpc85xx sbc8560
 
+stxgp3_config:         unconfig
+       @./mkconfig $(@:_config=) ppc mpc85xx stxgp3
+
 #########################################################################
 ## 74xx/7xx Systems
 #########################################################################
@@ -1096,6 +1181,9 @@ AmigaOneG3SE_config:      unconfig
 BAB7xx_config: unconfig
        @./mkconfig $(@:_config=) ppc 74xx_7xx bab7xx eltec
 
+CPCI750_config:        unconfig
+       @./mkconfig CPCI750 ppc 74xx_7xx cpci750 esd
+
 DB64360_config:  unconfig
        @./mkconfig DB64360 ppc 74xx_7xx db64360 Marvell
 
@@ -1151,21 +1239,21 @@ xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$
 
 xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
 
-integratorcp_config :  unconfig
-       @./mkconfig $(@:_config=) arm arm926ejs integratorcp
-
 integratorap_config :  unconfig
        @./mkconfig $(@:_config=) arm arm926ejs integratorap
 
+integratorcp_config :  unconfig
+       @./mkconfig $(@:_config=) arm arm926ejs integratorcp
+
 lpd7a400_config \
 lpd7a404_config:       unconfig
        @./mkconfig $(@:_config=) arm lh7a40x lpd7a40x
 
 mx1ads_config  :       unconfig
-       @./mkconfig $(@:_config=) arm arm920t mx1ads
+       @./mkconfig $(@:_config=) arm arm920t mx1ads NULL imx
 
 mx1fs2_config  :       unconfig
-       @./mkconfig $(@:_config=) arm arm920t mx1fs2
+       @./mkconfig $(@:_config=) arm arm920t mx1fs2 NULL imx
 
 omap1510inn_config :   unconfig
        @./mkconfig $(@:_config=) arm arm925t omap1510inn
@@ -1206,13 +1294,13 @@ omap730p2_cs3boot_config :      unconfig
        @./mkconfig -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2
 
 scb9328_config :       unconfig
-       @./mkconfig $(@:_config=) arm arm920t scb9328
+       @./mkconfig $(@:_config=) arm arm920t scb9328 NULL imx
 
 smdk2400_config        :       unconfig
-       @./mkconfig $(@:_config=) arm arm920t smdk2400
+       @./mkconfig $(@:_config=) arm arm920t smdk2400 NULL s3c24x0
 
 smdk2410_config        :       unconfig
-       @./mkconfig $(@:_config=) arm arm920t smdk2410
+       @./mkconfig $(@:_config=) arm arm920t smdk2410 NULL s3c24x0
 
 SX1_config :           unconfig
        @./mkconfig $(@:_config=) arm arm925t sx1
@@ -1240,10 +1328,10 @@ trab_old_config:        unconfig
                  echo "... with 8 MB Flash, 16 MB RAM" ; \
                  echo "TEXT_BASE = 0x0CF40000" >board/trab/config.tmp ; \
                }
-       @./mkconfig -a $(call xtract_trab,$@) arm arm920t trab
+       @./mkconfig -a $(call xtract_trab,$@) arm arm920t trab NULL s3c24x0
 
 VCMA9_config   :       unconfig
-       @./mkconfig $(@:_config=) arm arm920t vcma9 mpl
+       @./mkconfig $(@:_config=) arm arm920t vcma9 mpl s3c24x0
 
 versatile_config :     unconfig
        @./mkconfig $(@:_config=) arm arm926ejs versatile
@@ -1278,6 +1366,9 @@ evb4510_config :  unconfig
 at91rm9200dk_config    :       unconfig
        @./mkconfig $(@:_config=) arm at91rm9200 at91rm9200dk
 
+cmc_pu2_config :       unconfig
+       @./mkconfig $(@:_config=) arm at91rm9200 cmc_pu2
+
 #########################################################################
 ## XScale Systems
 #########################################################################
@@ -1306,12 +1397,21 @@ logodl_config   :       unconfig
 wepep250_config        :       unconfig
        @./mkconfig $(@:_config=) arm pxa wepep250
 
+xaeniax_config :       unconfig
+       @./mkconfig $(@:_config=) arm pxa xaeniax
+
 xm250_config   :       unconfig
        @./mkconfig $(@:_config=) arm pxa xm250
 
 xsengine_config :      unconfig
        @./mkconfig $(@:_config=) arm pxa xsengine
 
+#########################################################################
+## ARM1136 Systems
+#########################################################################
+omap2420h4_config :    unconfig
+       @./mkconfig $(@:_config=) arm arm1136 omap2420h4
+
 #========================================================================
 # i386
 #========================================================================
@@ -1376,6 +1476,16 @@ dbau1500_config          :       unconfig
        @echo "#define CONFIG_DBAU1500 1" >>include/config.h
        @./mkconfig -a dbau1x00 mips mips dbau1x00
 
+dbau1550_config                :       unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_DBAU1550 1" >>include/config.h
+       @./mkconfig -a dbau1x00 mips mips dbau1x00
+
+dbau1550_el_config     :       unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_DBAU1550 1" >>include/config.h
+       @./mkconfig -a dbau1x00 mips mips dbau1x00 "" little
+
 #########################################################################
 ## MIPS64 5Kc
 #########################################################################
@@ -1449,6 +1559,15 @@ ADNPESC1_config: unconfig
                }
        @./mkconfig -a ADNPESC1 nios nios adnpesc1 ssv
 
+#########################################################################
+## Nios-II
+#########################################################################
+
+PK1C20_config : unconfig
+       @./mkconfig  PK1C20 nios2 nios2 pk1c20 psyent
+
+PCI5441_config : unconfig
+       @./mkconfig  PCI5441 nios2 nios2 pci5441 psyent
 
 #========================================================================
 # MicroBlaze
@@ -1487,7 +1606,7 @@ clobber:  clean
                | xargs -0 rm -f
        rm -f $(OBJS) *.bak tags TAGS
        rm -fr *.*~
-       rm -f u-boot u-boot.map $(ALL)
+       rm -f u-boot u-boot.map u-boot.hex $(ALL)
        rm -f tools/crc32.c tools/environment.c tools/env/crc32.c
        rm -f tools/inca-swap-bytes cpu/mpc824x/bedbug_603e.c
        rm -f include/asm/proc include/asm/arch include/asm