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

binaryPI: Define AGESA blob in CBFS as Kconfig string

Browse source 
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>
This commit is contained in:
Kyösti Mälkki 2017-05-27 20:53:29 +03:00
parent bf2d219996
commit 7104fe2618
9 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/northbridge/amd/pi/agesawrapper.c
View file

@ -413,7 +413,7 @@ const void *agesawrapper_locate_module (const CHAR8 name[8])
agesa = (void *)CONFIG_AGESA_BINARY_PI_LOCATION; agesa = (void *)CONFIG_AGESA_BINARY_PI_LOCATION;
file_size = 0x100000; file_size = 0x100000;
} else { } 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); CBFS_TYPE_RAW, &file_size);
} }

5
src/northbridge/amd/pi/agesawrapper.h
View file

@ -20,11 +20,6 @@
#include "Porting.h" #include "Porting.h"
#include "AGESA.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 { enum {
PICK_DMI, /* DMI Interface */ PICK_DMI, /* DMI Interface */
PICK_PSTATE, /* Acpi Pstate SSDT Table */ PICK_PSTATE, /* Acpi Pstate SSDT Table */

2
src/soc/amd/common/agesawrapper.c
View file

@ -403,7 +403,7 @@ const void *agesawrapper_locate_module (const CHAR8 name[8])
agesa = (void *)CONFIG_AGESA_BINARY_PI_LOCATION; agesa = (void *)CONFIG_AGESA_BINARY_PI_LOCATION;
file_size = 0x100000; file_size = 0x100000;
} else { } 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); CBFS_TYPE_RAW, &file_size);
} }

5
src/soc/amd/common/agesawrapper.h
View file

@ -20,11 +20,6 @@
#include <Porting.h> #include <Porting.h>
#include <AGESA.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 { enum {
PICK_DMI, /* DMI Interface */ PICK_DMI, /* DMI Interface */
PICK_PSTATE, /* Acpi Pstate SSDT Table */ PICK_PSTATE, /* Acpi Pstate SSDT Table */

2
src/vendorcode/amd/pi/00630F01/binaryPI/AGESA.c
View file

@ -50,8 +50,6 @@
#include <FchDef.h> #include <FchDef.h>
#include <FieldAccessors.h> #include <FieldAccessors.h>
#define CONFIG_CBFS_AGESA_NAME "AGESA"
AGESA_STATUS AGESA_STATUS
HeapAllocateBuffer ( HeapAllocateBuffer (
IN OUT VOID *AllocateHeapParams, IN OUT VOID *AllocateHeapParams,

3
src/vendorcode/amd/pi/00660F01/binaryPI/AGESA.c
View file

@ -52,9 +52,6 @@
#include <console/console.h> #include <console/console.h>
#include <commonlib/loglevel.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() // TODO These need to be replaced with calls to CreateStruct()
AGESA_STATUS AGESA_STATUS
HeapAllocateBuffer ( HeapAllocateBuffer (

3
src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c
View file

@ -52,9 +52,6 @@
#include <console/console.h> #include <console/console.h>
#include <commonlib/loglevel.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() // TODO These need to be replaced with calls to CreateStruct()
AGESA_STATUS AGESA_STATUS
HeapAllocateBuffer ( HeapAllocateBuffer (

4
src/vendorcode/amd/pi/Kconfig
View file

@ -53,6 +53,10 @@ config AGESA_BINARY_PI_FILE
help help
Specify the binary file to use for AMD platform initialization. Specify the binary file to use for AMD platform initialization.
config AGESA_CBFS_NAME
string
default "AGESA"
config AGESA_BINARY_PI_LOCATION config AGESA_BINARY_PI_LOCATION
hex "AGESA PI binary address in ROM" hex "AGESA PI binary address in ROM"
default 0xFFE00000 default 0xFFE00000

8
src/vendorcode/amd/pi/Makefile.inc
View file

@ -151,9 +151,9 @@ ramstage-libs += $(obj)/agesa/libagesa.a
####################################################################### #######################################################################
cbfs-files-$(CONFIG_CPU_AMD_AGESA_BINARY_PI) += AGESA cbfs-files-$(CONFIG_CPU_AMD_AGESA_BINARY_PI) += $(CONFIG_AGESA_CBFS_NAME)
AGESA-file := $(CONFIG_AGESA_BINARY_PI_FILE) $(CONFIG_AGESA_CBFS_NAME)-file := $(CONFIG_AGESA_BINARY_PI_FILE)
AGESA-type := raw $(CONFIG_AGESA_CBFS_NAME)-type := raw
AGESA-position := $(CONFIG_AGESA_BINARY_PI_LOCATION) $(CONFIG_AGESA_CBFS_NAME)-position := $(CONFIG_AGESA_BINARY_PI_LOCATION)
endif endif