X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=tools%2Fenv%2FMakefile;h=38ad118d032fa65ee9de050b7f1ea13a29840e64;hb=fd58157dbbeca12fc2a81240b580329a6fb7effb;hp=14d131b7b8111af6714eae958f6a987861968735;hpb=8b485ba12b0defa0c4ed3559789250238f8331a8;p=karo-tx-uboot.git

diff --git a/tools/env/Makefile b/tools/env/Makefile
index 14d131b7b8..38ad118d03 100644
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -5,39 +5,34 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-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
+# fw_printenv is supposed to run on the target system, which means it should be
+# built with cross tools. Although it may look weird, we only replace "HOSTCC"
+# with "CC" here for the maximum code reuse of scripts/Makefile.host.
+HOSTCC = $(CC)
 
 # Compile for a hosted environment on the target
-HOSTCPPFLAGS  = -idirafter $(SRCTREE)/include \
-		-idirafter $(OBJTREE)/include2 \
-		-idirafter $(OBJTREE)/include \
-		-idirafter $(SRCTREE)/tools/env \
+HOST_EXTRACFLAGS  = $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
+		-idirafter $(srctree)/tools/env \
 		-DUSE_HOSTCC \
 		-DTEXT_BASE=$(TEXT_BASE)
 
 ifeq ($(MTD_VERSION),old)
-HOSTCPPFLAGS += -DMTD_OLD
+HOST_EXTRACFLAGS += -DMTD_OLD
 endif
 
-all:	$(obj)fw_printenv
-
-# Some files complain if compiled with -pedantic, use HOSTCFLAGS_NOPED
-$(obj)fw_printenv:	$(HOSTSRCS) $(HEADERS)
-	$(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $@ $(HOSTSRCS)
-	$(HOSTSTRIP) $@
+always := fw_printenv
+hostprogs-y := fw_printenv
 
-clean:
-	rm -f $(obj)fw_printenv
+lib-y += fw_env.o \
+	crc32.o ctype.o linux_string.o \
+	env_attr.o env_flags.o aes.o
 
-#########################################################################
+fw_printenv-objs := fw_env_main.o $(lib-y)
 
-include $(TOPDIR)/rules.mk
+quiet_cmd_crosstools_strip = STRIP   $^
+      cmd_crosstools_strip = $(STRIP) $^; touch $@
 
-sinclude $(obj).depend
+$(obj)/.strip: $(obj)/fw_printenv
+	$(call cmd,crosstools_strip)
 
-#########################################################################
+always += .strip