summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
Diffstat (limited to 'payloads')
-rw-r--r--payloads/Makefile.inc2
-rw-r--r--payloads/external/.gitignore2
-rw-r--r--payloads/external/Makefile.inc50
-rw-r--r--payloads/external/edk2/Kconfig (renamed from payloads/external/tianocore/Kconfig)95
-rw-r--r--payloads/external/edk2/Kconfig.name (renamed from payloads/external/tianocore/Kconfig.name)6
-rw-r--r--payloads/external/edk2/Makefile (renamed from payloads/external/tianocore/Makefile)66
-rw-r--r--payloads/external/edk2/tools_def.txt (renamed from payloads/external/tianocore/tools_def.txt)2
7 files changed, 111 insertions, 112 deletions
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc
index 0102ea37d1..41e3f9fca3 100644
--- a/payloads/Makefile.inc
+++ b/payloads/Makefile.inc
@@ -24,7 +24,7 @@ payloads/external/U-Boot \
payloads/external/Memtest86Plus \
payloads/external/iPXE \
payloads/external/tint \
-payloads/external/tianocore \
+payloads/external/edk2 \
payloads/external/GRUB2 \
payloads/external/LinuxBoot \
payloads/external/Yabits \
diff --git a/payloads/external/.gitignore b/payloads/external/.gitignore
index 9aaa95c038..86ad3f1473 100644
--- a/payloads/external/.gitignore
+++ b/payloads/external/.gitignore
@@ -3,7 +3,7 @@ FILO/filo/
GRUB2/grub2/
LinuxBoot/linuxboot/
SeaBIOS/seabios/
-tianocore/tianocore/
+edk2/edk2/
tint/tint/
U-Boot/u-boot/
Memtest86Plus/memtest86plus/
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 1fca61770b..8b167ed784 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -152,35 +152,35 @@ payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(D
DEPTHCHARGE_REVISION_ID=$(CONFIG_DEPTHCHARGE_REVISION_ID) \
OVERRIDE_DEFCONFIG=$(CONFIG_LP_DEFCONFIG_OVERRIDE)
-# Tianocore
+# edk2
-$(obj)/UEFIPAYLOAD.fd tianocore: $(DOTCONFIG)
- $(MAKE) -C payloads/external/tianocore all \
+$(obj)/UEFIPAYLOAD.fd edk2: $(DOTCONFIG)
+ $(MAKE) -C payloads/external/edk2 all \
HOSTCC="$(HOSTCC)" \
CC="$(HOSTCC)" \
- CONFIG_TIANOCORE_REPOSITORY=$(CONFIG_TIANOCORE_REPOSITORY) \
- CONFIG_TIANOCORE_TAG_OR_REV=$(CONFIG_TIANOCORE_TAG_OR_REV) \
- CONFIG_TIANOCORE_UEFIPAYLOAD=$(CONFIG_TIANOCORE_UEFIPAYLOAD) \
- CONFIG_TIANOCORE_UPSTREAM=$(CONFIG_TIANOCORE_UPSTREAM) \
- CONFIG_TIANOCORE_CUSTOM=$(CONFIG_TIANOCORE_CUSTOM) \
- CONFIG_TIANOCORE_CUSTOM_BUILD_PARAMS=$(CONFIG_TIANOCORE_CUSTOM_BUILD_PARAMS) \
- CONFIG_TIANOCORE_DEBUG=$(CONFIG_TIANOCORE_DEBUG) \
- CONFIG_TIANOCORE_RELEASE=$(CONFIG_TIANOCORE_RELEASE) \
- CONFIG_TIANOCORE_ABOVE_4G_MEMORY=$(CONFIG_TIANOCORE_ABOVE_4G_MEMORY) \
- CONFIG_TIANOCORE_BOOTSPLASH_FILE=$(CONFIG_TIANOCORE_BOOTSPLASH_FILE) \
- CONFIG_TIANOCORE_BOOT_MANAGER_ESCAPE=$(CONFIG_TIANOCORE_BOOT_MANAGER_ESCAPE) \
- CONFIG_TIANOCORE_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) \
- CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \
- CONFIG_TIANOCORE_FOLLOW_BGRT_SPEC=$(CONFIG_TIANOCORE_FOLLOW_BGRT_SPEC) \
- CONFIG_TIANOCORE_FULL_SCREEN_SETUP=$(CONFIG_TIANOCORE_FULL_SCREEN_SETUP) \
- CONFIG_TIANOCORE_HAVE_EFI_SHELL=$(CONFIG_TIANOCORE_HAVE_EFI_SHELL) \
- CONFIG_TIANOCORE_PRIORITIZE_INTERNAL=$(CONFIG_TIANOCORE_PRIORITIZE_INTERNAL) \
- CONFIG_TIANOCORE_PS2_SUPPORT=$(CONFIG_TIANOCORE_PS2_SUPPORT) \
- CONFIG_TIANOCORE_SERIAL_SUPPORT=$(CONFIG_TIANOCORE_SERIAL_SUPPORT) \
- CONFIG_TIANOCORE_SD_MMC_TIMEOUT=$(CONFIG_TIANOCORE_SD_MMC_TIMEOUT) \
+ CONFIG_EDK2_REPOSITORY=$(CONFIG_EDK2_REPOSITORY) \
+ CONFIG_EDK2_TAG_OR_REV=$(CONFIG_EDK2_TAG_OR_REV) \
+ CONFIG_EDK2_UEFIPAYLOAD=$(CONFIG_EDK2_UEFIPAYLOAD) \
+ CONFIG_EDK2_UPSTREAM=$(CONFIG_EDK2_UPSTREAM) \
+ CONFIG_EDK2_CUSTOM=$(CONFIG_EDK2_CUSTOM) \
+ CONFIG_EDK2_CUSTOM_BUILD_PARAMS=$(CONFIG_EDK2_CUSTOM_BUILD_PARAMS) \
+ CONFIG_EDK2_DEBUG=$(CONFIG_EDK2_DEBUG) \
+ CONFIG_EDK2_RELEASE=$(CONFIG_EDK2_RELEASE) \
+ CONFIG_EDK2_ABOVE_4G_MEMORY=$(CONFIG_EDK2_ABOVE_4G_MEMORY) \
+ CONFIG_EDK2_BOOTSPLASH_FILE=$(CONFIG_EDK2_BOOTSPLASH_FILE) \
+ CONFIG_EDK2_BOOT_MANAGER_ESCAPE=$(CONFIG_EDK2_BOOT_MANAGER_ESCAPE) \
+ CONFIG_EDK2_BOOT_TIMEOUT=$(CONFIG_EDK2_BOOT_TIMEOUT) \
+ CONFIG_EDK2_CBMEM_LOGGING=$(CONFIG_EDK2_CBMEM_LOGGING) \
+ CONFIG_EDK2_FOLLOW_BGRT_SPEC=$(CONFIG_EDK2_FOLLOW_BGRT_SPEC) \
+ CONFIG_EDK2_FULL_SCREEN_SETUP=$(CONFIG_EDK2_FULL_SCREEN_SETUP) \
+ CONFIG_EDK2_HAVE_EFI_SHELL=$(CONFIG_EDK2_HAVE_EFI_SHELL) \
+ CONFIG_EDK2_PRIORITIZE_INTERNAL=$(CONFIG_EDK2_PRIORITIZE_INTERNAL) \
+ CONFIG_EDK2_PS2_SUPPORT=$(CONFIG_EDK2_PS2_SUPPORT) \
+ CONFIG_EDK2_SERIAL_SUPPORT=$(CONFIG_EDK2_SERIAL_SUPPORT) \
+ CONFIG_EDK2_SD_MMC_TIMEOUT=$(CONFIG_EDK2_SD_MMC_TIMEOUT) \
CONFIG_ECAM_MMCONF_BASE_ADDRESS=$(CONFIG_ECAM_MMCONF_BASE_ADDRESS) \
CONFIG_ECAM_MMCONF_LENGTH=$(CONFIG_ECAM_MMCONF_LENGTH) \
- CONFIG_SMMSTORE_V2=$(CONFIG_SMMSTORE_V2) \
+ CONFIG_SMMSTORE_V2=$(CONFIG_SMMSTORE_v2) \
GCC_CC_x86_32=$(GCC_CC_x86_32) \
GCC_CC_x86_64=$(GCC_CC_x86_64) \
GCC_CC_arm=$(GCC_CC_arm) \
@@ -190,7 +190,7 @@ $(obj)/UEFIPAYLOAD.fd tianocore: $(DOTCONFIG)
OBJCOPY_arm=$(OBJCOPY_arm) \
OBJCOPY_arm64=$(OBJCOPY_arm64) \
MFLAGS= MAKEFLAGS=
- mv payloads/external/tianocore/output/UEFIPAYLOAD.fd $@
+ mv payloads/external/edk2/output/UEFIPAYLOAD.fd $@
# FILO
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/edk2/Kconfig
index d1493d992f..ec6be897e3 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/edk2/Kconfig
@@ -1,77 +1,77 @@
-if PAYLOAD_TIANOCORE
+if PAYLOAD_EDK2
config PAYLOAD_FILE
- string "Tianocore binary"
+ string "edk2 binary"
default "$(obj)/UEFIPAYLOAD.fd"
help
The result of a UefiPayloadPkg build
choice
- prompt "Tianocore payload"
- default TIANOCORE_UEFIPAYLOAD
+ prompt "Tianocore's EDK II payload"
+ default EDK2_UEFIPAYLOAD
help
- Select which type of payload Tianocore will build (default is UefiPayload)
- UefiPayload: MrChromebox's customized fork of Tianocore which works on most
+ Select which type of payload edk2 will build (default is UefiPayload)
+ UefiPayload: MrChromebox's customized fork of edk2 which works on most
x86_64 devices
- Upstream: Use upstream Tianocore payload from https://github.com/tianocore/edk2
+ Upstream: Use upstream edk2 payload from https://github.com/tianocore/edk2
-config TIANOCORE_UEFIPAYLOAD
+config EDK2_UEFIPAYLOAD
bool "UEFIPayload"
help
- Select this option to build using MrChromebox's custom Tianocore fork,
+ Select this option to build using MrChromebox's custom edk2 fork,
which incorporates fixes/improvements from System 76's and 9elements' trees.
-config TIANOCORE_UPSTREAM
+config EDK2_UPSTREAM
bool "Upstream"
help
- Select this option if you want to use upstream EDK2 to build Tianocore.
+ Select this option if you want to use upstream edk2 to build edk2.
-config TIANOCORE_CUSTOM
+config EDK2_CUSTOM
bool "Custom"
help
Specify your own edk2 repository and branch to use.
endchoice
-config TIANOCORE_REPOSITORY
+config EDK2_REPOSITORY
string "URL to git repository for edk2"
- default "https://github.com/tianocore/edk2" if TIANOCORE_UPSTREAM
- default "https://github.com/mrchromebox/edk2" if TIANOCORE_UEFIPAYLOAD
+ default "https://github.com/tianocore/edk2" if EDK2_UPSTREAM
+ default "https://github.com/mrchromebox/edk2" if EDK2_UEFIPAYLOAD
help
coreboot supports an array of build options which can be found below. These options
will only have an effect if the relevant options exist in the target repository.
-config TIANOCORE_TAG_OR_REV
+config EDK2_TAG_OR_REV
string "Insert a commit's SHA-1 or a branch name"
- default "origin/uefipayload_202207" if TIANOCORE_UEFIPAYLOAD
- default "origin/master" if TIANOCORE_UPSTREAM
+ default "origin/uefipayload_202207" if EDK2_UEFIPAYLOAD
+ default "origin/master" if EDK2_UPSTREAM
help
The commit's SHA-1 or branch name of the revision to use. This must exist in
- TIANOCORE_REPOSITORY, and in the case of a branch name, prefixed with origin i.e.
+ EDK2_REPOSITORY, and in the case of a branch name, prefixed with origin i.e.
"origin/uefipayload_202202"
choice
- prompt "Tianocore build"
- default TIANOCORE_RELEASE
+ prompt "edk2 build"
+ default EDK2_RELEASE
help
Select whether to generate a debug or release build for
- Tianocore; default is to generate a release build.
+ edk2; default is to generate a release build.
-config TIANOCORE_DEBUG
- bool "Generate Tianocore debug build"
+config EDK2_DEBUG
+ bool "Generate edk2 debug build"
help
Generate a debug build.
-config TIANOCORE_RELEASE
- bool "Generate Tianocore release build"
+config EDK2_RELEASE
+ bool "Generate edk2 release build"
help
Generate a release build.
endchoice
-if TIANOCORE_UEFIPAYLOAD || TIANOCORE_CUSTOM || TIANOCORE_UPSTREAM
+if EDK2_UEFIPAYLOAD || EDK2_CUSTOM || EDK2_UPSTREAM
-config TIANOCORE_ABOVE_4G_MEMORY
+config EDK2_ABOVE_4G_MEMORY
bool "Enable above 4G memory"
default n
help
@@ -81,9 +81,8 @@ config TIANOCORE_ABOVE_4G_MEMORY
Disabling memory above 4G is useful for bootloaders that are not
fully 64-bit aware such as Qubes R4.0.4 bootloader.
-
-config TIANOCORE_BOOTSPLASH_FILE
- string "Tianocore Bootsplash path and filename"
+config EDK2_BOOTSPLASH_FILE
+ string "edk2 Bootsplash path and filename"
default "Documentation/coreboot_logo.bmp"
help
The path and filename of the file to use as graphical bootsplash
@@ -94,7 +93,7 @@ config TIANOCORE_BOOTSPLASH_FILE
can be found [here](https://imagemagick.org/script/formats.php).
The build process will automatically convert this to the format that
- EDK2 requires, which is an uncompressed BMP, in BMP3 format. It does
+ edk2 requires, which is an uncompressed BMP, in BMP3 format. It does
this using imagemagick (`convert splosh.bmp BMP3:splash.bmp`).
The newly formatted file will be the dimensions size as the original
@@ -117,14 +116,14 @@ config TIANOCORE_BOOTSPLASH_FILE
If an absolute path is not given, the path will assumed to be
relative to the coreboot root directory.
-config TIANOCORE_BOOT_MANAGER_ESCAPE
+config EDK2_BOOT_MANAGER_ESCAPE
bool "Use Escape key for Boot Manager"
default n
help
Use Escape as the hot-key to access the Boot Manager. This replaces
the default key of F2.
-config TIANOCORE_BOOT_TIMEOUT
+config EDK2_BOOT_TIMEOUT
int "Set the timeout for boot menu prompt"
default 2
help
@@ -132,15 +131,15 @@ config TIANOCORE_BOOT_TIMEOUT
For boards with an internal display, the default value of 2s is generally sufficient.
For boards with an external display, a value of 5s is generally sufficient.
-config TIANOCORE_CBMEM_LOGGING
- bool "Enable Tianocore logging to CBMEM"
+config EDK2_CBMEM_LOGGING
+ bool "Enable edk2 logging to CBMEM"
help
- Select this option if you want to enable Tianocore logging to CBMEM.
+ Select this option if you want to enable edk2 logging to CBMEM.
You may want to increase the default cbmem buffer size when selecting
this option, especially if using a debug (vs release) build.
Selecting this option will increase the payload size in CBFS by 0x10000.
-config TIANOCORE_FOLLOW_BGRT_SPEC
+config EDK2_FOLLOW_BGRT_SPEC
bool "Center logo 38.2% from the top of screen"
default n
help
@@ -148,7 +147,7 @@ config TIANOCORE_FOLLOW_BGRT_SPEC
the Boot Logo 38.2% will be vertically centered 38.2% from
the top of the display.
-config TIANOCORE_FULL_SCREEN_SETUP
+config EDK2_FULL_SCREEN_SETUP
bool "Use the full screen for the edk2 frontpage"
default y
help
@@ -156,34 +155,34 @@ config TIANOCORE_FULL_SCREEN_SETUP
(aka "Boot Menu"). With this option disable, it will be
limited to 640x480.
-config TIANOCORE_HAVE_EFI_SHELL
+config EDK2_HAVE_EFI_SHELL
bool "Include EFI Shell"
default y
help
Include the EFI shell Binary
-config TIANOCORE_PRIORITIZE_INTERNAL
+config EDK2_PRIORITIZE_INTERNAL
bool "Prioritize internal boot devices"
default y
help
Prioritize internal boot devices over external devices
-config TIANOCORE_PS2_SUPPORT
+config EDK2_PS2_SUPPORT
bool "Support PS/2 Keyboards"
default y
help
Include support for PS/2 keyboards
-config TIANOCORE_SD_MMC_TIMEOUT
+config EDK2_SD_MMC_TIMEOUT
int "Timeout in ms for initializing SD and eMMC devices"
default 10
help
The amount of time allowed to initialize the SD Card reader and/or eMMC drive.
Most only require 10ms, but certain readers can take 1s.
-config TIANOCORE_SERIAL_SUPPORT
+config EDK2_SERIAL_SUPPORT
bool "Support serial output"
- default y if TIANOCORE_DEBUG
+ default y if EDK2_DEBUG
default n
help
Enable serial port output in edk2. Serial output limits the performance of edk2's
@@ -191,9 +190,9 @@ config TIANOCORE_SERIAL_SUPPORT
endif
-config TIANOCORE_CUSTOM_BUILD_PARAMS
- string "TianoCore additional custom build parameters"
- default "-D VARIABLE_SUPPORT=SMMSTORE" if TIANOCORE_UEFIPAYLOAD && SMMSTORE_V2
+config EDK2_CUSTOM_BUILD_PARAMS
+ string "edk2 additional custom build parameters"
+ default "-D VARIABLE_SUPPORT=SMMSTORE" if EDK2_UEFIPAYLOAD && SMMSTORE_V2
help
edk2 has build options that are not modified by coreboot, and these can be
found in `UefiPayloadPkg/UefiPayloadPkg.dsc`. Forks may also support
diff --git a/payloads/external/tianocore/Kconfig.name b/payloads/external/edk2/Kconfig.name
index 771800cd14..3e07f8075a 100644
--- a/payloads/external/tianocore/Kconfig.name
+++ b/payloads/external/edk2/Kconfig.name
@@ -1,9 +1,9 @@
-config PAYLOAD_TIANOCORE
- bool "Tianocore payload"
+config PAYLOAD_EDK2
+ bool "edk2 payload"
depends on ARCH_X86 || ARCH_ARM64
help
Select this option if you want to build a coreboot image
- with a Tianocore payload. If you don't know what this is
+ with a edk2 payload. If you don't know what this is
about, just leave it enabled.
See https://coreboot.org/Payloads for more information.
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/edk2/Makefile
index dd6f6bd208..3dbb1b5412 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/edk2/Makefile
@@ -3,8 +3,8 @@
# force the shell to bash - the edksetup.sh script doesn't work with dash
export SHELL := env bash
-project_name = Tianocore
-project_dir = $(CURDIR)/$(word 3,$(subst /, ,$(CONFIG_TIANOCORE_REPOSITORY)))
+project_name = edk2
+project_dir = $(CURDIR)/$(word 3,$(subst /, ,$(CONFIG_EDK2_REPOSITORY)))
BUILD_STR = -a IA32 -a X64 -t COREBOOT
BUILD_STR += -p UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -17,27 +17,27 @@ BUILD_STR += -D BOOTLOADER=COREBOOT -q
# OPTION = DEFAULT_VALUE
#
# ABOVE_4G_MEMORY = TRUE
-ifneq ($(CONFIG_TIANOCORE_ABOVE_4G_MEMORY),y)
+ifneq ($(CONFIG_EDK2_ABOVE_4G_MEMORY),y)
BUILD_STR += -D ABOVE_4G_MEMORY=FALSE
endif
# BOOTSPLASH_IMAGE = FALSE
-ifneq ($(CONFIG_TIANOCORE_BOOTSPLASH_FILE),)
+ifneq ($(CONFIG_EDK2_BOOTSPLASH_FILE),)
BUILD_STR += -D BOOTSPLASH_IMAGE=TRUE
endif
# BOOT_MANAGER_ESCAPE = FALSE
-ifeq ($(CONFIG_TIANOCORE_BOOT_MANAGER_ESCAPE),y)
+ifeq ($(CONFIG_EDK2_BOOT_MANAGER_ESCAPE),y)
BUILD_STR += -D BOOT_MANAGER_ESCAPE=TRUE
endif
# BUILD_TARGETS = DEBUG
-ifeq ($(CONFIG_TIANOCORE_RELEASE),y)
+ifeq ($(CONFIG_EDK2_RELEASE),y)
BUILD_STR += -b RELEASE
endif
# DISABLE_SERIAL_TERMINAL = FALSE
-ifneq ($(CONFIG_TIANOCORE_SERIAL_SUPPORT),y)
+ifneq ($(CONFIG_EDK2_SERIAL_SUPPORT),y)
BUILD_STR += -D DISABLE_SERIAL_TERMINAL=TRUE
endif
# FOLLOW_BGRT_SPEC = FALSE
-ifeq ($(CONFIG_TIANOCORE_FOLLOW_BGRT_SPEC),y)
+ifeq ($(CONFIG_EDK2_FOLLOW_BGRT_SPEC),y)
BUILD_STR += -D FOLLOW_BGRT_SPEC=TRUE
endif
# PCIE_BASE_ADDRESS = 0
@@ -49,39 +49,39 @@ ifneq ($(CONFIG_ECAM_MMCONF_LENGTH),)
BUILD_STR += --pcd gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize=$(CONFIG_ECAM_MMCONF_LENGTH)
endif
# PRIORITIZE_INTERNAL = FALSE
-ifeq ($(CONFIG_TIANOCORE_PRIORITIZE_INTERNAL),y)
+ifeq ($(CONFIG_EDK2_PRIORITIZE_INTERNAL),y)
BUILD_STR += -D PRIORITIZE_INTERNAL=TRUE
endif
# PS2_KEYBOARD_ENABLE = FALSE
-ifeq ($(CONFIG_TIANOCORE_PS2_SUPPORT),y)
+ifeq ($(CONFIG_EDK2_PS2_SUPPORT),y)
BUILD_STR += -D PS2_KEYBOARD_ENABLE=TRUE
endif
# PLATFORM_BOOT_TIMEOUT = 3
-ifneq ($(CONFIG_TIANOCORE_BOOT_TIMEOUT),)
-BUILD_STR += -D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT)
+ifneq ($(CONFIG_EDK2_BOOT_TIMEOUT),)
+BUILD_STR += -D PLATFORM_BOOT_TIMEOUT=$(CONFIG_EDK2_BOOT_TIMEOUT)
endif
# SIO_BUS_ENABLE = FALSE
-ifeq ($(CONFIG_TIANOCORE_PS2_SUPPORT),y)
+ifeq ($(CONFIG_EDK2_PS2_SUPPORT),y)
BUILD_STR += -D SIO_BUS_ENABLE=TRUE
endif
# SHELL_TYPE = BUILD_SHELL
-ifneq ($(CONFIG_TIANOCORE_HAVE_EFI_SHELL),y)
+ifneq ($(CONFIG_EDK2_HAVE_EFI_SHELL),y)
BUILD_STR += -D SHELL_TYPE=NONE
endif
# USE_CBMEM_FOR_CONSOLE = FALSE
-ifeq ($(CONFIG_TIANOCORE_CBMEM_LOGGING),y)
+ifeq ($(CONFIG_EDK2_CBMEM_LOGGING),y)
BUILD_STR += -D USE_CBMEM_FOR_CONSOLE=TRUE
endif
# SD_MMC_TIMEOUT = 1000000
-ifneq ($(CONFIG_TIANOCORE_SD_MMC_TIMEOUT),)
-BUILD_STR += -D SD_MMC_TIMEOUT=$(shell echo $$(( $(CONFIG_TIANOCORE_SD_MMC_TIMEOUT) * 1000)) )
+ifneq ($(CONFIG_EDK2_SD_MMC_TIMEOUT),)
+BUILD_STR += -D SD_MMC_TIMEOUT=$(shell echo $$(( $(CONFIG_EDK2_SD_MMC_TIMEOUT) * 1000)) )
endif
#
# EDKII has the below PCDs that are relevant to coreboot:
#
# Allows EDKII to use the full framebuffer
-ifeq ($(CONFIG_TIANOCORE_FULL_SCREEN_SETUP),y)
+ifeq ($(CONFIG_EDK2_FULL_SCREEN_SETUP),y)
BUILD_STR += --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow=0
BUILD_STR += --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn=0
BUILD_STR += --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow=0
@@ -90,42 +90,42 @@ endif
bootloader = $(word 8,$(subst /, ,$(BUILD_STR)))
-ifneq ($(CONFIG_TIANOCORE_CUSTOM_BUILD_PARAMS),)
-BUILD_STR += $(CONFIG_TIANOCORE_CUSTOM_BUILD_PARAMS)
+ifneq ($(CONFIG_EDK2_CUSTOM_BUILD_PARAMS),)
+BUILD_STR += $(CONFIG_EDK2_CUSTOM_BUILD_PARAMS)
endif
all: clean build
$(project_dir):
- echo " Cloning $(project_name) from $(CONFIG_TIANOCORE_REPOSITORY)"
- git clone $(CONFIG_TIANOCORE_REPOSITORY) $(project_dir); \
+ echo " Cloning $(project_name) from $(CONFIG_EDK2_REPOSITORY)"
+ git clone $(CONFIG_EDK2_REPOSITORY) $(project_dir); \
cd $(project_dir);
update: $(project_dir)
if [ ! -d "$(project_dir)" ]; then \
- git clone $(CONFIG_TIANOCORE_REPOSITORY) $(project_dir); \
+ git clone $(CONFIG_EDK2_REPOSITORY) $(project_dir); \
fi
cd $(project_dir); \
- echo " Fetching new commits from $(CONFIG_TIANOCORE_REPOSITORY)"; \
+ echo " Fetching new commits from $(CONFIG_EDK2_REPOSITORY)"; \
git fetch origin 2>/dev/null; \
- if ! git rev-parse --verify -q $(CONFIG_TIANOCORE_TAG_OR_REV) >/dev/null; then \
- echo " $(CONFIG_TIANOCORE_TAG_OR_REV) is not a valid git reference"; \
+ if ! git rev-parse --verify -q $(CONFIG_EDK2_TAG_OR_REV) >/dev/null; then \
+ echo " $(CONFIG_EDK2_TAG_OR_REV) is not a valid git reference"; \
exit 1; \
fi; \
if git status --ignore-submodules=dirty | grep -q clean; then \
- echo " Checking out $(project_name) revision $(CONFIG_TIANOCORE_TAG_OR_REV)"; \
- git checkout --detach $(CONFIG_TIANOCORE_TAG_OR_REV) -f; \
+ echo " Checking out $(project_name) revision $(CONFIG_EDK2_TAG_OR_REV)"; \
+ git checkout --detach $(CONFIG_EDK2_TAG_OR_REV) -f; \
else \
echo " Working directory not clean; will not overwrite"; \
fi; \
git submodule update --init --checkout
logo: $(project_dir)
- case "$(CONFIG_TIANOCORE_BOOTSPLASH_FILE)" in \
+ case "$(CONFIG_EDK2_BOOTSPLASH_FILE)" in \
"") ;; \
- /*) convert -background None $(CONFIG_TIANOCORE_BOOTSPLASH_FILE) \
+ /*) convert -background None $(CONFIG_EDK2_BOOTSPLASH_FILE) \
BMP3:$(project_dir)/MdeModulePkg/Logo/Logo.bmp;; \
- *) convert -background None $(top)/$(CONFIG_TIANOCORE_BOOTSPLASH_FILE) \
+ *) convert -background None $(top)/$(CONFIG_EDK2_BOOTSPLASH_FILE) \
BMP3:$(project_dir)/MdeModulePkg/Logo/Logo.bmp;; \
esac \
@@ -152,8 +152,8 @@ checktools:
build: update logo checktools
echo " ##### $(project_name) Build Summary #####"
- echo " Repository: $(CONFIG_TIANOCORE_REPOSITORY)"
- echo " Branch: $(CONFIG_TIANOCORE_TAG_OR_REV)"
+ echo " Repository: $(CONFIG_EDK2_REPOSITORY)"
+ echo " Branch: $(CONFIG_EDK2_TAG_OR_REV)"
echo " $(BUILD_STR)" | \
sed 's/-/\n /g' | sort | sed \
-e 's/a /Architecture: /g' \
diff --git a/payloads/external/tianocore/tools_def.txt b/payloads/external/edk2/tools_def.txt
index fba9b09fa2..b9a67ebec9 100644
--- a/payloads/external/tianocore/tools_def.txt
+++ b/payloads/external/edk2/tools_def.txt
@@ -15,7 +15,7 @@
#
#The following has been adapted from the BaseTools/Conf/tools_def.template file
-#and is used to direct the Tianocore build to use coreboot's crossgcc toolchain
+#and is used to direct the edk2 build to use coreboot's crossgcc toolchain
#rather than the host machine's toolchain
DEFINE COREBOOT_IA32_PREFIX = ENV(GCC_CC_x86_32)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 16:03:29 +0000