GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Roth 2023-03-10 15:10:08 -07:00 committed by Martin L Roth
parent d729df03ed
commit 44217215e7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/soc/amd/common/Makefile.inc
View File

@ -18,15 +18,13 @@ endif
# Steps below to generate the dependency list # Steps below to generate the dependency list
# 1a: Delete any line that starts with #, FIRMWARE_LOCATION, or SOC_NAME # 1a: Delete any line that starts with #, FIRMWARE_LOCATION, or SOC_NAME
# 1b: Delete any line containing a * # 1b: Filter out lines containing MP2 or not, decided above.
# 1c: Filter out lines containing MP2 or not, decided above. # 1c: Use awk to return only field 2, the filename
# 1d: Use awk to return only field 2, the filename
# 2: Gather filenames with no path to add the firmware location later # 2: Gather filenames with no path to add the firmware location later
# 3: Gather filenames with a path # 3: Gather filenames with a path
# 4a: Add the firmware location to any files without a path to the dependencies # 4a: Add the firmware location to any files without a path to the dependencies
# 4b: add the lines containing 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; \ AMDFW_CFG_FILES = $(shell sed "/^$(POUND_SIGN)\|^FIRMWARE_LOCATION\|^SOC_NAME/d; \
/*/d; \
$(REMOVE_MP2)" $(CONFIG_AMDFW_CONFIG_FILE) | \ $(REMOVE_MP2)" $(CONFIG_AMDFW_CONFIG_FILE) | \
awk '{print $$2}') awk '{print $$2}')
AMDFW_CFG_IN_FW_LOC = $(shell echo "$(AMDFW_CFG_FILES)" | tr ' ' '\n' | grep -v "/") AMDFW_CFG_IN_FW_LOC = $(shell echo "$(AMDFW_CFG_FILES)" | tr ' ' '\n' | grep -v "/")