env: Drop CONFIG_ENV_IS_IN_DATAFLASH

[u-boot] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 086c533eff0f019d433ffba529d4baf878fd0717..5db2a542252a8a695fb75077fdb7a76270f8ec8c 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -21,7 +21,6 @@ subdir-$(HOST_TOOLS_ALL) += gdb
 
 # Merge all the different vars for envcrc into one
 ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y
-ENVCRC-$(CONFIG_ENV_IS_IN_DATAFLASH) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y
@@ -131,14 +130,14 @@ fit_check_sign-objs   := $(dumpimage-mkimage-objs) fit_check_sign.o
 # all three files in $(obj)/tools: _libfdt.so, libfdt.py and libfdt_wrap.c
 # The latter is a temporary file which we could actually remove.
 tools/_libfdt.so: $(LIBFDT_SRCS) $(LIBFDT_SWIG)
-       cp $(LIBFDT_SWIG) tools/.
-       unset CC; \
+       $(Q)cp $(LIBFDT_SWIG) tools/.
+       $(Q)unset CC; \
        unset CROSS_COMPILE; \
        LDFLAGS="$(HOSTLDFLAGS)" CFLAGS= VERSION="u-boot-$(UBOOTVERSION)" \
                CPPFLAGS="$(_hostc_flags)" OBJDIR=tools \
                SOURCES="$(LIBFDT_SRCS) tools/libfdt.i" \
                SWIG_OPTS="-I$(srctree)/lib/libfdt -I$(srctree)/lib" \
-               $(PYTHON) $(libfdt_tree)/pylibfdt/setup.py build_ext \
+               $(PYTHON) $(libfdt_tree)/pylibfdt/setup.py --quiet build_ext \
                        --build-lib tools
 
 ifneq ($(CONFIG_MX23)$(CONFIG_MX28),)
@@ -175,7 +174,7 @@ HOSTCFLAGS_rsa-sign.o += -Wno-deprecated-declarations
 endif
 endif
 
-HOSTCFLAGS_fit_image.o += -DMKIMAGE_DTC=\"$(DTC)\"
+HOSTCFLAGS_fit_image.o += -DMKIMAGE_DTC=\"$(CONFIG_MKIMAGE_DTC_PATH)\"
 
 HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)
 HOSTLOADLIBES_fit_info := $(HOSTLOADLIBES_mkimage)