From 9efc7fc540d3b235274448d986747eab226b999d Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Fri, 13 Dec 2019 19:33:32 +0100 Subject: Revert "crossgcc: Upgrade acpica to version 20191018" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 547de69de73629c051e9b5312f6369744ec6ce8f. Merged out of order before CB:36317. The conflicting use of _ADR and _HID needs to be properly addressed before we can bump the IASL version. Change-Id: Iacbc9877a8ff2324eba4789d65df8545b8a25413 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/coreboot/+/37713 Reviewed-by: HAOUAS Elyes Reviewed-by: Kyösti Mälkki Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- util/crossgcc/buildgcc | 2 +- .../patches/acpica-unix2-20190703_iasl.patch | 27 ++++++++++++++++++++++ .../patches/acpica-unix2-20191018_iasl.patch | 27 ---------------------- .../sum/acpica-unix2-20190703.tar.gz.cksum | 1 + .../sum/acpica-unix2-20191018.tar.gz.cksum | 1 - 5 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 util/crossgcc/patches/acpica-unix2-20190703_iasl.patch delete mode 100644 util/crossgcc/patches/acpica-unix2-20191018_iasl.patch create mode 100644 util/crossgcc/sum/acpica-unix2-20190703.tar.gz.cksum delete mode 100644 util/crossgcc/sum/acpica-unix2-20191018.tar.gz.cksum (limited to 'util') diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index f1cf6bb8cf..5dac074a06 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -54,7 +54,7 @@ GCC_VERSION=8.3.0 GCC_AUTOCONF_VERSION=2.69 BINUTILS_VERSION=2.33.1 GDB_VERSION=8.3.1 -IASL_VERSION=20191018 +IASL_VERSION=20190703 PYTHON_VERSION=3.8.0 EXPAT_VERSION=2.2.9 # CLANG version number diff --git a/util/crossgcc/patches/acpica-unix2-20190703_iasl.patch b/util/crossgcc/patches/acpica-unix2-20190703_iasl.patch new file mode 100644 index 0000000000..0f6097450b --- /dev/null +++ b/util/crossgcc/patches/acpica-unix2-20190703_iasl.patch @@ -0,0 +1,27 @@ +diff -Naur acpica-unix2-20190703_/source/compiler/asloptions.c acpica-unix2-20190703/source/compiler/asloptions.c > acpica-unix2-20190703_iasl.patch +--- acpica-unix2-20190703_/source/compiler/asloptions.c ++++ acpica-unix2-20190703/source/compiler/asloptions.c +@@ -126,6 +126,7 @@ + if (Gbl_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"); +@@ -753,6 +754,7 @@ + case '^': + + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); ++ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); + exit (0); + + case 'a': +@@ -766,6 +768,7 @@ + + 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-unix2-20191018_iasl.patch b/util/crossgcc/patches/acpica-unix2-20191018_iasl.patch deleted file mode 100644 index 0f6097450b..0000000000 --- a/util/crossgcc/patches/acpica-unix2-20191018_iasl.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur acpica-unix2-20190703_/source/compiler/asloptions.c acpica-unix2-20190703/source/compiler/asloptions.c > acpica-unix2-20190703_iasl.patch ---- acpica-unix2-20190703_/source/compiler/asloptions.c -+++ acpica-unix2-20190703/source/compiler/asloptions.c -@@ -126,6 +126,7 @@ - if (Gbl_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"); -@@ -753,6 +754,7 @@ - case '^': - - printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); -+ printf ("%s\n", COREBOOT_TOOLCHAIN_VERSION); - exit (0); - - case 'a': -@@ -766,6 +768,7 @@ - - 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-unix2-20190703.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20190703.tar.gz.cksum new file mode 100644 index 0000000000..9a89796d53 --- /dev/null +++ b/util/crossgcc/sum/acpica-unix2-20190703.tar.gz.cksum @@ -0,0 +1 @@ +c5594944f933265a53695204a0672d0808e4a580 tarballs/acpica-unix2-20190703.tar.gz diff --git a/util/crossgcc/sum/acpica-unix2-20191018.tar.gz.cksum b/util/crossgcc/sum/acpica-unix2-20191018.tar.gz.cksum deleted file mode 100644 index 3df9d27cb3..0000000000 --- a/util/crossgcc/sum/acpica-unix2-20191018.tar.gz.cksum +++ /dev/null @@ -1 +0,0 @@ -792e2ec4dcd78646de8405578d28f7437aacf811 tarballs/acpica-unix2-20191018.tar.gz -- cgit v1.2.3