From 6562cf213d0dd0602fb414a574e6a37962590be0 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Tue, 24 Jan 2023 14:12:34 -0700
Subject: [PATCH] coreboot: Rebase on 4.19

Rebase on coreboot/coreboot@decbf7b4d975.

The following boards have been upstreamed:

- darp8
- galp6

Signed-off-by: Tim Crawford <tcrawford@system76.com>
---
 CHANGELOG.md           | 4 ++++
 coreboot               | 2 +-
 scripts/_build/edk2.sh | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aedea13..dd516ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ Changes are identified by the date of the released firmware including them. If
 you are running System76 Open Firmware, opening the boot menu will show this
 date followed by an underscore and a short git revision.
 
+## unreleased
+
+- Updated coreboot to upstream commit decbf7b4d975
+
 ## 2022-11-21
 
 - lemp11: Added workaround to force S0ix entry on suspend
diff --git a/coreboot b/coreboot
index 421b2ec..40e8d68 160000
--- a/coreboot
+++ b/coreboot
@@ -1 +1 @@
-Subproject commit 421b2ecbb0b273b01f4831720b6cbcab705d5e4c
+Subproject commit 40e8d68d3b3ad265b8da8cabe9d968d11b61f5f0
diff --git a/scripts/_build/edk2.sh b/scripts/_build/edk2.sh
index 5d45855..b19acc6 100755
--- a/scripts/_build/edk2.sh
+++ b/scripts/_build/edk2.sh
@@ -14,7 +14,7 @@ BUILD_TYPE=RELEASE
 #BUILD_TYPE=DEBUG
 TOOLCHAIN=COREBOOT
 
-COREBOOT_TOOLS_DEF="${PWD}/coreboot/payloads/external/tianocore/tools_def.txt"
+COREBOOT_TOOLS_DEF="${PWD}/coreboot/payloads/external/edk2/tools_def.txt"
 export GCC_CC_x86_32="${PWD}/coreboot/util/crossgcc/xgcc/bin/i386-elf-gcc"
 export GCC_CC_x86_64="${PWD}/coreboot/util/crossgcc/xgcc/bin/x86_64-elf-gcc"
 export OBJCOPY_x86_32="${PWD}/coreboot/util/crossgcc/xgcc/bin/i386-elf-objcopy"