dm: Add basic tests

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 0281171ae83b3466f3616b284b0ba462d2346c45..c6d1afa1c99f9dbf8a1a98d29ca1abb8b0a3d93f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -489,8 +489,6 @@ endif
 # that (or fail if absent).  Otherwise, search for a linker script in a
 # standard location.
 
-LDSCRIPT_MAKEFILE_DIR = $(dir $(LDSCRIPT))
-
 ifndef LDSCRIPT
        #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
        ifdef CONFIG_SYS_LDSCRIPT
@@ -515,8 +513,6 @@ ifndef LDSCRIPT
        endif
        ifeq ($(wildcard $(LDSCRIPT)),)
                LDSCRIPT := $(TOPDIR)/arch/$(ARCH)/cpu/u-boot.lds
-               # We don't expect a Makefile here
-               LDSCRIPT_MAKEFILE_DIR =
        endif
 endif
 
@@ -595,6 +591,7 @@ libs-y += fs/
 libs-y += net/
 libs-y += disk/
 libs-y += drivers/
+libs-$(CONFIG_DM) += drivers/core/
 libs-y += drivers/dma/
 libs-y += drivers/gpio/
 libs-y += drivers/i2c/
@@ -629,6 +626,7 @@ libs-y += lib/libfdt/
 libs-$(CONFIG_API) += api/
 libs-$(CONFIG_HAS_POST) += post/
 libs-y += test/
+libs-y += test/dm/
 
 ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs vf610))
 libs-y += arch/$(ARCH)/imx-common/
@@ -712,6 +710,7 @@ ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin
 ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img
 ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin
 ALL-$(CONFIG_OF_SEPARATE) += u-boot.dtb u-boot-dtb.bin
+ALL-$(CONFIG_OF_HOSTFILE) += u-boot.dtb
 ifneq ($(CONFIG_SPL_TARGET),)
 ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%)
 endif
@@ -1067,6 +1066,13 @@ u-boot.lds: $(LDSCRIPT) prepare FORCE
 PHONY += nand_spl
 nand_spl: prepare
        $(Q)$(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
+       @echo >&2
+       @echo >&2 "==================== WARNING ====================="
+       @echo >&2 "nand_spl will not be included in v2014.07 release."
+       @echo >&2 "Please switch over to SPL."
+       @echo >&2 "Otherwise, this board will be removed."
+       @echo >&2 "=================================================="
+       @echo >&2
 
 nand_spl/u-boot-spl-16k.bin: nand_spl
        @: