<p>Patrick Georgi has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22570">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/crossgcc: Install a template for the edk2 build system<br><br>Add a CBSDK tool set template that can be used in edk2 simply by<br>appending $prefix/share/edk2config/tools_def.txt to Conf/tools_def.txt.<br>After that, build -t CBSDK uses the coreboot compilers, providing a more<br>predictable compiler choice.<br><br>Change-Id: I76b38c928b831ee6f31450aa0ad59b4f906f394d<br>Signed-off-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M util/crossgcc/buildgcc<br>A util/crossgcc/edk2tools.txt<br>2 files changed, 190 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/22570/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc<br>index 2f8a9f4..780d87a 100755<br>--- a/util/crossgcc/buildgcc<br>+++ b/util/crossgcc/buildgcc<br>@@ -1236,6 +1236,11 @@<br> rm -f "$DESTDIR$TARGETDIR/share/$PROGNAME-*"<br> cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSSGCC_COMMIT"<br> <br>+# Adding edk2 tools template<br>+mkdir -p "$DESTDIR$TARGETDIR/share/edk2config"<br>+sed -e "s,@@PREFIX@@,$TARGETDIR,g" edk2tools.txt > "$DESTDIR$TARGETDIR/share/edk2config/tools_def.txt"<br>+printf "Copied EDK2 tools template ... ${green}ok${NC}\n"<br>+<br> cleanup<br> <br> printf "\n${green}You can now run $NAME from $TARGETDIR.${NC}\n"<br>diff --git a/util/crossgcc/edk2tools.txt b/util/crossgcc/edk2tools.txt<br>new file mode 100644<br>index 0000000..8420c14<br>--- /dev/null<br>+++ b/util/crossgcc/edk2tools.txt<br>@@ -0,0 +1,185 @@<br>+####################################################################################<br>+#<br>+# COREBOOT is spun off from the GCC5 template<br>+#<br>+####################################################################################<br>+<br>+DEFINE COREBOOT_IA32_PREFIX = @@PREFIX@@/i386-elf-<br>+DEFINE COREBOOT_X64_PREFIX = @@PREFIX@@/x86_64-elf-<br>+DEFINE COREBOOT_ARM_PREFIX = @@PREFIX@@/arm-eabi-<br>+DEFINE COREBOOT_AARCH64_PREFIX = @@PREFIX@@/arch64-elf-<br>+<br>+DEFINE COREBOOT_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS)<br>+DEFINE COREBOOT_X64_CC_FLAGS = DEF(GCC5_X64_CC_FLAGS)<br>+DEFINE COREBOOT_IA32_X64_DLINK_COMMON = DEF(GCC5_IA32_X64_DLINK_COMMON)<br>+DEFINE COREBOOT_IA32_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS)<br>+DEFINE COREBOOT_IA32_X64_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS)<br>+DEFINE COREBOOT_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS)<br>+DEFINE COREBOOT_X64_DLINK_FLAGS = DEF(GCC5_X64_DLINK_FLAGS)<br>+DEFINE COREBOOT_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS)<br>+DEFINE COREBOOT_ASM_FLAGS = DEF(GCC5_ASM_FLAGS)<br>+DEFINE COREBOOT_ARM_ASM_FLAGS = DEF(GCC5_ARM_ASM_FLAGS)<br>+DEFINE COREBOOT_AARCH64_ASM_FLAGS = DEF(GCC5_AARCH64_ASM_FLAGS)<br>+DEFINE COREBOOT_ARM_CC_FLAGS = DEF(GCC5_ARM_CC_FLAGS)<br>+DEFINE COREBOOT_ARM_CC_XIPFLAGS = DEF(GCC5_ARM_CC_XIPFLAGS)<br>+DEFINE COREBOOT_AARCH64_CC_FLAGS = DEF(GCC5_AARCH64_CC_FLAGS)<br>+DEFINE COREBOOT_AARCH64_CC_XIPFLAGS = DEF(GCC5_AARCH64_CC_XIPFLAGS)<br>+DEFINE COREBOOT_ARM_DLINK_FLAGS = DEF(GCC5_ARM_DLINK_FLAGS)<br>+DEFINE COREBOOT_ARM_DLINK2_FLAGS = DEF(GCC5_ARM_DLINK2_FLAGS)<br>+DEFINE COREBOOT_AARCH64_DLINK_FLAGS = DEF(GCC5_AARCH64_DLINK_FLAGS)<br>+DEFINE COREBOOT_AARCH64_DLINK2_FLAGS = DEF(GCC5_AARCH64_DLINK2_FLAGS)<br>+DEFINE COREBOOT_ARM_ASLDLINK_FLAGS = DEF(GCC5_ARM_ASLDLINK_FLAGS)<br>+DEFINE COREBOOT_AARCH64_ASLDLINK_FLAGS = DEF(GCC5_AARCH64_ASLDLINK_FLAGS)<br>+<br>+####################################################################################<br>+#<br>+# GCC 5 - This configuration is used to compile under Linux to produce<br>+# PE/COFF binaries using GCC 5<br>+#<br>+####################################################################################<br>+*_COREBOOT_*_*_FAMILY = GCC<br>+<br>+*_COREBOOT_*_MAKE_PATH = make<br>+*_COREBOOT_*_*_DLL = ENV(COREBOOT_DLL)<br>+*_COREBOOT_*_ASL_PATH = DEF(UNIX_IASL_BIN)<br>+<br>+*_COREBOOT_*_PP_FLAGS = DEF(GCC_PP_FLAGS)<br>+*_COREBOOT_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS)<br>+*_COREBOOT_*_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS)<br>+*_COREBOOT_*_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS)<br>+*_COREBOOT_*_APP_FLAGS =<br>+*_COREBOOT_*_ASL_FLAGS = DEF(IASL_FLAGS)<br>+*_COREBOOT_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)<br>+<br>+##################<br>+# COREBOOT IA32 definitions<br>+##################<br>+*_COREBOOT_IA32_OBJCOPY_PATH = DEF(COREBOOT_IA32_PREFIX)objcopy<br>+*_COREBOOT_IA32_CC_PATH = DEF(COREBOOT_IA32_PREFIX)gcc<br>+*_COREBOOT_IA32_SLINK_PATH = DEF(COREBOOT_IA32_PREFIX)gcc-ar<br>+*_COREBOOT_IA32_DLINK_PATH = DEF(COREBOOT_IA32_PREFIX)gcc<br>+*_COREBOOT_IA32_ASLDLINK_PATH = DEF(COREBOOT_IA32_PREFIX)gcc<br>+*_COREBOOT_IA32_ASM_PATH = DEF(COREBOOT_IA32_PREFIX)gcc<br>+*_COREBOOT_IA32_PP_PATH = DEF(COREBOOT_IA32_PREFIX)gcc<br>+*_COREBOOT_IA32_VFRPP_PATH = DEF(COREBOOT_IA32_PREFIX)gcc<br>+*_COREBOOT_IA32_ASLCC_PATH = DEF(COREBOOT_IA32_PREFIX)gcc<br>+*_COREBOOT_IA32_ASLPP_PATH = DEF(COREBOOT_IA32_PREFIX)gcc<br>+*_COREBOOT_IA32_RC_PATH = DEF(COREBOOT_IA32_PREFIX)objcopy<br>+<br>+*_COREBOOT_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto<br>+*_COREBOOT_IA32_ASLDLINK_FLAGS = DEF(COREBOOT_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386<br>+*_COREBOOT_IA32_ASM_FLAGS = DEF(COREBOOT_ASM_FLAGS) -m32 -march=i386<br>+*_COREBOOT_IA32_DLINK2_FLAGS = DEF(COREBOOT_IA32_DLINK2_FLAGS)<br>+*_COREBOOT_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)<br>+*_COREBOOT_IA32_OBJCOPY_FLAGS =<br>+*_COREBOOT_IA32_NASM_FLAGS = -f elf32<br>+<br>+ DEBUG_COREBOOT_IA32_CC_FLAGS = DEF(COREBOOT_IA32_CC_FLAGS) -flto -Os<br>+ DEBUG_COREBOOT_IA32_DLINK_FLAGS = DEF(COREBOOT_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386<br>+<br>+RELEASE_COREBOOT_IA32_CC_FLAGS = DEF(COREBOOT_IA32_CC_FLAGS) -flto -Os -Wno-unused-but-set-variable<br>+RELEASE_COREBOOT_IA32_DLINK_FLAGS = DEF(COREBOOT_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386<br>+<br>+ NOOPT_COREBOOT_IA32_CC_FLAGS = DEF(COREBOOT_IA32_CC_FLAGS) -O0<br>+ NOOPT_COREBOOT_IA32_DLINK_FLAGS = DEF(COREBOOT_IA32_X64_DLINK_FLAGS) -Wl,-m,elf_i386,--oformat=elf32-i386 -O0<br>+<br>+##################<br>+# COREBOOT X64 definitions<br>+##################<br>+*_COREBOOT_X64_OBJCOPY_PATH = DEF(COREBOOT_X64_PREFIX)objcopy<br>+*_COREBOOT_X64_CC_PATH = DEF(COREBOOT_X64_PREFIX)gcc<br>+*_COREBOOT_X64_SLINK_PATH = DEF(COREBOOT_X64_PREFIX)gcc-ar<br>+*_COREBOOT_X64_DLINK_PATH = DEF(COREBOOT_X64_PREFIX)gcc<br>+*_COREBOOT_X64_ASLDLINK_PATH = DEF(COREBOOT_X64_PREFIX)gcc<br>+*_COREBOOT_X64_ASM_PATH = DEF(COREBOOT_X64_PREFIX)gcc<br>+*_COREBOOT_X64_PP_PATH = DEF(COREBOOT_X64_PREFIX)gcc<br>+*_COREBOOT_X64_VFRPP_PATH = DEF(COREBOOT_X64_PREFIX)gcc<br>+*_COREBOOT_X64_ASLCC_PATH = DEF(COREBOOT_X64_PREFIX)gcc<br>+*_COREBOOT_X64_ASLPP_PATH = DEF(COREBOOT_X64_PREFIX)gcc<br>+*_COREBOOT_X64_RC_PATH = DEF(COREBOOT_X64_PREFIX)objcopy<br>+<br>+*_COREBOOT_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto<br>+*_COREBOOT_X64_ASLDLINK_FLAGS = DEF(COREBOOT_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64<br>+*_COREBOOT_X64_ASM_FLAGS = DEF(COREBOOT_ASM_FLAGS) -m64<br>+*_COREBOOT_X64_DLINK2_FLAGS = DEF(COREBOOT_X64_DLINK2_FLAGS)<br>+*_COREBOOT_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)<br>+*_COREBOOT_X64_OBJCOPY_FLAGS =<br>+*_COREBOOT_X64_NASM_FLAGS = -f elf64<br>+<br>+ DEBUG_COREBOOT_X64_CC_FLAGS = DEF(COREBOOT_X64_CC_FLAGS) -flto -DUSING_LTO -Os<br>+ DEBUG_COREBOOT_X64_DLINK_FLAGS = DEF(COREBOOT_X64_DLINK_FLAGS) -flto -Os<br>+<br>+RELEASE_COREBOOT_X64_CC_FLAGS = DEF(COREBOOT_X64_CC_FLAGS) -flto -DUSING_LTO -Os -Wno-unused-but-set-variable<br>+RELEASE_COREBOOT_X64_DLINK_FLAGS = DEF(COREBOOT_X64_DLINK_FLAGS) -flto -Os<br>+<br>+ NOOPT_COREBOOT_X64_CC_FLAGS = DEF(COREBOOT_X64_CC_FLAGS) -O0<br>+ NOOPT_COREBOOT_X64_DLINK_FLAGS = DEF(COREBOOT_X64_DLINK_FLAGS) -O0<br>+<br>+##################<br>+# COREBOOT ARM definitions<br>+##################<br>+*_COREBOOT_ARM_CC_PATH = ENV(COREBOOT_ARM_PREFIX)gcc<br>+*_COREBOOT_ARM_SLINK_PATH = ENV(COREBOOT_ARM_PREFIX)gcc-ar<br>+*_COREBOOT_ARM_DLINK_PATH = ENV(COREBOOT_ARM_PREFIX)gcc<br>+*_COREBOOT_ARM_ASLDLINK_PATH = ENV(COREBOOT_ARM_PREFIX)gcc<br>+*_COREBOOT_ARM_ASM_PATH = ENV(COREBOOT_ARM_PREFIX)gcc<br>+*_COREBOOT_ARM_PP_PATH = ENV(COREBOOT_ARM_PREFIX)gcc<br>+*_COREBOOT_ARM_VFRPP_PATH = ENV(COREBOOT_ARM_PREFIX)gcc<br>+*_COREBOOT_ARM_ASLCC_PATH = ENV(COREBOOT_ARM_PREFIX)gcc<br>+*_COREBOOT_ARM_ASLPP_PATH = ENV(COREBOOT_ARM_PREFIX)gcc<br>+*_COREBOOT_ARM_RC_PATH = ENV(COREBOOT_ARM_PREFIX)objcopy<br>+<br>+*_COREBOOT_ARM_ARCHCC_FLAGS = -mthumb<br>+*_COREBOOT_ARM_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS)<br>+*_COREBOOT_ARM_ASLDLINK_FLAGS = DEF(COREBOOT_ARM_ASLDLINK_FLAGS)<br>+*_COREBOOT_ARM_ASM_FLAGS = DEF(COREBOOT_ARM_ASM_FLAGS)<br>+*_COREBOOT_ARM_DLINK2_FLAGS = DEF(COREBOOT_ARM_DLINK2_FLAGS)<br>+*_COREBOOT_ARM_PLATFORM_FLAGS = -march=armv7-a<br>+*_COREBOOT_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)<br>+*_COREBOOT_ARM_RC_FLAGS = DEF(GCC_ARM_RC_FLAGS)<br>+*_COREBOOT_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)<br>+*_COREBOOT_ARM_CC_XIPFLAGS = DEF(COREBOOT_ARM_CC_XIPFLAGS)<br>+<br>+ DEBUG_COREBOOT_ARM_CC_FLAGS = DEF(COREBOOT_ARM_CC_FLAGS) -O0<br>+ DEBUG_COREBOOT_ARM_DLINK_FLAGS = DEF(COREBOOT_ARM_DLINK_FLAGS)<br>+<br>+RELEASE_COREBOOT_ARM_CC_FLAGS = DEF(COREBOOT_ARM_CC_FLAGS) -flto -Wno-unused-but-set-variable<br>+RELEASE_COREBOOT_ARM_DLINK_FLAGS = DEF(COREBOOT_ARM_DLINK_FLAGS) -flto -Os -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=-pass-through=-llto-arm<br>+<br>+ NOOPT_COREBOOT_ARM_CC_FLAGS = DEF(COREBOOT_ARM_CC_FLAGS) -O0<br>+ NOOPT_COREBOOT_ARM_DLINK_FLAGS = DEF(COREBOOT_ARM_DLINK_FLAGS) -O0<br>+<br>+##################<br>+# COREBOOT AARCH64 definitions<br>+##################<br>+*_COREBOOT_AARCH64_CC_PATH = ENV(COREBOOT_AARCH64_PREFIX)gcc<br>+*_COREBOOT_AARCH64_SLINK_PATH = ENV(COREBOOT_AARCH64_PREFIX)gcc-ar<br>+*_COREBOOT_AARCH64_DLINK_PATH = ENV(COREBOOT_AARCH64_PREFIX)gcc<br>+*_COREBOOT_AARCH64_ASLDLINK_PATH = ENV(COREBOOT_AARCH64_PREFIX)gcc<br>+*_COREBOOT_AARCH64_ASM_PATH = ENV(COREBOOT_AARCH64_PREFIX)gcc<br>+*_COREBOOT_AARCH64_PP_PATH = ENV(COREBOOT_AARCH64_PREFIX)gcc<br>+*_COREBOOT_AARCH64_VFRPP_PATH = ENV(COREBOOT_AARCH64_PREFIX)gcc<br>+*_COREBOOT_AARCH64_ASLCC_PATH = ENV(COREBOOT_AARCH64_PREFIX)gcc<br>+*_COREBOOT_AARCH64_ASLPP_PATH = ENV(COREBOOT_AARCH64_PREFIX)gcc<br>+*_COREBOOT_AARCH64_RC_PATH = ENV(COREBOOT_AARCH64_PREFIX)objcopy<br>+<br>+*_COREBOOT_AARCH64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS)<br>+*_COREBOOT_AARCH64_ASLDLINK_FLAGS = DEF(COREBOOT_AARCH64_ASLDLINK_FLAGS)<br>+*_COREBOOT_AARCH64_ASM_FLAGS = DEF(COREBOOT_AARCH64_ASM_FLAGS)<br>+*_COREBOOT_AARCH64_DLINK2_FLAGS = DEF(COREBOOT_AARCH64_DLINK2_FLAGS)<br>+*_COREBOOT_AARCH64_PLATFORM_FLAGS =<br>+*_COREBOOT_AARCH64_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)<br>+*_COREBOOT_AARCH64_RC_FLAGS = DEF(GCC_AARCH64_RC_FLAGS)<br>+*_COREBOOT_AARCH64_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)<br>+*_COREBOOT_AARCH64_CC_XIPFLAGS = DEF(COREBOOT_AARCH64_CC_XIPFLAGS)<br>+<br>+ DEBUG_COREBOOT_AARCH64_CC_FLAGS = DEF(COREBOOT_AARCH64_CC_FLAGS) -O0 -mcmodel=small<br>+ DEBUG_COREBOOT_AARCH64_DLINK_FLAGS = DEF(COREBOOT_AARCH64_DLINK_FLAGS) -z common-page-size=0x1000<br>+ DEBUG_COREBOOT_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20<br>+<br>+RELEASE_COREBOOT_AARCH64_CC_FLAGS = DEF(COREBOOT_AARCH64_CC_FLAGS) -flto -Wno-unused-but-set-variable -mcmodel=tiny -fomit-frame-pointer<br>+RELEASE_COREBOOT_AARCH64_DLINK_FLAGS = DEF(COREBOOT_AARCH64_DLINK_FLAGS) -flto -Os -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin-opt=-pass-through=-llto-aarch64 -Wno-lto-type-mismatch<br>+<br>+ NOOPT_COREBOOT_AARCH64_CC_FLAGS = DEF(COREBOOT_AARCH64_CC_FLAGS) -O0 -mcmodel=small<br>+ NOOPT_COREBOOT_AARCH64_DLINK_FLAGS = DEF(COREBOOT_AARCH64_DLINK_FLAGS) -z common-page-size=0x1000 -O0<br>+ NOOPT_COREBOOT_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 -O0<br></pre><p>To view, visit <a href="https://review.coreboot.org/22570">change 22570</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22570"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I76b38c928b831ee6f31450aa0ad59b4f906f394d </div>
<div style="display:none"> Gerrit-Change-Number: 22570 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Georgi <pgeorgi@google.com> </div>