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

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index 7abca87c869a783697eaa10138e49311429f5ed0..e427bc020fafa741378f824641ab2b906ffd0bb4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -481,6 +481,7 @@ $(obj)include/autoconf.mk: $(obj)include/config.h
        mv $@.tmp $@
 
 sinclude $(obj)include/autoconf.mk.dep
+sinclude $(obj)include/autoconf.mk
 
 #########################################################################
 else   # !config.mk
@@ -695,7 +696,7 @@ o2dnt_config:       unconfig
 
 pcm030_config \
 pcm030_LOWBOOT_config: unconfig
-       @ >include/config.h
+       @ >$(obj)include/config.h
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
                { echo "TEXT_BASE = 0xFF000000" >$(obj)board/phytec/pcm030/config.tmp ; \
                  echo "... with LOWBOOT configuration" ; \