Merge branch 'wd'

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 65c457e00e5925abc7cfe067d37e3584980c692b..2eec40df89d45606bcc4ea3a57362e60cf143a54 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
+# published by the Free Software Foundatio; either version 2 of
 # the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -114,6 +114,9 @@ endif
 ifeq ($(CPU),mpc85xx)
 OBJS += cpu/$(CPU)/resetvec.o
 endif
+ifeq ($(CPU),mpc86xx)
+OBJS += cpu/$(CPU)/resetvec.o
+endif
 ifeq ($(CPU),bf533)
 OBJS += cpu/$(CPU)/start1.o    cpu/$(CPU)/interrupt.o  cpu/$(CPU)/cache.o
 OBJS += cpu/$(CPU)/cplbhdlr.o  cpu/$(CPU)/cplbmgr.o    cpu/$(CPU)/flush.o
@@ -133,6 +136,8 @@ LIBS += disk/libdisk.a
 LIBS += rtc/librtc.a
 LIBS += dtt/libdtt.a
 LIBS += drivers/libdrivers.a
+LIBS += drivers/nand/libnand.a
+LIBS += drivers/nand_legacy/libnand_legacy.a
 LIBS += drivers/sk98lin/libsk98lin.a
 LIBS += post/libpost.a post/cpu/libcpu.a
 LIBS += common/libcommon.a
@@ -257,6 +262,9 @@ PATI_config:                unconfig
 aev_config: unconfig
        @./mkconfig -a aev ppc mpc5xxx tqm5200
 
+BC3450_config: unconfig
+       @./mkconfig -a BC3450 ppc mpc5xxx bc3450
+
 cpci5200_config:  unconfig
        @./mkconfig -a cpci5200  ppc mpc5xxx cpci5200 esd
 
@@ -303,14 +311,40 @@ icecube_5100_config:                      unconfig
 inka4x0_config:        unconfig
        @./mkconfig inka4x0 ppc mpc5xxx inka4x0
 
+lite5200b_config       \
+lite5200b_LOWBOOT_config:      unconfig
+       @ >include/config.h
+       @ echo "#define CONFIG_MPC5200_DDR"     >>include/config.h
+       @ echo "... DDR memory revision"
+       @ echo "#define CONFIG_MPC5200"         >>include/config.h
+       @ echo "#define CONFIG_LITE5200B"       >>include/config.h
+       @[ -z "$(findstring LOWBOOT_,$@)" ] || \
+               { echo "TEXT_BASE = 0xFF000000" >board/icecube/config.tmp ; \
+                 echo "... with LOWBOOT configuration" ; \
+               }
+       @ echo "... with MPC5200B processor"
+       @./mkconfig -a IceCube  ppc mpc5xxx icecube
+
 mcc200_config  \
-mcc200_lowboot_config: unconfig
+mcc200_SDRAM   \
+mcc200_highboot        \
+mcc200_highboot_SDRAM: unconfig
        @ >include/config.h
-       @[ -z "$(findstring lowboot_,$@)" ] || \
-               { echo "TEXT_BASE = 0xFE000000" >board/mcc200/config.tmp ; \
-                 echo "... with lowboot configuration" ; \
+       @[ -n "$(findstring highboot,$@)" ] || \
+               { echo "... with lowboot configuration" ; \
+               }
+       @[ -z "$(findstring highboot,$@)" ] || \
+               { echo "TEXT_BASE = 0xFFF00000" >board/mcc200/config.tmp ; \
+                 echo "... with highboot configuration" ; \
+               }
+       @[ -n "$(findstring _SDRAM,$@)" ] || \
+               { echo "... with DDR" ; \
+               }
+       @[ -z "$(findstring _SDRAM,$@)" ] || \
+               { echo "#define CONFIG_MCC200_SDRAM"    >>include/config.h ; \
+                 echo "... with SDRAM" ; \
                }
-       @./mkconfig mcc200 ppc mpc5xxx mcc200
+       @./mkconfig -a mcc200 ppc mpc5xxx mcc200
 
 o2dnt_config:
        @./mkconfig o2dnt ppc mpc5xxx o2dnt
@@ -337,15 +371,21 @@ smmaco4_config: unconfig
        @./mkconfig -a smmaco4 ppc mpc5xxx tqm5200
 
 spieval_config:        unconfig
-       echo "#define CONFIG_CS_AUTOCONF">>include/config.h
-       echo "... with automatic CS configuration"
        @./mkconfig -a spieval ppc mpc5xxx tqm5200
 
+TB5200_B_config \
+TB5200_config: unconfig
+       @[ -z "$(findstring _B,$@)" ] || \
+               { echo "#define CONFIG_TQM5200_B"       >>include/config.h ; \
+                 echo "... with MPC5200B processor" ; \
+               }
+       @./mkconfig -n $@ -a TB5200 ppc mpc5xxx tqm5200
+
 MINI5200_config        \
 EVAL5200_config        \
 TOP5200_config:        unconfig
        @ echo "#define CONFIG_$(@:_config=) 1" >include/config.h
-       @./mkconfig -a TOP5200 ppc mpc5xxx top5200 emk
+       @./mkconfig -n $@ -a TOP5200 ppc mpc5xxx top5200 emk
 
 Total5100_config               \
 Total5200_config               \
@@ -375,36 +415,40 @@ Total5200_Rev2_lowboot_config:    unconfig
                }
        @./mkconfig -a Total5200 ppc mpc5xxx total5200
 
