Merge remote-tracking branch 'github-heads/master' into pureboot-27-h…

…eads-upstream

initrd/bin/kexec-boot

@@ -154,6 +154,17 @@ echo "$kexeccmd"
 eval "$kexeccmd" \
 || die "Failed to load the new kernel"
 
+if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then
+	#Repeat kexec command that will be executed since in debug
+	DEBUG "kexeccmd= $kexeccmd"
+
+	read -n 1 -p "[DEBUG] Continue booting? [Y/n]: " debug_boot_confirm
+	if [ "${debug_boot_confirm^^}" = N ]; then
+		# abort
+		die "Boot aborted"
+	fi
+fi
+
 if [ "$CONFIG_TPM" = "y" ]; then
 	tpmr kexec_finalize
 fi

initrd/bin/kexec-insert-key

@@ -68,6 +68,7 @@ if [ "$unseal_failed" = "y" ]; then
 	fi
 fi
 
+echo 
 echo '+++ Building initrd'
 # pad the initramfs (dracut doesn't pad the last gz blob)
 # without this the kernel init/initramfs.c fails to read

patches/coreboot-4.17/0004-acpi-unix2-mirror.patch

@@ -0,0 +1,32 @@
+From 8093bd4df682a49ab87845e4154e87885ad41734 Mon Sep 17 00:00:00 2001
+From: Jonathon Hall <jonathon.hall@puri.sm>
+Date: Tue, 11 Jul 2023 14:48:33 -0400
+Subject: [PATCH] util/crossgcc/buildgcc: Use different mirror
+
+acpica.org now redirects to Intel and all the links no longer work.
+
+Intel has a mirror of this archive, use it.
+
+Change-Id: I4fbfe33a4614aec97c631904d78ec391ed438bec
+Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
+---
+ util/crossgcc/buildgcc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
+index b25b260807..24916c5ab8 100755
+--- a/util/crossgcc/buildgcc
++++ b/util/crossgcc/buildgcc
+@@ -52,7 +52,8 @@ MPFR_ARCHIVE="https://ftpmirror.gnu.org/mpfr/mpfr-${MPFR_VERSION}.tar.xz"
+ MPC_ARCHIVE="https://ftpmirror.gnu.org/mpc/mpc-${MPC_VERSION}.tar.gz"
+ GCC_ARCHIVE="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz"
+ BINUTILS_ARCHIVE="https://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.xz"
+-IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz"
++# acpica.org links rotted, use Intel mirror for 20220331
++IASL_ARCHIVE="https://downloadmirror.intel.com/774879/acpica-unix2-${IASL_VERSION}.tar.gz"
+ # CLANG toolchain archive locations
+ LLVM_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/llvm-${CLANG_VERSION}.src.tar.xz"
+ CLANG_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-${CLANG_VERSION}.src.tar.xz"
+-- 
+2.30.2
+

patches/coreboot-talos_2/0002-acpi-unix2-mirror.patch

@@ -0,0 +1,32 @@
+From 8093bd4df682a49ab87845e4154e87885ad41734 Mon Sep 17 00:00:00 2001
+From: Jonathon Hall <jonathon.hall@puri.sm>
+Date: Tue, 11 Jul 2023 14:48:33 -0400
+Subject: [PATCH] util/crossgcc/buildgcc: Use different mirror
+
+acpica.org now redirects to Intel and all the links no longer work.
+
+Intel has a mirror of this archive, use it.
+
+Change-Id: I4fbfe33a4614aec97c631904d78ec391ed438bec
+Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
+---
+ util/crossgcc/buildgcc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
+index b25b260807..24916c5ab8 100755
+--- a/util/crossgcc/buildgcc
++++ b/util/crossgcc/buildgcc
+@@ -52,7 +52,8 @@ MPFR_ARCHIVE="https://ftpmirror.gnu.org/mpfr/mpfr-${MPFR_VERSION}.tar.xz"
+ MPC_ARCHIVE="https://ftpmirror.gnu.org/mpc/mpc-${MPC_VERSION}.tar.gz"
+ GCC_ARCHIVE="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz"
+ BINUTILS_ARCHIVE="https://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.xz"
+-IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz"
++# acpica.org links rotted, use Intel mirror for 20220331
++IASL_ARCHIVE="https://downloadmirror.intel.com/774879/acpica-unix2-${IASL_VERSION}.tar.gz"
+ # CLANG toolchain archive locations
+ LLVM_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/llvm-${CLANG_VERSION}.src.tar.xz"
+ CLANG_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-${CLANG_VERSION}.src.tar.xz"
+-- 
+2.30.2
+

patches/kexec-2.0.26.patch

@@ -83,8 +83,8 @@ index 14263b0..55291d6 100644
 +                dbgprintf("%s: Reusing video type %d\n",
 +                    __func__, real_mode->orig_video_isVGA);
  	} else {
-+                dbgprintf("%s: Unknown driver %s, can't provide framebuffer\n",
-+                    __func__, fix.id);
++                fprintf(stderr, "Unknown driver %s, can't provide framebuffer\n kexec'ed OS will take over console only if %s is provided\n",
++                    fix.id, fix.id);
  		real_mode->orig_video_isVGA = 0;
  		close(fd);
  		return 0;
@@ -95,7 +95,7 @@ index 14263b0..55291d6 100644
 +            dbgprintf("%s: Kernel did not provide framebuffer address\n",
 +                __func__);
 +            dbgprintf("%s: Try enabling CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM and "
-+                "drm_kms_helper.drm_leak_fbdev_smem\n",
++                "drm_kms_helper.drm_leak_fbdev_smem in kernel command-line options\n",
 +                __func__);
 +        }
 +