summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <gaumless@gmail.com>2023-03-10 15:10:08 -0700
committerMartin L Roth <gaumless@gmail.com>2023-03-15 19:36:25 +0000
commit44217215e7978ea37a40cd8620d332e7c0858e65 (patch)
treecc6b07cb283247fa194b7dd6952b2ae0233b9c61
parentd729df03ede8e426033e7b41e3529ee6a92c6ab9 (diff)
soc/amd/common: Ignore * in PSP dependency generation
The regex getting rid of lines containing a '*' didn't match anything in any configs, so get rid of it. There's nothing in the amdfwtool dataparse.c file that would match it either. Signed-off-by: Martin Roth <gaumless@gmail.com> Change-Id: I05aaf46cfb479cebab9234a47574073335984a5f Reviewed-on: https://review.coreboot.org/c/coreboot/+/73669 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
-rw-r--r--src/soc/amd/common/Makefile.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc
index 86fe0514c5..66fbd2636c 100644
--- a/src/soc/amd/common/Makefile.inc
+++ b/src/soc/amd/common/Makefile.inc
@@ -18,15 +18,13 @@ endif
# Steps below to generate the dependency list
# 1a: Delete any line that starts with #, FIRMWARE_LOCATION, or SOC_NAME
-# 1b: Delete any line containing a *
-# 1c: Filter out lines containing MP2 or not, decided above.
-# 1d: Use awk to return only field 2, the filename
+# 1b: Filter out lines containing MP2 or not, decided above.
+# 1c: Use awk to return only field 2, the filename
# 2: Gather filenames with no path to add the firmware location later
# 3: Gather filenames with a path
# 4a: Add the firmware location to any files without a path to the dependencies
# 4b: add the lines containing a path to the dependencies
AMDFW_CFG_FILES = $(shell sed "/^$(POUND_SIGN)\|^FIRMWARE_LOCATION\|^SOC_NAME/d; \
- /*/d; \
$(REMOVE_MP2)" $(CONFIG_AMDFW_CONFIG_FILE) | \
awk '{print $$2}')
AMDFW_CFG_IN_FW_LOC = $(shell echo "$(AMDFW_CFG_FILES)" | tr ' ' '\n' | grep -v "/")