-TQM5200_auto_config    \
-TQM5200_AA_config      \
-TQM5200_AB_config      \
-TQM5200_AC_config      \
+TQM5200_config \
+TQM5200_B_config \
+TQM5200_B_HIGHBOOT_config \
+TQM5200S_config \
+TQM5200S_HIGHBOOT_config \
+TQM5200_STK100_config \
+cam5200_config \
 MiniFAP_config:        unconfig
        @ >include/config.h
        @[ -z "$(findstring MiniFAP,$@)" ] || \
                { echo "#define CONFIG_MINIFAP" >>include/config.h ; \
-                 echo "#define CONFIG_TQM5200_AC"      >>include/config.h ; \
                  echo "... TQM5200_AC on MiniFAP" ; \
                }
-       @[ -z "$(findstring AA,$@)" ] || \
-               { echo "#define CONFIG_TQM5200_AA"      >>include/config.h ; \
-                 echo "... with 4 MB Flash, 16 MB SDRAM, 32 kB EEPROM" ; \
+       @[ -z "$(findstring cam5200,$@)" ] || \
+               { echo "#define CONFIG_CAM5200" >>include/config.h ; \
+                 echo "#define CONFIG_TQM5200S"        >>include/config.h ; \
+                 echo "#define CONFIG_TQM5200_B"       >>include/config.h ; \
+                 echo "... TQM5200S on Cam5200" ; \
+               }
+       @[ -z "$(findstring STK100,$@)" ] || \
+               { echo "#define CONFIG_STK52XX_REV100"  >>include/config.h ; \
+                 echo "... on a STK52XX.100 base board" ; \
                }
-       @[ -z "$(findstring AB,$@)" ] || \
-               { echo "#define CONFIG_TQM5200_AB"      >>include/config.h ; \
-                 echo "... with 64 MB Flash, 64 MB SDRAM, 32 kB EEPROM, 512 kB SRAM" ; \
-                 echo "... with Graphics Controller"; \
+       @[ -z "$(findstring TQM5200_B,$@)" ] || \
+               { echo "#define CONFIG_TQM5200_B"       >>include/config.h ; \
                }
-       @[ -z "$(findstring AC,$@)" ] || \
-               { echo "#define CONFIG_TQM5200_AC"      >>include/config.h ; \
-                 echo "... with 4 MB Flash, 128 MB SDRAM" ; \
-                 echo "... with Graphics Controller"; \
+       @[ -z "$(findstring TQM5200S,$@)" ] || \
+               { echo "#define CONFIG_TQM5200S"        >>include/config.h ; \
+                 echo "#define CONFIG_TQM5200_B"       >>include/config.h ; \
                }
-       @[ -z "$(findstring auto,$@)" ] || \
-               { echo "#define CONFIG_CS_AUTOCONF"     >>include/config.h ; \
-                 echo "... with automatic CS configuration" ; \
+       @[ -z "$(findstring HIGHBOOT,$@)" ] || \
+               { echo "TEXT_BASE = 0xFFF00000" >board/tqm5200/config.tmp ; \
                }
-       @./mkconfig -a TQM5200 ppc mpc5xxx tqm5200
+       @./mkconfig -n $@ -a TQM5200 ppc mpc5xxx tqm5200
 
 #########################################################################
 ## MPC8xx Systems
@@ -441,6 +485,9 @@ cogent_mpc8xx_config:       unconfig
 ELPT860_config:                unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx elpt860 LEOX
 
+EP88x_config:          unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx ep88x
+
 ESTEEM192E_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx esteem192e
 
@@ -614,8 +661,21 @@ NETTA2_config:             unconfig
                 }
        @./mkconfig -a $(call xtract_NETTA2,$@) ppc mpc8xx netta2
 
-NC650_config:  unconfig
-       @./mkconfig $(@:_config=) ppc mpc8xx nc650
+NC650_Rev1_config \
+NC650_Rev2_config \
+CP850_config:  unconfig
+       @ >include/config.h
+       @[ -z "$(findstring CP850,$@)" ] || \
+                { echo "#define CONFIG_CP850 1" >>include/config.h ; \
+                  echo "#define CONFIG_IDS852_REV2 1" >>include/config.h ; \
+                }
+       @[ -z "$(findstring Rev1,$@)" ] || \
+                { echo "#define CONFIG_IDS852_REV1 1" >>include/config.h ; \
+                }
+       @[ -z "$(findstring Rev2,$@)" ] || \
+                { echo "#define CONFIG_IDS852_REV2 1" >>include/config.h ; \
+                }
+       @./mkconfig -a NC650 ppc mpc8xx nc650
 
 NX823_config:          unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx nx823
@@ -685,6 +745,9 @@ RRvision_LCD_config:        unconfig
 SM850_config   :       unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx tqm8xx
 
+spc1920_config:
+       @./mkconfig $(@:_config=) ppc mpc8xx spc1920
+
 SPD823TS_config:       unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx spd8xx
 
@@ -721,7 +784,9 @@ TQM850M_config              \
 TQM855M_config         \
 TQM860M_config         \
 TQM862M_config         \
-TQM866M_config:                unconfig
+TQM866M_config         \
+TQM885D_config         \
+virtlab2_config:       unconfig
        @ >include/config.h
        @[ -z "$(findstring _LCD,$@)" ] || \
                { echo "#define CONFIG_LCD"             >>include/config.h ; \
@@ -883,6 +948,9 @@ p3p440_config:      unconfig
 PCI405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx pci405 esd
 
+pcs440ep_config:       unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx pcs440ep
+
 PIP405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx pip405 mpl
 
@@ -957,6 +1025,9 @@ yosemite_config:   unconfig
 yellowstone_config:    unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx yellowstone amcc
 
+yucca_config:  unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx yucca amcc
+
 #########################################################################
 ## MPC8220 Systems
 #########################################################################
@@ -1007,6 +1078,9 @@ eXalion_config: unconfig
 HIDDEN_DRAGON_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x hidden_dragon
 
+kvme080_config: unconfig
+       @./mkconfig $(@:_config=) ppc mpc824x kvme080 etin
+
 MOUSSE_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x mousse
 
@@ -1170,7 +1244,7 @@ PM828_config      \
 PM828_PCI_config       \
 PM828_ROMBOOT_config   \
 PM828_ROMBOOT_PCI_config:      unconfig
-       @if [ -z "$(findstring _PCI_,$@)" ] ; then \
+       @if [ "$(findstring _PCI_,$@)" ] ; then \
                echo "#define CONFIG_PCI"  >>include/config.h ; \
                echo "... with PCI enabled" ; \
        else \
@@ -1261,9 +1335,6 @@ VoVPN-GW_100MHz_config:           unconfig
 ZPC1900_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 zpc1900
 
-#========================================================================
-# M68K
-#========================================================================
 #########################################################################
 ## Coldfire
 #########################################################################
@@ -1271,6 +1342,19 @@ ZPC1900_config: unconfig
 cobra5272_config :             unconfig
        @./mkconfig $(@:_config=) m68k mcf52x2 cobra5272
 
+EB+MCF-EV123_config :          unconfig
+       @ >include/config.h
+       @echo "TEXT_BASE = 0xFFE00000"|tee board/BuS/EB+MCF-EV123/textbase.mk
+       @./mkconfig EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
+
+EB+MCF-EV123_internal_config : unconfig
+       @ >include/config.h
+       @echo "TEXT_BASE = 0xF0000000"|tee board/BuS/EB+MCF-EV123/textbase.mk
+       @./mkconfig EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
+
+M5271EVB_config :              unconfig
+       @./mkconfig $(@:_config=) m68k mcf52x2 m5271evb
+
 M5272C3_config :               unconfig
        @./mkconfig $(@:_config=) m68k mcf52x2 m5272c3
 
@@ -1280,6 +1364,9 @@ M5282EVB_config :         unconfig
 TASREG_config :                unconfig
        @./mkconfig $(@:_config=) m68k mcf52x2 tasreg esd
 
+r5200_config :         unconfig
+       @./mkconfig $(@:_config=) m68k mcf52x2 r5200
+
 #########################################################################
 ## MPC83xx Systems
 #########################################################################
@@ -1290,6 +1377,9 @@ MPC8349ADS_config:        unconfig
 TQM834x_config:        unconfig
        @./mkconfig $(@:_config=) ppc mpc83xx tqm834x
 
+MPC8349EMDS_config:    unconfig
+       @./mkconfig $(@:_config=) ppc mpc83xx mpc8349emds
+
 #########################################################################
 ## MPC85xx Systems
 #########################################################################
@@ -1376,6 +1466,14 @@ TQM8560_config:          unconfig
        echo "#define CFG_BOOTFILE \"bootfile=/tftpboot/tqm$${CTYPE}/uImage\0\"">>include/config.h
        @./mkconfig -a TQM85xx ppc mpc85xx tqm85xx
 
+#########################################################################
+## MPC86xx Systems
+#########################################################################
+
+MPC8641HPCN_config:    unconfig
+       @./mkconfig $(@:_config=) ppc mpc86xx mpc8641hpcn
+
+
 #########################################################################
 ## 74xx/7xx Systems
 #########################################################################
@@ -1412,6 +1510,9 @@ PCIPPC6_config: unconfig
 ZUMA_config:   unconfig
        @./mkconfig $(@:_config=) ppc 74xx_7xx evb64260
 
+ppmc7xx_config: unconfig
+       @./mkconfig $(@:_config=) ppc 74xx_7xx ppmc7xx
+
 #========================================================================
 # ARM
 #========================================================================
@@ -1511,7 +1612,7 @@ omap1510inn_config :      unconfig
        @./mkconfig $(@:_config=) arm arm925t omap1510inn
 
 omap5912osk_config :   unconfig
-       @./mkconfig $(@:_config=) arm arm926ejs omap5912osk
+       @./mkconfig $(@:_config=) arm arm926ejs omap5912osk NULL omap
 
 omap1610inn_config \
 omap1610inn_cs0boot_config \
@@ -1531,7 +1632,7 @@ omap1610h2_cs_autoboot_config:    unconfig
                echo "#define CONFIG_CS3_BOOT" >> ./include/config.h ; \
                echo "... configured for CS3 boot"; \
        fi;
-       @./mkconfig -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn
+       @./mkconfig -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn NULL omap
 
 omap730p2_config \
 omap730p2_cs0boot_config \
@@ -1543,7 +1644,10 @@ omap730p2_cs3boot_config :       unconfig
                echo "#define CONFIG_CS3_BOOT" >> ./include/config.h ; \
                echo "... configured for CS3 boot"; \
        fi;
-       @./mkconfig -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2
+       @./mkconfig -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2 NULL omap
+
+sbc2410x_config: unconfig
+       @./mkconfig $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
 
 scb9328_config :       unconfig
        @./mkconfig $(@:_config=) arm arm920t scb9328 NULL imx
@@ -1612,6 +1716,11 @@ cm4008_config    :       unconfig
 cm41xx_config  :       unconfig
        @./mkconfig $(@:_config=) arm arm920t cm41xx NULL ks8695
 
+gth2_config            :       unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_GTH2 1" >>include/config.h
+       @./mkconfig -a gth2 mips mips gth2
+
 #########################################################################
 ## S3C44B0 Systems
 #########################################################################
@@ -1663,12 +1772,21 @@ innokom_config  :       unconfig
 ixdp425_config :       unconfig
        @./mkconfig $(@:_config=) arm ixp ixdp425
 
+ixdpg425_config        :       unconfig
+       @./mkconfig $(@:_config=) arm ixp ixdp425
+
 lubbock_config :       unconfig
        @./mkconfig $(@:_config=) arm pxa lubbock
 
+pleb2_config   :       unconfig
+       @./mkconfig $(@:_config=) arm pxa pleb2
+
 logodl_config  :       unconfig
        @./mkconfig $(@:_config=) arm pxa logodl
 
+pdnb3_config   :       unconfig
+       @./mkconfig $(@:_config=) arm ixp pdnb3 prodrive
+
 pxa255_idp_config:     unconfig
        @./mkconfig $(@:_config=) arm pxa pxa255_idp
 
@@ -1849,6 +1967,15 @@ ADNPESC1_config: unconfig
 ## Nios-II
 #########################################################################
 
+EP1C20_config : unconfig
+       @./mkconfig  EP1C20 nios2 nios2 ep1c20 altera
+
+EP1S10_config : unconfig
+       @./mkconfig  EP1S10 nios2 nios2 ep1s10 altera
+
+EP1S40_config : unconfig
+       @./mkconfig  EP1S40 nios2 nios2 ep1s40 altera
+
 PK1C20_config : unconfig
        @./mkconfig  PK1C20 nios2 nios2 pk1c20 psyent
 
@@ -1902,6 +2029,7 @@ clean:
        rm -f board/netstar/*.srec board/netstar/*.bin
        rm -f board/trab/trab_fkt board/voiceblue/eeprom
        rm -f board/integratorap/u-boot.lds board/integratorcp/u-boot.lds
+       rm -f include/bmp_logo.h
 
 clobber:       clean
        find . -type f \( -name .depend \