Remove unnecessary flash.c file.

[platform/kernel/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index beea5d2..acfa5bd 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
 
@@ -631,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
@@ -1187,7 +1208,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 \
@@ -1397,6 +1418,14 @@ TQM8560_config:          unconfig
        @./mkconfig -a TQM85xx ppc mpc85xx tqm85xx
 
 #########################################################################
+## MPC86xx Systems
+#########################################################################
+
+MPC8641HPCN_config:    unconfig
+       @./mkconfig $(@:_config=) ppc mpc86xx mpc8641hpcn
+
+
+#########################################################################
 ## 74xx/7xx Systems
 #########################################################################