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

[oweals/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 65c457e00e5925abc7cfe067d37e3584980c692b..7de890e74c6868499c1bf0489d8d889e235cce2a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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,11 +311,25 @@ 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
        @ >include/config.h
        @[ -z "$(findstring lowboot_,$@)" ] || \
-               { echo "TEXT_BASE = 0xFE000000" >board/mcc200/config.tmp ; \
+               { echo "TEXT_BASE = 0xFC000000" >board/mcc200/config.tmp ; \
                  echo "... with lowboot configuration" ; \
                }
        @./mkconfig mcc200 ppc mpc5xxx mcc200
@@ -441,6 +463,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 +639,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
@@ -721,7 +759,8 @@ TQM850M_config              \
 TQM855M_config         \
 TQM860M_config         \
 TQM862M_config         \
-TQM866M_config:                unconfig
+TQM866M_config         \
+virtlab2_config:       unconfig
        @ >include/config.h
        @[ -z "$(findstring _LCD,$@)" ] || \
                { echo "#define CONFIG_LCD"             >>include/config.h ; \
@@ -883,6 +922,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
 
@@ -1170,7 +1212,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 \
@@ -1280,6 +1322,12 @@ M5282EVB_config :                unconfig
 TASREG_config :                unconfig
        @./mkconfig $(@:_config=) m68k mcf52x2 tasreg esd
 
+r5200_config :         unconfig
+       @./mkconfig $(@:_config=) m68k mcf52x2 r5200
+
+M5271EVB_config :              unconfig
+       @./mkconfig $(@:_config=) m68k mcf52x2 m5271evb
+
 #########################################################################
 ## MPC83xx Systems
 #########################################################################
@@ -1290,6 +1338,9 @@ MPC8349ADS_config:        unconfig
 TQM834x_config:        unconfig
        @./mkconfig $(@:_config=) ppc mpc83xx tqm834x
 
+MPC8349EMDS_config:    unconfig
+       @./mkconfig $(@:_config=) ppc mpc83xx mpc8349emds
+
 #########################################################################
 ## MPC85xx Systems
 #########################################################################
@@ -1376,6 +1427,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
 #########################################################################
@@ -1511,7 +1570,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 +1590,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 +1602,7 @@ 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
 
 scb9328_config :       unconfig
        @./mkconfig $(@:_config=) arm arm920t scb9328 NULL imx
@@ -1663,12 +1722,18 @@ 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
 
 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