summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-01 00:06:05 +0200
committerWolfgang Denk <wd@denx.de>2008-09-01 00:06:05 +0200
commita13b2d937941f6b525abfcfad96c034f94421188 (patch)
tree56e5bdaf62397b2f8cc2be9b17a035d9b059bf8a /Makefile
parente155c9e00b5f21a6de28479259c440ba71289d00 (diff)
parentd6e04258be8f2408845468d3cf722a4cf0433445 (diff)
downloadu-boot-imx-a13b2d937941f6b525abfcfad96c034f94421188.zip
u-boot-imx-a13b2d937941f6b525abfcfad96c034f94421188.tar.gz
u-boot-imx-a13b2d937941f6b525abfcfad96c034f94421188.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 18 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b185503..18b851d 100644
--- 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
#========================================================================