update to 2015.04-rc1

[karo-tx-uboot.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 6e1ce79f2f45cd33cc3e99ca278a330adb0f75bd..75ab70563a59fd1c4f1bfac240626afa932d5593 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -52,7 +52,7 @@ HOSTCFLAGS_xway-swap-bytes.o := -pedantic
 hostprogs-y += mkenvimage
 mkenvimage-objs := mkenvimage.o os_support.o lib/crc32.o
 
 hostprogs-y += mkenvimage
 mkenvimage-objs := mkenvimage.o os_support.o lib/crc32.o
 

-hostprogs-y += dumpimage mkimage
+#hostprogs-y += dumpimage mkimage

 hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info fit_check_sign
 
 FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := common/image-sig.o
 hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info fit_check_sign
 
 FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := common/image-sig.o


@@ -205,6 +205,8 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \
                $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
                -I$(srctree)/lib/libfdt \
                -I$(srctree)/tools \
                $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
                -I$(srctree)/lib/libfdt \
                -I$(srctree)/tools \

+                -include $(srctree)/include/linux/kconfig.h \
+               -Wno-variadic-macros \

                -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
                -DUSE_HOSTCC \
                -D__KERNEL_STRICT_NAMES \
                -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
                -DUSE_HOSTCC \
                -D__KERNEL_STRICT_NAMES \