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

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index 9e6346fa3553b82d07a98dc73a7886b611449692..e427bc020fafa741378f824641ab2b906ffd0bb4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -246,7 +246,6 @@ LIBS += drivers/misc/libmisc.a
 LIBS += drivers/mmc/libmmc.a
 LIBS += drivers/mtd/libmtd.a
 LIBS += drivers/mtd/nand/libnand.a
-LIBS += drivers/mtd/nand_legacy/libnand_legacy.a
 LIBS += drivers/mtd/onenand/libonenand.a
 LIBS += drivers/mtd/ubi/libubi.a
 LIBS += drivers/mtd/spi/libspi_flash.a
@@ -428,7 +427,6 @@ TAG_SUBDIRS += drivers/misc
 TAG_SUBDIRS += drivers/mmc
 TAG_SUBDIRS += drivers/mtd
 TAG_SUBDIRS += drivers/mtd/nand
-TAG_SUBDIRS += drivers/mtd/nand_legacy
 TAG_SUBDIRS += drivers/mtd/onenand
 TAG_SUBDIRS += drivers/mtd/spi
 TAG_SUBDIRS += drivers/net
@@ -698,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" ; \