diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-05-27 20:53:29 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-07-11 06:50:47 +0000 |
| commit | 7104fe261841ad40e11656becc6d8f54de53104b (patch) | |
| tree | ac5fbd3231481f209e18dbc9f9b0f992d756ad35 /src/vendorcode/amd/pi | |
| parent | bf2d219996123d1f44f66f91a210a54d52113e87 (diff) | |
| download | coreboot-7104fe261841ad40e11656becc6d8f54de53104b.tar.xz | |
binaryPI: Define AGESA blob in CBFS as Kconfig string
Change-Id: I0f78cb275ecad732f81c609564a0640f03d2559e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/19983
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marc Jones <marc@marcjonesconsulting.com>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Diffstat (limited to 'src/vendorcode/amd/pi')
| -rw-r--r-- | src/vendorcode/amd/pi/00630F01/binaryPI/AGESA.c | 2 | ||||
| -rw-r--r-- | src/vendorcode/amd/pi/00660F01/binaryPI/AGESA.c | 3 | ||||
| -rw-r--r-- | src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c | 3 | ||||
| -rw-r--r-- | src/vendorcode/amd/pi/Kconfig | 4 | ||||
| -rw-r--r-- | src/vendorcode/amd/pi/Makefile.inc | 8 |
5 files changed, 8 insertions, 12 deletions
diff --git a/src/vendorcode/amd/pi/00630F01/binaryPI/AGESA.c b/src/vendorcode/amd/pi/00630F01/binaryPI/AGESA.c index ce1b5d9df8..52cf3960c7 100644 --- a/src/vendorcode/amd/pi/00630F01/binaryPI/AGESA.c +++ b/src/vendorcode/amd/pi/00630F01/binaryPI/AGESA.c @@ -50,8 +50,6 @@ #include <FchDef.h> #include <FieldAccessors.h> -#define CONFIG_CBFS_AGESA_NAME "AGESA" - AGESA_STATUS HeapAllocateBuffer ( IN OUT VOID *AllocateHeapParams, diff --git a/src/vendorcode/amd/pi/00660F01/binaryPI/AGESA.c b/src/vendorcode/amd/pi/00660F01/binaryPI/AGESA.c index 66a8393a73..405a45075d 100644 --- a/src/vendorcode/amd/pi/00660F01/binaryPI/AGESA.c +++ b/src/vendorcode/amd/pi/00660F01/binaryPI/AGESA.c @@ -52,9 +52,6 @@ #include <console/console.h> #include <commonlib/loglevel.h> -// TODO Add a kconfig option to name the AGESA ROM file in CBFS -#define CONFIG_CBFS_AGESA_NAME "AGESA" - // TODO These need to be replaced with calls to CreateStruct() AGESA_STATUS HeapAllocateBuffer ( diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c index 66a8393a73..405a45075d 100644 --- a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c +++ b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c @@ -52,9 +52,6 @@ #include <console/console.h> #include <commonlib/loglevel.h> -// TODO Add a kconfig option to name the AGESA ROM file in CBFS -#define CONFIG_CBFS_AGESA_NAME "AGESA" - // TODO These need to be replaced with calls to CreateStruct() AGESA_STATUS HeapAllocateBuffer ( diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig index 971e3b1f89..5f7eee8cda 100644 --- a/src/vendorcode/amd/pi/Kconfig +++ b/src/vendorcode/amd/pi/Kconfig @@ -53,6 +53,10 @@ config AGESA_BINARY_PI_FILE help Specify the binary file to use for AMD platform initialization. +config AGESA_CBFS_NAME + string + default "AGESA" + config AGESA_BINARY_PI_LOCATION hex "AGESA PI binary address in ROM" default 0xFFE00000 diff --git a/src/vendorcode/amd/pi/Makefile.inc b/src/vendorcode/amd/pi/Makefile.inc index e46f80fa5c..dd2a65d8d6 100644 --- a/src/vendorcode/amd/pi/Makefile.inc +++ b/src/vendorcode/amd/pi/Makefile.inc @@ -151,9 +151,9 @@ ramstage-libs += $(obj)/agesa/libagesa.a ####################################################################### -cbfs-files-$(CONFIG_CPU_AMD_AGESA_BINARY_PI) += AGESA -AGESA-file := $(CONFIG_AGESA_BINARY_PI_FILE) -AGESA-type := raw -AGESA-position := $(CONFIG_AGESA_BINARY_PI_LOCATION) +cbfs-files-$(CONFIG_CPU_AMD_AGESA_BINARY_PI) += $(CONFIG_AGESA_CBFS_NAME) +$(CONFIG_AGESA_CBFS_NAME)-file := $(CONFIG_AGESA_BINARY_PI_FILE) +$(CONFIG_AGESA_CBFS_NAME)-type := raw +$(CONFIG_AGESA_CBFS_NAME)-position := $(CONFIG_AGESA_BINARY_PI_LOCATION) endif |