diff options
| author | Fred Reitberger <reitbergerfred@gmail.com> | 2022-11-07 13:21:48 -0500 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2023-01-22 19:08:55 +0000 |
| commit | 8190840fdfd182596c6cd8f9db845315815ae19a (patch) | |
| tree | 5f372aae910ad0a323a05955b6310ccaeb84605b | |
| parent | 99945dcb8c18b533d975ceae0aa8ad3dffe8543f (diff) | |
soc/amd/*: Enable override of MAINBOARD_BLOBS_DIR
MAINBOARD_BLOBS_DIR is defined the same way by
picasso/cezanne/mendocino/phoenix/glinda and unused by stoneyridge, so
move it to a common area.
This makefile variable is currently only used to locate APCB blobs for
the different mainboards.
Add a Kconfig option to point to the APCB blobs directory. This allows
simple overriding to locations such as site-local.
TEST=Timeless builds
Signed-off-by: Fred Reitberger <reitbergerfred@gmail.com>
Change-Id: I0702fdb97fbc2c73d97994ab4d5161ff0f467518
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69410
Reviewed-by: Jason Glenesk <jason.glenesk@amd.corp-partner.google.com>
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/soc/amd/cezanne/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/soc/amd/common/Kconfig.common | 6 | ||||
| -rw-r--r-- | src/soc/amd/common/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/soc/amd/glinda/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/soc/amd/mendocino/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/soc/amd/phoenix/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/soc/amd/picasso/Makefile.inc | 2 |
7 files changed, 8 insertions, 13 deletions
diff --git a/src/soc/amd/cezanne/Makefile.inc b/src/soc/amd/cezanne/Makefile.inc index ee8428ebc5..5313e0d302 100644 --- a/src/soc/amd/cezanne/Makefile.inc +++ b/src/soc/amd/cezanne/Makefile.inc @@ -50,8 +50,6 @@ CPPFLAGS_common += -I$(src)/soc/amd/cezanne/include CPPFLAGS_common += -I$(src)/soc/amd/cezanne/acpi CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/cezanne -MAINBOARD_BLOBS_DIR:=$(top)/3rdparty/blobs/mainboard/$(MAINBOARDDIR) - # ROMSIG Normally At ROMBASE + 0x20000 # Overridden by CONFIG_AMD_FWM_POSITION_INDEX # +-----------+---------------+----------------+------------+ diff --git a/src/soc/amd/common/Kconfig.common b/src/soc/amd/common/Kconfig.common index 5a84f2fdda..e612158acc 100644 --- a/src/soc/amd/common/Kconfig.common +++ b/src/soc/amd/common/Kconfig.common @@ -10,4 +10,10 @@ source "src/soc/amd/common/fsp/Kconfig" source "src/soc/amd/common/pi/Kconfig" source "src/soc/amd/common/psp_verstage/Kconfig" +config APCB_BLOBS_DIR + string "Mainboard blobs path" + default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)" + help + The path to the APCB mainboard blobs + endif # SOC_AMD_COMMON diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc index f047a590bf..3130a0cc58 100644 --- a/src/soc/amd/common/Makefile.inc +++ b/src/soc/amd/common/Makefile.inc @@ -44,3 +44,5 @@ amdfwread-range-cmd = $(shell ( \ endif # ifeq ($(CONFIG_VBOOT_GSCVD),y) endif + +MAINBOARD_BLOBS_DIR := $(call strip_quotes, $(CONFIG_APCB_BLOBS_DIR)) diff --git a/src/soc/amd/glinda/Makefile.inc b/src/soc/amd/glinda/Makefile.inc index e65f92442c..891a68dadd 100644 --- a/src/soc/amd/glinda/Makefile.inc +++ b/src/soc/amd/glinda/Makefile.inc @@ -54,8 +54,6 @@ CPPFLAGS_common += -I$(src)/soc/amd/glinda/acpi CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/glinda CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/common -MAINBOARD_BLOBS_DIR:=$(top)/3rdparty/blobs/mainboard/$(MAINBOARDDIR) - # ROMSIG Normally At ROMBASE + 0x20000 # Overridden by CONFIG_AMD_FWM_POSITION_INDEX # +-----------+---------------+----------------+------------+ diff --git a/src/soc/amd/mendocino/Makefile.inc b/src/soc/amd/mendocino/Makefile.inc index 7628deed03..7d7033a563 100644 --- a/src/soc/amd/mendocino/Makefile.inc +++ b/src/soc/amd/mendocino/Makefile.inc @@ -52,11 +52,6 @@ CPPFLAGS_common += -I$(src)/soc/amd/mendocino/include CPPFLAGS_common += -I$(src)/soc/amd/mendocino/acpi CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/mendocino -# allow site-local Makefile to override blobs location -ifeq ($(MAINBOARD_BLOBS_DIR),) -MAINBOARD_BLOBS_DIR:=$(top)/3rdparty/blobs/mainboard/$(MAINBOARDDIR) -endif - # ROMSIG Normally At ROMBASE + 0x20000 # Overridden by CONFIG_AMD_FWM_POSITION_INDEX # +-----------+---------------+----------------+------------+ diff --git a/src/soc/amd/phoenix/Makefile.inc b/src/soc/amd/phoenix/Makefile.inc index f4223da50d..1c24243111 100644 --- a/src/soc/amd/phoenix/Makefile.inc +++ b/src/soc/amd/phoenix/Makefile.inc @@ -54,8 +54,6 @@ CPPFLAGS_common += -I$(src)/soc/amd/phoenix/acpi CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/phoenix CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/common -MAINBOARD_BLOBS_DIR:=$(top)/3rdparty/blobs/mainboard/$(MAINBOARDDIR) - # ROMSIG Normally At ROMBASE + 0x20000 # Overridden by CONFIG_AMD_FWM_POSITION_INDEX # +-----------+---------------+----------------+------------+ diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index cc073a7cfe..50fc62ca86 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -56,8 +56,6 @@ CPPFLAGS_common += -I$(src)/soc/amd/picasso/acpi CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/picasso CPPFLAGS_common += -I$(src)/vendorcode/amd/fsp/picasso/include -MAINBOARD_BLOBS_DIR:=$(top)/3rdparty/blobs/mainboard/$(MAINBOARDDIR) - # ROMSIG Normally At ROMBASE + 0x20000 # Overridden by CONFIG_AMD_FWM_POSITION_INDEX # +-----------+---------------+----------------+------------+ |