summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--resources/libreboot/config/macbook21/config4
-rw-r--r--resources/libreboot/config/qemu_i440fx_piix4/config4
-rw-r--r--resources/libreboot/config/qemu_q35_ich9/config4
-rw-r--r--resources/libreboot/config/r400_4mb/config4
-rw-r--r--resources/libreboot/config/r400_8mb/config4
-rw-r--r--resources/libreboot/config/t400_4mb/config4
-rw-r--r--resources/libreboot/config/t400_8mb/config4
-rw-r--r--resources/libreboot/config/t500_4mb/config4
-rw-r--r--resources/libreboot/config/t500_8mb/config4
-rw-r--r--resources/libreboot/config/t60/config4
-rw-r--r--resources/libreboot/config/x200_4mb/config4
-rw-r--r--resources/libreboot/config/x200_8mb/config4
-rw-r--r--resources/libreboot/config/x60/config4
-rw-r--r--resources/libreboot/patch/0016-buildgcc-Define-CMAKE-only-if-clang-package-is-built.patch41
-rwxr-xr-xresources/scripts/helpers/download/coreboot8
15 files changed, 53 insertions, 48 deletions
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index c9a290f..caf5e7a 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21/config
@@ -198,6 +198,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
CONFIG_AP_IN_SIPI_WAIT=y
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
diff --git a/resources/libreboot/config/qemu_i440fx_piix4/config b/resources/libreboot/config/qemu_i440fx_piix4/config
index d027b3f..a456d19 100644
--- a/resources/libreboot/config/qemu_i440fx_piix4/config
+++ b/resources/libreboot/config/qemu_i440fx_piix4/config
@@ -196,6 +196,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
# CONFIG_ROMCC is not set
diff --git a/resources/libreboot/config/qemu_q35_ich9/config b/resources/libreboot/config/qemu_q35_ich9/config
index 2770293..dcdc067 100644
--- a/resources/libreboot/config/qemu_q35_ich9/config
+++ b/resources/libreboot/config/qemu_q35_ich9/config
@@ -197,6 +197,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
# CONFIG_ROMCC is not set
diff --git a/resources/libreboot/config/r400_4mb/config b/resources/libreboot/config/r400_4mb/config
index c6708ba..91dafe9 100644
--- a/resources/libreboot/config/r400_4mb/config
+++ b/resources/libreboot/config/r400_4mb/config
@@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
# CONFIG_AP_IN_SIPI_WAIT is not set
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
diff --git a/resources/libreboot/config/r400_8mb/config b/resources/libreboot/config/r400_8mb/config
index 7f0a3b9..905a997 100644
--- a/resources/libreboot/config/r400_8mb/config
+++ b/resources/libreboot/config/r400_8mb/config
@@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
# CONFIG_AP_IN_SIPI_WAIT is not set
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
diff --git a/resources/libreboot/config/t400_4mb/config b/resources/libreboot/config/t400_4mb/config
index 7b81207..5ae564a 100644
--- a/resources/libreboot/config/t400_4mb/config
+++ b/resources/libreboot/config/t400_4mb/config
@@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
# CONFIG_AP_IN_SIPI_WAIT is not set
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
diff --git a/resources/libreboot/config/t400_8mb/config b/resources/libreboot/config/t400_8mb/config
index d5800b4..8fbf583 100644
--- a/resources/libreboot/config/t400_8mb/config
+++ b/resources/libreboot/config/t400_8mb/config
@@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
# CONFIG_AP_IN_SIPI_WAIT is not set
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
diff --git a/resources/libreboot/config/t500_4mb/config b/resources/libreboot/config/t500_4mb/config
index 2f283fb..e864cac 100644
--- a/resources/libreboot/config/t500_4mb/config
+++ b/resources/libreboot/config/t500_4mb/config
@@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
# CONFIG_AP_IN_SIPI_WAIT is not set
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
diff --git a/resources/libreboot/config/t500_8mb/config b/resources/libreboot/config/t500_8mb/config
index 2b625ca..a21072e 100644
--- a/resources/libreboot/config/t500_8mb/config
+++ b/resources/libreboot/config/t500_8mb/config
@@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
# CONFIG_AP_IN_SIPI_WAIT is not set
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config
index d216c36..8d23cd5 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60/config
@@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
CONFIG_AP_IN_SIPI_WAIT=y
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
diff --git a/resources/libreboot/config/x200_4mb/config b/resources/libreboot/config/x200_4mb/config
index bf26343..95056e5 100644
--- a/resources/libreboot/config/x200_4mb/config
+++ b/resources/libreboot/config/x200_4mb/config
@@ -205,6 +205,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
# CONFIG_AP_IN_SIPI_WAIT is not set
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
diff --git a/resources/libreboot/config/x200_8mb/config b/resources/libreboot/config/x200_8mb/config
index 5da0cfb..de42e49 100644
--- a/resources/libreboot/config/x200_8mb/config
+++ b/resources/libreboot/config/x200_8mb/config
@@ -205,6 +205,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
# CONFIG_AP_IN_SIPI_WAIT is not set
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config
index 3efb0d2..8cfe35b 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60/config
@@ -208,6 +208,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
CONFIG_AP_IN_SIPI_WAIT=y
# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_NUM_IPI_STARTS=2
diff --git a/resources/libreboot/patch/0016-buildgcc-Define-CMAKE-only-if-clang-package-is-built.patch b/resources/libreboot/patch/0016-buildgcc-Define-CMAKE-only-if-clang-package-is-built.patch
deleted file mode 100644
index b303292..0000000
--- a/resources/libreboot/patch/0016-buildgcc-Define-CMAKE-only-if-clang-package-is-built.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From beb6138691594cd227a1b50079d14e6adc4e8ef5 Mon Sep 17 00:00:00 2001
-From: David Hendricks <dhendrix@chromium.org>
-Date: Mon, 15 Jun 2015 17:03:22 -0700
-Subject: [PATCH] buildgcc: Define $CMAKE only if clang package is built
-
-This moves the CMAKE definition down into the case statement
-for $PACKAGE so that it is only required when the user wants to
-build clang.
-
-With this approach, "./buildgcc -P clang" will error out with the
-"ERROR: Missing tool:" message if cmake is not installed.
-
-Change-Id: I1e5c1bd67ade8f93ba0390df7f234deb47b9b18a
-Signed-off-by: David Hendricks <dhendrix@chromium.org>
----
- util/crossgcc/buildgcc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
-index 7f440f7..552a6a2 100755
---- a/util/crossgcc/buildgcc
-+++ b/util/crossgcc/buildgcc
-@@ -165,7 +165,6 @@ searchtool()
- TAR=$(searchtool tar) || exit $?
- PATCH=$(searchtool patch) || exit $?
- MAKE=$(searchtool make) || exit $?
--CMAKE=$(searchtool cmake "cmake") || exit $?
- SHA1SUM=$(searchtool sha1sum)
- SHA512SUM=$(searchtool sha512sum)
- CHECKSUM=$SHA1SUM
-@@ -554,6 +553,7 @@ case "$PACKAGE" in
- CLANG|clang)
- NAME=clang
- PACKAGES="LLVM CFE CRT CTE"
-+ CMAKE=$(searchtool cmake "cmake") || exit $?
- ;;
- IASL|iasl)
- NAME="IASL ACPI compiler"
---
-1.9.1
-
diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot
index b832921..98a5047 100755
--- a/resources/scripts/helpers/download/coreboot
+++ b/resources/scripts/helpers/download/coreboot
@@ -44,7 +44,7 @@ git clone http://review.coreboot.org/coreboot
cd "coreboot/"
# reset to previously tested revision
-git reset --hard 5f6c392924306eb514610487963d3686293e380d
+git reset --hard cd5cdd3ba42371cc97b1464fd7b98de5bef05a6a
# Get patches from review.coreboot.org
# ------------------------------------------------------------------------------
@@ -138,12 +138,6 @@ printf "ec/lenovo/h8: re-factor handling of power_management_beeps\n"
# git fetch http://review.coreboot.org/coreboot refs/changes/31/10531/8 && git cherry-pick FETCH_HEAD
git am "../resources/libreboot/patch/0015-ec-lenovo-h8-re-factor-handling-of-power_management_.patch"
-printf "buildgcc: Define CMAKE only if clang package is built\n"
-# Needed, otherwise the build system complains that cmake isn't present (unless it's installed)
-# Libreboot doesn't use clang, which is the only part of coreboot that requires cmake
-# git fetch http://review.coreboot.org/coreboot refs/changes/56/10556/1 && git cherry-pick FETCH_HEAD
-git am "../resources/libreboot/patch/0016-buildgcc-Define-CMAKE-only-if-clang-package-is-built.patch"
-
# Run coreboot-libre deblob scripts
# ------------------------------------------------------------------------------
generated by cgit v0.9.1 at 2024-07-01 10:20:48 (EDT)