include: reset: Change to use CONFIG_IS_ENABLED(DM_RESET)

[u-boot] / tools / env / Makefile

diff --git a/tools/env/Makefile b/tools/env/Makefile
index 40164f7a35fa95340017e9a608a31702fa4a22b7..4633e0e72ba294817bd472da4f4981beaae22363 100644 (file)
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -1,14 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2002-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
 
 # 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)
+override HOSTCC = $(CC)
 
 # Compile for a hosted environment on the target
 HOST_EXTRACFLAGS  = $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
@@ -23,9 +21,11 @@ endif
 always := fw_printenv
 hostprogs-y := fw_printenv
 
-fw_printenv-objs := fw_env.o fw_env_main.o \
+lib-y += fw_env.o \
        crc32.o ctype.o linux_string.o \
-       env_attr.o env_flags.o aes.o
+       env_attr.o env_flags.o
+
+fw_printenv-objs := fw_env_main.o $(lib-y)
 
 quiet_cmd_crosstools_strip = STRIP   $^
       cmd_crosstools_strip = $(STRIP) $^; touch $@