aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Rhodes <sean@starlabs.systems>2022-07-13 10:11:44 +0100
committerMartin L Roth <gaumless@gmail.com>2022-08-13 16:35:18 +0000
commit38c99b56599d2b11d68c844e9f2adda9050b8efa (patch)
treede43b09f7bac0e010ac6c77f0bf7edfdc09ae981 /src
parent8f7f4bf87a238dd046a376804b9e53162092f601 (diff)
payloads/tianocore: Rename TianoCore to edk2
coreboot uses TianoCore interchangeably with EDK II, and whilst the meaning is generally clear, it's not the payload it uses. EDK II is commonly written as edk2. coreboot builds edk2 directly from the edk2 repository. Whilst it can build some components from edk2-platforms, the target is still edk2. [1] tianocore.org - "Welcome to TianoCore, the community supporting" [2] tianocore.org - "EDK II is a modern, feature-rich, cross-platform firmware development environment for the UEFI and UEFI Platform Initialization (PI) specifications." Signed-off-by: Sean Rhodes <sean@starlabs.systems> Change-Id: I4de125d92ae38ff8dfd0c4c06806c2d2921945ab Reviewed-on: https://review.coreboot.org/c/coreboot/+/65820 Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/device/Kconfig2
-rw-r--r--src/drivers/intel/fsp2_0/ppi/Kconfig4
-rw-r--r--src/drivers/intel/fsp2_0/ppi/mp_service1.c2
-rw-r--r--src/drivers/intel/fsp2_0/ppi/mp_service2.c2
-rw-r--r--src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c2
-rw-r--r--src/drivers/intel/fsp2_0/util.c2
-rw-r--r--src/drivers/smmstore/Kconfig4
-rw-r--r--src/drivers/smmstore/store.c2
-rw-r--r--src/drivers/tpm/Kconfig2
-rw-r--r--src/include/smmstore.h2
-rw-r--r--src/mainboard/google/beltino/Kconfig2
-rw-r--r--src/mainboard/google/fizz/Kconfig2
-rw-r--r--src/mainboard/google/hatch/Kconfig2
-rw-r--r--src/mainboard/google/jecht/Kconfig2
-rw-r--r--src/mainboard/starlabs/lite/Kconfig2
-rw-r--r--src/mainboard/starlabs/starbook/Kconfig2
16 files changed, 18 insertions, 18 deletions
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 12ba4ea6a9..6f4a24ef1a 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -420,7 +420,7 @@ endif # FRAMEBUFFER_SET_VESA_MODE
config WANT_LINEAR_FRAMEBUFFER
bool
default y if CHROMEOS
- default y if PAYLOAD_TIANOCORE
+ default y if PAYLOAD_EDK2
default y if COREDOOM_SECONDARY_PAYLOAD
choice
diff --git a/src/drivers/intel/fsp2_0/ppi/Kconfig b/src/drivers/intel/fsp2_0/ppi/Kconfig
index 7cbc87f7ab..d45114681e 100644
--- a/src/drivers/intel/fsp2_0/ppi/Kconfig
+++ b/src/drivers/intel/fsp2_0/ppi/Kconfig
@@ -14,7 +14,7 @@ config MP_SERVICES_PPI_V1
select MP_SERVICES_PPI
help
This option provides EFI_PEI_MP_SERVICES_PPI structure definitions
- along with all APIs as per EDK2 specification.
+ along with all APIs as per edk2 specification.
config MP_SERVICES_PPI_V2
bool
@@ -22,7 +22,7 @@ config MP_SERVICES_PPI_V2
select MP_SERVICES_PPI
help
This option provides EDKII_PEI_MP_SERVICES2_PPI structure definitions
- along with all APIs as per EDK2 specification. MP services2 PPI is slight
+ along with all APIs as per edk2 specification. MP services2 PPI is slight
modification over MP services1 PPIs. A new API StartupAllCPUs have been
added to allow running a task on BSP and all APs. Also the EFI_PEI_SERVICES
parameter has been removed from all MP PPI APIs.
diff --git a/src/drivers/intel/fsp2_0/ppi/mp_service1.c b/src/drivers/intel/fsp2_0/ppi/mp_service1.c
index bbc78a0c75..879a8e881a 100644
--- a/src/drivers/intel/fsp2_0/ppi/mp_service1.c
+++ b/src/drivers/intel/fsp2_0/ppi/mp_service1.c
@@ -58,7 +58,7 @@ static efi_return_status_t mps1_identify_processor(const
return mp_identify_processor(processor_number);
}
-/* EDK2 UEFIPKG Open Source MP Service PPI to be installed */
+/* edk2 UEFIPKG Open Source MP Service PPI to be installed */
static efi_pei_mp_services_ppi mp_service1_ppi = {
mps1_get_number_of_processors,
diff --git a/src/drivers/intel/fsp2_0/ppi/mp_service2.c b/src/drivers/intel/fsp2_0/ppi/mp_service2.c
index c7d4764e29..fd91b46d4a 100644
--- a/src/drivers/intel/fsp2_0/ppi/mp_service2.c
+++ b/src/drivers/intel/fsp2_0/ppi/mp_service2.c
@@ -67,7 +67,7 @@ static efi_return_status_t mps2_identify_processor(
return mp_identify_processor(processor_number);
}
-/* EDK2 UEFIPKG Open Source MP Services 2 PPI to be installed */
+/* edk2 UEFIPKG Open Source MP Services 2 PPI to be installed */
static efi_pei_mp_services_ppi mp_service2_ppi = {
mps2_get_number_of_processors,
diff --git a/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c b/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
index 53d91822b8..66bbc2f085 100644
--- a/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
+++ b/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
@@ -96,7 +96,7 @@ efi_return_status_t mp_startup_all_cpus(efi_ap_procedure procedure,
/*
* Run on APs Serially
*
- * FIXME: As per MP service specification, EDK2 is allowed to specify the mode
+ * FIXME: As per MP service specification, edk2 is allowed to specify the mode
* in which a 'func' routine should be executed on APs (i.e. execute serially
* or concurrently).
*
diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c
index 629f331f29..1dedb6587f 100644
--- a/src/drivers/intel/fsp2_0/util.c
+++ b/src/drivers/intel/fsp2_0/util.c
@@ -33,7 +33,7 @@ static bool looks_like_fsp_header(struct fsp_header *hdr)
return false;
}
- /* It is possible to build FSP with any version of EDK2 which could have introduced new
+ /* It is possible to build FSP with any version of edk2 which could have introduced new
fields in FSP_INFO_HEADER. The new fields will be ignored based on the reported FSP
version. This check ensures that the reported header length is at least what the
reported FSP version requires so that we do not access any out-of-bound bytes. */
diff --git a/src/drivers/smmstore/Kconfig b/src/drivers/smmstore/Kconfig
index 93b3f00262..62aa3aaca8 100644
--- a/src/drivers/smmstore/Kconfig
+++ b/src/drivers/smmstore/Kconfig
@@ -3,13 +3,13 @@
config SMMSTORE
bool "Support for flash based, SMM mediated data store"
depends on BOOT_DEVICE_SUPPORTS_WRITES && HAVE_SMI_HANDLER
- default y if PAYLOAD_TIANOCORE
+ default y if PAYLOAD_EDK2
select SPI_FLASH_SMM if BOOT_DEVICE_SPI_FLASH_RW_NOMMAP
config SMMSTORE_V2
bool "Use version 2 of SMMSTORE API"
depends on SMMSTORE
- default y if PAYLOAD_TIANOCORE
+ default y if PAYLOAD_EDK2
default n
help
Version 2 of SMMSTORE allows secure communication with SMM and
diff --git a/src/drivers/smmstore/store.c b/src/drivers/smmstore/store.c
index 482a045abf..96cb761e40 100644
--- a/src/drivers/smmstore/store.c
+++ b/src/drivers/smmstore/store.c
@@ -311,7 +311,7 @@ int smmstore_get_info(struct smmstore_params_info *out)
out->block_size = SMM_BLOCK_SIZE;
out->num_blocks = region_device_sz(&store) / SMM_BLOCK_SIZE;
- /* FIXME: Broken EDK2 always assumes memory mapped Firmware Block Volumes */
+ /* FIXME: Broken edk2 always assumes memory mapped Firmware Block Volumes */
out->mmap_addr = (uintptr_t)rdev_mmap_full(&store);
printk(BIOS_DEBUG, "smm store: %d # blocks with size 0x%x\n",
diff --git a/src/drivers/tpm/Kconfig b/src/drivers/tpm/Kconfig
index 735cfeebb8..c3538cf395 100644
--- a/src/drivers/tpm/Kconfig
+++ b/src/drivers/tpm/Kconfig
@@ -12,7 +12,7 @@ config TPM_PPI
depends on TPM
depends on HAVE_ACPI_TABLES
depends on !CHROMEOS
- default y if PAYLOAD_TIANOCORE
+ default y if PAYLOAD_EDK2
help
This driver automatically generates ACPI tables for the Physical
Presence Interface defined by the TCG. If not activated only a stub
diff --git a/src/include/smmstore.h b/src/include/smmstore.h
index 2c37ca39b9..dfd9336c4d 100644
--- a/src/include/smmstore.h
+++ b/src/include/smmstore.h
@@ -53,7 +53,7 @@ struct smmstore_params_init {
/*
* Returns the number of blocks the SMMSTORE supports and their size.
- * For EDK2 this should be at least two blocks with 64 KiB each.
+ * For edk2 this should be at least two blocks with 64 KiB each.
* The mmap_addr is set the memory mapped physical address of the SMMSTORE.
*/
struct smmstore_params_info {
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig
index 5afb3ea144..a2c435b244 100644
--- a/src/mainboard/google/beltino/Kconfig
+++ b/src/mainboard/google/beltino/Kconfig
@@ -70,7 +70,7 @@ config ENABLE_DDR_2X_REFRESH
config PCIEXP_AER
def_bool n
-config TIANOCORE_BOOT_TIMEOUT
+config EDK2_BOOT_TIMEOUT
int
default 5
diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index 92c6abf05e..8b7811c1a6 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -100,7 +100,7 @@ config UART_FOR_CONSOLE
config USE_PM_ACPI_TIMER
default n
-config TIANOCORE_BOOT_TIMEOUT
+config EDK2_BOOT_TIMEOUT
int
default 5
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index 712ed06e7c..2d8ee15766 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -285,7 +285,7 @@ config VBOOT
config USE_PM_ACPI_TIMER
default n
-config TIANOCORE_BOOT_TIMEOUT
+config EDK2_BOOT_TIMEOUT
int
default 5 if BOARD_GOOGLE_BASEBOARD_PUFF
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index e011df7aa0..c882bc7a78 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -53,7 +53,7 @@ config MAINBOARD_SMBIOS_MANUFACTURER
config PCIEXP_AER
def_bool n
-config TIANOCORE_BOOT_TIMEOUT
+config EDK2_BOOT_TIMEOUT
int
default 5
diff --git a/src/mainboard/starlabs/lite/Kconfig b/src/mainboard/starlabs/lite/Kconfig
index c80020fd9a..a2bd7b30bf 100644
--- a/src/mainboard/starlabs/lite/Kconfig
+++ b/src/mainboard/starlabs/lite/Kconfig
@@ -66,7 +66,7 @@ config TRACKPAD_INTERRUPT
default 0x1 if BOARD_STARLABS_LITE_GLK
default 0x0 if BOARD_STARLABS_LITE_GLKR
-config TIANOCORE_BOOTSPLASH_FILE
+config EDK2_BOOTSPLASH_FILE
string
default "3rdparty/blobs/mainboard/starlabs/Logo.bmp"
diff --git a/src/mainboard/starlabs/starbook/Kconfig b/src/mainboard/starlabs/starbook/Kconfig
index be2d339eb2..fa6c601027 100644
--- a/src/mainboard/starlabs/starbook/Kconfig
+++ b/src/mainboard/starlabs/starbook/Kconfig
@@ -113,7 +113,7 @@ config ME_BIN_PATH
string
default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/intel_me.bin"
-config TIANOCORE_BOOTSPLASH_FILE
+config EDK2_BOOTSPLASH_FILE
string
default "3rdparty/blobs/mainboard/starlabs/Logo.bmp"