diff options
| -rw-r--r-- | src/northbridge/amd/pi/agesawrapper.c | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/pi/agesawrapper.h | 5 | ||||
| -rw-r--r-- | src/soc/amd/common/agesawrapper.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/common/agesawrapper.h | 5 | ||||
| -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 |
9 files changed, 10 insertions, 24 deletions
diff --git a/src/northbridge/amd/pi/agesawrapper.c b/src/northbridge/amd/pi/agesawrapper.c index a1fbc1d96a..4fa353ed0c 100644 --- a/src/northbridge/amd/pi/agesawrapper.c +++ b/src/northbridge/amd/pi/agesawrapper.c @@ -413,7 +413,7 @@ const void *agesawrapper_locate_module (const CHAR8 name[8]) agesa = (void *)CONFIG_AGESA_BINARY_PI_LOCATION; file_size = 0x100000; } else { - agesa = cbfs_boot_map_with_leak((const char *)CONFIG_CBFS_AGESA_NAME, + agesa = cbfs_boot_map_with_leak((const char *)CONFIG_AGESA_CBFS_NAME, CBFS_TYPE_RAW, &file_size); } diff --git a/src/northbridge/amd/pi/agesawrapper.h b/src/northbridge/amd/pi/agesawrapper.h index b8d1f4a3bd..e2a3324b3a 100644 --- a/src/northbridge/amd/pi/agesawrapper.h +++ b/src/northbridge/amd/pi/agesawrapper.h @@ -20,11 +20,6 @@ #include "Porting.h" #include "AGESA.h" -/* TODO: Add a kconfig option to name the AGESA ROM file in CBFS */ -#ifndef CONFIG_CBFS_AGESA_NAME -#define CONFIG_CBFS_AGESA_NAME "AGESA" -#endif - enum { PICK_DMI, /* DMI Interface */ PICK_PSTATE, /* Acpi Pstate SSDT Table */ diff --git a/src/soc/amd/common/agesawrapper.c b/src/soc/amd/common/agesawrapper.c index 7735d24e94..3ad487169e 100644 --- a/src/soc/amd/common/agesawrapper.c +++ b/src/soc/amd/common/agesawrapper.c @@ -403,7 +403,7 @@ const void *agesawrapper_locate_module (const CHAR8 name[8]) agesa = (void *)CONFIG_AGESA_BINARY_PI_LOCATION; file_size = 0x100000; } else { - agesa = cbfs_boot_map_with_leak((const char *)CONFIG_CBFS_AGESA_NAME, + agesa = cbfs_boot_map_with_leak((const char *)CONFIG_AGESA_CBFS_NAME, CBFS_TYPE_RAW, &file_size); } diff --git a/src/soc/amd/common/agesawrapper.h b/src/soc/amd/common/agesawrapper.h index 03429fc7f2..97d52f7c10 100644 --- a/src/soc/amd/common/agesawrapper.h +++ b/src/soc/amd/common/agesawrapper.h @@ -20,11 +20,6 @@ #include <Porting.h> #include <AGESA.h> -/* TODO: Add a kconfig option to name the AGESA ROM file in CBFS */ -#ifndef CONFIG_CBFS_AGESA_NAME -#define CONFIG_CBFS_AGESA_NAME "AGESA" -#endif - enum { PICK_DMI, /* DMI Interface */ PICK_PSTATE, /* Acpi Pstate SSDT Table */ 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 |