fw_env: fix building w/out a config.h

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

diff --git a/tools/env/Makefile b/tools/env/Makefile
index 0e798e09403168d67abc327432f39fcecd5c7b26..e6dc5f32fc659aff19ff63e08c4a4bc49389709b 100644 (file)
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 HOSTSRCS := $(SRCTREE)/lib/crc32.c  fw_env.c  fw_env_main.c
 HOSTSRCS += $(SRCTREE)/lib/ctype.c $(SRCTREE)/lib/linux_string.c
 HOSTSRCS += $(SRCTREE)/common/env_attr.c $(SRCTREE)/common/env_flags.c
-HEADERS        := fw_env.h $(OBJTREE)/include/config.h
+HEADERS        := fw_env.h
 
 # Compile for a hosted environment on the target
 HOSTCPPFLAGS  = -idirafter $(SRCTREE)/include \
@@ -36,6 +36,15 @@ HOSTCPPFLAGS  = -idirafter $(SRCTREE)/include \
                -DUSE_HOSTCC \
                -DTEXT_BASE=$(TEXT_BASE)
 
+# Pass CONFIG_xxx settings via the command line so that we can build w/out
+# a config.h file existing in the first place.  Useful for generic builds.
+CONFIG_VARS_TO_PASS = \
+       ENV_OVERWRITE \
+       OVERWRITE_ETHADDR_ONCE \
+       ETHADDR
+HOSTCPPFLAGS += \
+       $(foreach x,$(CONFIG_VARS_TO_PASS),$(if $(CONFIG_$(x)),-DCONFIG_$(x)=$(CONFIG_$(x))))
+
 ifeq ($(MTD_VERSION),old)
 HOSTCPPFLAGS += -DMTD_OLD
 endif