From fa98ecae1fe48fc22eb39c2b065e97b70cdc127b Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Tue, 21 Dec 2021 10:32:37 -0700 Subject: [PATCH] edk2: Rebase on edk2-stable202108 Set options in edk2.config for each board. PCIE_BASE is no longer an edk2 option. The value is expected to be in AcpiBoardInfo HOB, generated from the bootloader's ACPI table. Signed-off-by: Tim Crawford --- edk2 | 2 +- models/addw1/edk2.config | 7 +++++++ models/addw2/edk2.config | 7 +++++++ models/bonw14/edk2.config | 7 +++++++ models/darp5/edk2.config | 7 +++++++ models/darp6/edk2.config | 7 +++++++ models/darp7/edk2.config | 7 ++++++- models/galp2/edk2.config | 7 +++++++ models/galp3-b/edk2.config | 7 +++++++ models/galp3-c/edk2.config | 7 +++++++ models/galp3/edk2.config | 7 +++++++ models/galp4/edk2.config | 7 +++++++ models/galp5/edk2.config | 7 ++++++- models/gaze14_1650/edk2.config | 7 +++++++ models/gaze14_1660ti/edk2.config | 7 +++++++ models/gaze15/edk2.config | 7 +++++++ models/gaze16-3050/edk2.config | 7 ++++++- models/gaze16-3060-b/edk2.config | 7 ++++++- models/gaze16-3060/edk2.config | 7 ++++++- models/lemp10/edk2.config | 7 ++++++- models/lemp9/edk2.config | 7 +++++++ models/oryp5/edk2.config | 7 +++++++ models/oryp6/edk2.config | 7 +++++++ models/oryp7/edk2.config | 7 +++++++ models/oryp8/edk2.config | 7 ++++++- scripts/_build/edk2.sh | 2 +- 26 files changed, 163 insertions(+), 9 deletions(-) create mode 100644 models/addw1/edk2.config create mode 100644 models/addw2/edk2.config create mode 100644 models/bonw14/edk2.config create mode 100644 models/darp5/edk2.config create mode 100644 models/darp6/edk2.config create mode 100644 models/galp2/edk2.config create mode 100644 models/galp3-b/edk2.config create mode 100644 models/galp3-c/edk2.config create mode 100644 models/galp3/edk2.config create mode 100644 models/galp4/edk2.config create mode 100644 models/gaze14_1650/edk2.config create mode 100644 models/gaze14_1660ti/edk2.config create mode 100644 models/gaze15/edk2.config create mode 100644 models/lemp9/edk2.config create mode 100644 models/oryp5/edk2.config create mode 100644 models/oryp6/edk2.config create mode 100644 models/oryp7/edk2.config diff --git a/edk2 b/edk2 index a3c4616..a618e43 160000 --- a/edk2 +++ b/edk2 @@ -1 +1 @@ -Subproject commit a3c4616449417beed72aff0c58f374cd4918e0a5 +Subproject commit a618e43977ff73fee5030ec4c3d481cc13a8d8d3 diff --git a/models/addw1/edk2.config b/models/addw1/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/addw1/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/addw2/edk2.config b/models/addw2/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/addw2/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/bonw14/edk2.config b/models/bonw14/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/bonw14/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/darp5/edk2.config b/models/darp5/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/darp5/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/darp6/edk2.config b/models/darp6/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/darp6/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/darp7/edk2.config b/models/darp7/edk2.config index eb4f1b9..340c751 100644 --- a/models/darp7/edk2.config +++ b/models/darp7/edk2.config @@ -1,2 +1,7 @@ -PCIE_BASE=0xC0000000 +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE #SYSTEM76_EC_LOGGING=TRUE diff --git a/models/galp2/edk2.config b/models/galp2/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/galp2/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/galp3-b/edk2.config b/models/galp3-b/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/galp3-b/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/galp3-c/edk2.config b/models/galp3-c/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/galp3-c/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/galp3/edk2.config b/models/galp3/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/galp3/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/galp4/edk2.config b/models/galp4/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/galp4/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/galp5/edk2.config b/models/galp5/edk2.config index eb4f1b9..340c751 100644 --- a/models/galp5/edk2.config +++ b/models/galp5/edk2.config @@ -1,2 +1,7 @@ -PCIE_BASE=0xC0000000 +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE #SYSTEM76_EC_LOGGING=TRUE diff --git a/models/gaze14_1650/edk2.config b/models/gaze14_1650/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/gaze14_1650/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/gaze14_1660ti/edk2.config b/models/gaze14_1660ti/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/gaze14_1660ti/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/gaze15/edk2.config b/models/gaze15/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/gaze15/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/gaze16-3050/edk2.config b/models/gaze16-3050/edk2.config index eb4f1b9..340c751 100644 --- a/models/gaze16-3050/edk2.config +++ b/models/gaze16-3050/edk2.config @@ -1,2 +1,7 @@ -PCIE_BASE=0xC0000000 +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE #SYSTEM76_EC_LOGGING=TRUE diff --git a/models/gaze16-3060-b/edk2.config b/models/gaze16-3060-b/edk2.config index eb4f1b9..340c751 100644 --- a/models/gaze16-3060-b/edk2.config +++ b/models/gaze16-3060-b/edk2.config @@ -1,2 +1,7 @@ -PCIE_BASE=0xC0000000 +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE #SYSTEM76_EC_LOGGING=TRUE diff --git a/models/gaze16-3060/edk2.config b/models/gaze16-3060/edk2.config index eb4f1b9..340c751 100644 --- a/models/gaze16-3060/edk2.config +++ b/models/gaze16-3060/edk2.config @@ -1,2 +1,7 @@ -PCIE_BASE=0xC0000000 +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE #SYSTEM76_EC_LOGGING=TRUE diff --git a/models/lemp10/edk2.config b/models/lemp10/edk2.config index eb4f1b9..340c751 100644 --- a/models/lemp10/edk2.config +++ b/models/lemp10/edk2.config @@ -1,2 +1,7 @@ -PCIE_BASE=0xC0000000 +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE #SYSTEM76_EC_LOGGING=TRUE diff --git a/models/lemp9/edk2.config b/models/lemp9/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/lemp9/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/oryp5/edk2.config b/models/oryp5/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/oryp5/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/oryp6/edk2.config b/models/oryp6/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/oryp6/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/oryp7/edk2.config b/models/oryp7/edk2.config new file mode 100644 index 0000000..340c751 --- /dev/null +++ b/models/oryp7/edk2.config @@ -0,0 +1,7 @@ +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE +#SYSTEM76_EC_LOGGING=TRUE diff --git a/models/oryp8/edk2.config b/models/oryp8/edk2.config index eb4f1b9..340c751 100644 --- a/models/oryp8/edk2.config +++ b/models/oryp8/edk2.config @@ -1,2 +1,7 @@ -PCIE_BASE=0xC0000000 +DISABLE_SERIAL_TERMINAL=TRUE +PLATFORM_BOOT_TIMEOUT=2 +#SECURE_BOOT_ENABLE=TRUE +SERIAL_DRIVER_ENABLE=FALSE +SHELL_TYPE=NONE +TPM_ENABLE=TRUE #SYSTEM76_EC_LOGGING=TRUE diff --git a/scripts/_build/edk2.sh b/scripts/_build/edk2.sh index 2849924..1c28c2c 100755 --- a/scripts/_build/edk2.sh +++ b/scripts/_build/edk2.sh @@ -27,7 +27,7 @@ pushd edk2 >/dev/null -a X64 \ -b "${BUILD_TYPE}" \ -t "${TOOLCHAIN}" \ - -p "${PACKAGE}/${PACKAGE}Ia32X64.dsc" \ + -p "${PACKAGE}/${PACKAGE}.dsc" \ "${@:2}" cp -v \