summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-07 22:47:17 +0100
committerWolfgang Denk <wd@denx.de>2009-12-07 22:47:17 +0100
commit206c00f26f56af02686cb69bfe5c75e979063171 (patch)
tree4e637df34f87762a2e70649e88f52ac973df1f00 /Makefile
parent39ff7d5f4cc547a2034a8bfc2a5b5f4b62fd5c20 (diff)
parentf8450829f921cf10667af98a8d08edfa3d998f04 (diff)
downloadu-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.zip
u-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.tar.gz
u-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.tar.bz2
Merge branch 'master' into next
Conflicts: lib_generic/zlib.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b891b1b..f5a55c7 100644
--- a/Makefile
+++ b/Makefile
@@ -3266,6 +3266,7 @@ zylonite_config :
#########################################################################
apollon_config : unconfig
+ @mkdir -p $(obj)include
@echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
@$(MKCONFIG) $(@:_config=) arm arm1136 apollon NULL omap24xx
@echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk