edk2: Rebase on edk2-stable202505

This update uses the edk2 recommended practice of...duplicating
everything. A new System76PayloadPkg is added as a copy of
UefiPayloadPkg that is now used. Most drivers and libraries that require
modifications are copied into this new package. This should hopefully
allow rebasing on future updates with significantly less work.

The following edk2 options are set:

- BOOTSPLASH_IMAGE: Enable boot logo and add it to BGRT
- LOAD_OPTION_ROMS: Load PCI Option ROMs
- SIO_BUS_ENABLE: Required for PS/2 devices to keep working
- USE_GOP_POLICY: Use Intel GOP driver instead of edk2 driver
- VARIABLE_SUPPORT: EMU for QEMU, SMMSTORE for everything else

Signed-off-by: Tim Crawford <tcrawford@system76.com>

edk2

@@ -1 +1 @@
-Subproject commit cf3309032db1a56b25522b4fbba7941df71a2e81
+Subproject commit 3a4515aec4b51ecf8d47fa7ba96e5beccaf8fb00

models/addw1/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/addw2/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/addw3/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/addw4/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/bonw14/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/bonw15-b/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/bonw15/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/darp10-b/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/darp10/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/darp11-b/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/darp11/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/darp5/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/darp6/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/darp7/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/darp8/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/darp9/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/galp2/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/galp3-b/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/galp3-c/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/galp3/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/galp4/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/galp5/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/galp6/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/galp7/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/gaze14_1650/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/gaze14_1660ti/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/gaze15/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/gaze16-3050/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/gaze16-3060-b/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/gaze16-3060/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/gaze17-3050/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/gaze17-3060-b/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/gaze18/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/lemp10/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/lemp11/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/lemp12/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/lemp13-b/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/lemp13/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/lemp9/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/meer9/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/oryp10/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/oryp11/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/oryp12/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/oryp5/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/oryp6/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/oryp7/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/oryp8/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/oryp9/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

models/qemu/edk2.config

@@ -1,8 +1,12 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+VARIABLE_SUPPORT=EMU

models/serw13/edk2.config

@@ -1,9 +1,14 @@
 BOOTLOADER=COREBOOT
+BOOTSPLASH_IMAGE=TRUE
 DISABLE_SERIAL_TERMINAL=TRUE
+LOAD_OPTION_ROMS=TRUE
 PLATFORM_BOOT_TIMEOUT=2
 PS2_KEYBOARD_ENABLE=TRUE
 SECURE_BOOT_ENABLE=TRUE
 SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
+SIO_BUS_ENABLE=TRUE
 TPM_ENABLE=TRUE
+USE_GOP_POLICY=TRUE
+VARIABLE_SUPPORT=SMMSTORE
 #SYSTEM76_EC_LOGGING=TRUE

scripts/_build/edk2.sh

@@ -11,9 +11,9 @@ then
 fi
 UEFIPAYLOAD="$(realpath "$1")"
 
-PACKAGE=UefiPayloadPkg
+PACKAGE=System76PayloadPkg
+BUILD_ARCH=X64
 BUILD_TYPE=RELEASE
-#BUILD_TYPE=DEBUG
 TOOLCHAIN=COREBOOT
 
 COREBOOT_TOOLS_DEF="$XGCCPATH/../share/edk2config/tools_def.txt"
@@ -28,13 +28,14 @@ pushd edk2 >/dev/null
 
   build \
     -a IA32 \
-    -a X64 \
+    -a ${BUILD_ARCH} \
     -b "${BUILD_TYPE}" \
     -t "${TOOLCHAIN}" \
     -p "${PACKAGE}/${PACKAGE}.dsc" \
+    -DBUILD_ARCH=${BUILD_ARCH} \
     "${@:2}"
 
   cp -v \
-    "Build/${PACKAGE}X64/${BUILD_TYPE}_${TOOLCHAIN}/FV/UEFIPAYLOAD.fd" \
+    "Build/${PACKAGE}${BUILD_ARCH}/${BUILD_TYPE}_${TOOLCHAIN}/FV/UEFIPAYLOAD.fd" \
     "${UEFIPAYLOAD}"
 popd >/dev/null

scripts/build.sh

@@ -65,7 +65,7 @@ then
     done < "${MODEL_DIR}/edk2.config"
 fi
 
-# Rebuild UefiPayloadPkg using edk2
+# Rebuild edk2 payload
 PACKAGES_PATH="${MODEL_DIR}:$(realpath apps)" \
     ./scripts/_build/edk2.sh \
         "${UEFIPAYLOAD}" \