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

[oweals/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index b1855039a12d3ddbe72950da5aefca1ddf04ed63..18b851d4464b0576ee9b685f34688ccfb78ac191 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2495,7 +2495,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 +2758,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
 #========================================================================