summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-22 17:21:24 +0200
committerWolfgang Denk <wd@denx.de>2008-04-22 17:21:24 +0200
commit58c5376ba67767ee684069d43e7f747a5d9ae8ed (patch)
treedfd19b2fb608c8ba238da53f3302c30d94a1e0ba /Makefile
parentdc7746d86d2a3dfe01ab9a70cb427f92adc303c7 (diff)
parent5d40d4430d9ebc8434c6f0798594836e1efa7a1e (diff)
downloadu-boot-imx-58c5376ba67767ee684069d43e7f747a5d9ae8ed.zip
u-boot-imx-58c5376ba67767ee684069d43e7f747a5d9ae8ed.tar.gz
u-boot-imx-58c5376ba67767ee684069d43e7f747a5d9ae8ed.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cb99636..94c21cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1187,10 +1187,13 @@ glacier_config: unconfig
tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
@$(MKCONFIG) -n $@ -a canyonlands ppc ppc4xx canyonlands amcc
-canyonlands_nand_config: unconfig
+canyonlands_nand_config \
+glacier_nand_config: unconfig
@mkdir -p $(obj)include $(obj)board/amcc/canyonlands
@mkdir -p $(obj)nand_spl/board/amcc/canyonlands
@echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
+ @echo "#define CONFIG_$$(echo $(subst ,,$(@:_nand_config=)) | \
+ tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
@$(MKCONFIG) -n $@ -a canyonlands ppc ppc4xx canyonlands amcc
@echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/canyonlands/config.tmp
@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk