summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--src/soc/amd/common/block/psp/Kconfig6
-rw-r--r--src/southbridge/amd/pi/hudson/Kconfig1
-rw-r--r--util/amdfwtool/Makefile.mk4
4 files changed, 17 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 4a87d2f549..412d6a678a 100644
--- a/Makefile
+++ b/Makefile
@@ -141,6 +141,12 @@ NOCOMPILE:=
endif
endif
+# When building the "tools" target, the BUILD_ALL_TOOLS variable needs
+# to be set before reading the tools' Makefiles
+ifneq ($(filter tools, $(MAKECMDGOALS)), )
+BUILD_ALL_TOOLS:=1
+endif
+
$(xcompile): util/xcompile/xcompile
rm -f $@
$< $(XGCCPATH) > $@.tmp
diff --git a/src/soc/amd/common/block/psp/Kconfig b/src/soc/amd/common/block/psp/Kconfig
index a52ca0e9d7..5699e8c70a 100644
--- a/src/soc/amd/common/block/psp/Kconfig
+++ b/src/soc/amd/common/block/psp/Kconfig
@@ -162,3 +162,9 @@ config AMD_FWM_POSITION
default 0xe20000 if AMD_FWM_POSITION_E20000
default 0xf20000 if AMD_FWM_POSITION_F20000
default 0xfa0000 if AMD_FWM_POSITION_FA0000
+
+config USE_AMDFWTOOL
+ bool
+ default y if SOC_AMD_COMMON_BLOCK_PSP
+ help
+ Select this if AMDFWTOOL needs to be built
diff --git a/src/southbridge/amd/pi/hudson/Kconfig b/src/southbridge/amd/pi/hudson/Kconfig
index 4630df9cca..134b57546d 100644
--- a/src/southbridge/amd/pi/hudson/Kconfig
+++ b/src/southbridge/amd/pi/hudson/Kconfig
@@ -24,6 +24,7 @@ config SOUTHBRIDGE_SPECIFIC_OPTIONS
select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS_NON_SOC_CODEBASE
select SOC_AMD_COMMON_BLOCK_PCI_MMCONF
+ select USE_AMDFWTOOL
config EHCI_BAR
hex
diff --git a/util/amdfwtool/Makefile.mk b/util/amdfwtool/Makefile.mk
index 6a83cb9265..d0b01ac6dc 100644
--- a/util/amdfwtool/Makefile.mk
+++ b/util/amdfwtool/Makefile.mk
@@ -1,5 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
+ifneq ($(BUILD_ALL_TOOLS)$(CONFIG_USE_AMDFWTOOL),)
+
amdfwtoolobj = amdfwtool.o data_parse.o signed_psp.o handle_file.o
amdfwreadobj = amdfwread.o
@@ -25,3 +27,5 @@ $(objutil)/amdfwtool/amdfwtool: $(addprefix $(objutil)/amdfwtool/,$(amdfwtoolobj
$(objutil)/amdfwtool/amdfwread: $(addprefix $(objutil)/amdfwtool/,$(amdfwreadobj))
printf " AMDFWREAD\n"
$(HOSTCC) $(addprefix $(objutil)/amdfwtool/,$(amdfwreadobj)) $(LDFLAGS) -o $@
+
+endif # ifneq ($(BUILD_ALL_TOOLS)$(CONFIG_USE_AMDFWTOOL),)