From 7c1813c13782eeee2ba69446b4dbd4f57d3fa052 Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Mon, 1 Jul 2024 13:35:33 +0000 Subject: Revert "util/crossgcc: Update ACPICA from 20230628 to 20240321" This reverts commit 41fdb882f1f0c3cda41651c2e9c920580415a0dc. Reason for revert: The version downloaded does not match the version that is printed out when executing `iasl --version`. coreboot notices that and refuses to compile QEMU-Q35 mainboard. I tested it on 2 different PCs. Signed-off-by: Martin Roth Change-Id: I3ce0c5798f14162eaa063a9a64e16e6dbbb9e468 Reviewed-on: https://review.coreboot.org/c/coreboot/+/83296 Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- util/crossgcc/buildgcc | 4 ++-- .../patches/acpica-unix-20230628_iasl.patch | 28 ++++++++++++++++++++++ .../patches/acpica-unix-20240321_iasl.patch | 28 ---------------------- .../crossgcc/sum/acpica-unix-20230628.tar.gz.cksum | 1 + .../crossgcc/sum/acpica-unix-20240321.tar.gz.cksum | 1 - 5 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 util/crossgcc/patches/acpica-unix-20230628_iasl.patch delete mode 100644 util/crossgcc/patches/acpica-unix-20240321_iasl.patch create mode 100644 util/crossgcc/sum/acpica-unix-20230628.tar.gz.cksum delete mode 100644 util/crossgcc/sum/acpica-unix-20240321.tar.gz.cksum diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index f4379ad157..ad756652ed 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -40,7 +40,7 @@ MPFR_VERSION=4.2.1 MPC_VERSION=1.3.1 GCC_VERSION=14.1.0 BINUTILS_VERSION=2.42 -IASL_VERSION=20240321 +IASL_VERSION="20230628" # CLANG version number CLANG_VERSION=18.1.6 CMAKE_VERSION=3.29.3 @@ -74,7 +74,7 @@ MPFR_BASE_URL="https://ftpmirror.gnu.org/mpfr" MPC_BASE_URL="https://ftpmirror.gnu.org/mpc" GCC_BASE_URL="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}" BINUTILS_BASE_URL="https://ftpmirror.gnu.org/binutils" -IASL_BASE_URL="https://downloadmirror.intel.com/819451" +IASL_BASE_URL="https://downloadmirror.intel.com/783534" # CLANG toolchain archive locations LLVM_BASE_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}" CLANG_BASE_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}" diff --git a/util/crossgcc/patches/acpica-unix-20230628_iasl.patch b/util/crossgcc/patches/acpica-unix-20230628_iasl.patch new file mode 100644 index 0000000000..55adb83af2 --- /dev/null +++ b/util/crossgcc/patches/acpica-unix-20230628_iasl.patch @@ -0,0 +1,28 @@ +diff --git a/source/compiler/asloptions.c b/source/compiler/asloptions.c +index 4bf9465ba..14c61a122 100644 +--- a/source/compiler/asloptions.c ++++ b/source/compiler/asloptions.c +@@ -234,6 +234,7 @@ AslCommandLine ( + if (AslGbl_DoSignon) + { + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); + if (AslGbl_IgnoreErrors) + { + printf ("Ignoring all errors, forcing AML file generation\n\n"); +@@ -866,6 +867,7 @@ AslDoOptions ( + case '^': + + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); + exit (0); + + case 'a': +@@ -879,6 +881,7 @@ AslDoOptions ( + + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); + printf (ACPI_COMMON_BUILD_TIME); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); + exit (0); + + case 'e': diff --git a/util/crossgcc/patches/acpica-unix-20240321_iasl.patch b/util/crossgcc/patches/acpica-unix-20240321_iasl.patch deleted file mode 100644 index 55adb83af2..0000000000 --- a/util/crossgcc/patches/acpica-unix-20240321_iasl.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/source/compiler/asloptions.c b/source/compiler/asloptions.c -index 4bf9465ba..14c61a122 100644 ---- a/source/compiler/asloptions.c -+++ b/source/compiler/asloptions.c -@@ -234,6 +234,7 @@ AslCommandLine ( - if (AslGbl_DoSignon) - { - printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); -+ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); - if (AslGbl_IgnoreErrors) - { - printf ("Ignoring all errors, forcing AML file generation\n\n"); -@@ -866,6 +867,7 @@ AslDoOptions ( - case '^': - - printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); -+ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); - exit (0); - - case 'a': -@@ -879,6 +881,7 @@ AslDoOptions ( - - printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); - printf (ACPI_COMMON_BUILD_TIME); -+ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); - exit (0); - - case 'e': diff --git a/util/crossgcc/sum/acpica-unix-20230628.tar.gz.cksum b/util/crossgcc/sum/acpica-unix-20230628.tar.gz.cksum new file mode 100644 index 0000000000..9b676bb568 --- /dev/null +++ b/util/crossgcc/sum/acpica-unix-20230628.tar.gz.cksum @@ -0,0 +1 @@ +3b893fb771cf3fbd3531de3036e1a5bfc624c9d2 tarballs/acpica-unix-20230628.tar.gz diff --git a/util/crossgcc/sum/acpica-unix-20240321.tar.gz.cksum b/util/crossgcc/sum/acpica-unix-20240321.tar.gz.cksum deleted file mode 100644 index e7b7afec72..0000000000 --- a/util/crossgcc/sum/acpica-unix-20240321.tar.gz.cksum +++ /dev/null @@ -1 +0,0 @@ -19f5b03de6de059a95432d17ed24095262a97aba tarballs/acpica-unix-20240321.tar.gz -- cgit v1.2.3