Merge 4.16

Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e
This commit is contained in:
Jeremy Soller
2022-03-04 07:19:45 -07:00
parent af64e5d166
commit d97e25ac13
3138 changed files with 317025 additions and 23253 deletions

View File

@@ -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':