85xx: Socrates: Major code update.

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

diff --git a/Makefile b/Makefile
index 0f82e71..8d82ef5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -227,6 +227,7 @@ LIBS += drivers/mtd/nand_legacy/libnand_legacy.a
 LIBS += drivers/mtd/onenand/libonenand.a
 LIBS += drivers/mtd/spi/libspi_flash.a
 LIBS += drivers/net/libnet.a
+LIBS += drivers/net/phy/libphy.a
 LIBS += drivers/net/sk98lin/libsk98lin.a
 LIBS += drivers/pci/libpci.a
 LIBS += drivers/pcmcia/libpcmcia.a
@@ -2082,6 +2083,9 @@ MPC8313ERDB_NAND_66_config: unconfig
                echo "#define CONFIG_NAND_U_BOOT" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb freescale
+       @if [ "$(findstring _NAND_,$@)" ] ; then \
+               echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk ; \
+       fi ;
 
 MPC8315ERDB_config: unconfig
        @$(MKCONFIG) -a MPC8315ERDB ppc mpc83xx mpc8315erdb freescale
@@ -2495,7 +2499,7 @@ cp1026_config: unconfig
        @board/integratorcp/split_by_variant.sh $@
 
 davinci_dvevm_config : unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs dv-evm davinci davinci
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs dvevm davinci davinci
 
 davinci_schmoogie_config :     unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs schmoogie davinci davinci
@@ -2758,6 +2762,23 @@ mx31ads_config           : unconfig
 omap2420h4_config      : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx
 
+#########################################################################
+## ARM1176 Systems
+#########################################################################
+smdk6400_noUSB_config  \
+smdk6400_config        :       unconfig
+       @mkdir -p $(obj)include $(obj)board/samsung/smdk6400
+       @mkdir -p $(obj)nand_spl/board/samsung/smdk6400
+       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
+       @if [ -z "$(findstring smdk6400_noUSB_config,$@)" ]; then                       \
+               echo "RAM_TEXT = 0x57e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
+               $(MKCONFIG) $(@:_config=) arm arm1176 smdk6400 samsung s3c64xx;         \
+       else                                                                            \
+               echo "RAM_TEXT = 0xc7e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
+               $(MKCONFIG) $(@:_noUSB_config=) arm arm1176 smdk6400 samsung s3c64xx;   \
+       fi
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
+
 #========================================================================
 # i386
 #========================================================================
@@ -3006,6 +3027,14 @@ mimc200_config           :       unconfig
 #========================================================================
 
 #########################################################################
+## sh2 (Renesas SuperH)
+#########################################################################
+rsk7203_config: unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_RSK7203 1" >> include/config.h
+       @./mkconfig -a $(@:_config=) sh sh2 rsk7203
+
+#########################################################################
 ## sh3 (Renesas SuperH)
 #########################################################################
 
@@ -3041,17 +3070,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
 
 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
 
 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
+
+sh7785lcr_config  :   unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_SH7785LCR 1" >> include/config.h
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 sh7785lcr
+
+ap325rxa_config  :   unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_AP325RXA 1" > $(obj)include/config.h
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 ap325rxa
 
 #========================================================================
 # SPARC