From 417e5898dac7d31fcdfbfacdd5453832126c1152 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Tue, 11 Jan 2022 14:26:00 -0700 Subject: [PATCH] models: Set coreboot, PS/2 keyboard in edk2 config Set BOOTLOADER and PS2_KEYBOARD_ENABLE in the edk2 config. This will allow us to drop the corresponding commits in edk2 when rebasing on the next stable release. Signed-off-by: Tim Crawford --- models/addw1/edk2.config | 2 ++ models/addw2/edk2.config | 2 ++ models/bonw14/edk2.config | 2 ++ models/darp5/edk2.config | 2 ++ models/darp6/edk2.config | 2 ++ models/darp7/edk2.config | 2 ++ models/galp2/edk2.config | 2 ++ models/galp3-b/edk2.config | 2 ++ models/galp3-c/edk2.config | 2 ++ models/galp3/edk2.config | 2 ++ models/galp4/edk2.config | 2 ++ models/galp5/edk2.config | 2 ++ models/gaze14_1650/edk2.config | 2 ++ models/gaze14_1660ti/edk2.config | 2 ++ models/gaze15/edk2.config | 2 ++ models/gaze16-3050/edk2.config | 2 ++ models/gaze16-3060-b/edk2.config | 2 ++ models/gaze16-3060/edk2.config | 2 ++ models/lemp10/edk2.config | 2 ++ models/lemp9/edk2.config | 2 ++ models/oryp5/edk2.config | 2 ++ models/oryp6/edk2.config | 2 ++ models/oryp7/edk2.config | 2 ++ models/oryp8/edk2.config | 2 ++ 24 files changed, 48 insertions(+) diff --git a/models/addw1/edk2.config b/models/addw1/edk2.config index 340c751..28b2a3c 100644 --- a/models/addw1/edk2.config +++ b/models/addw1/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/addw2/edk2.config b/models/addw2/edk2.config index 340c751..28b2a3c 100644 --- a/models/addw2/edk2.config +++ b/models/addw2/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/bonw14/edk2.config b/models/bonw14/edk2.config index 340c751..28b2a3c 100644 --- a/models/bonw14/edk2.config +++ b/models/bonw14/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/darp5/edk2.config b/models/darp5/edk2.config index 340c751..28b2a3c 100644 --- a/models/darp5/edk2.config +++ b/models/darp5/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/darp6/edk2.config b/models/darp6/edk2.config index 340c751..28b2a3c 100644 --- a/models/darp6/edk2.config +++ b/models/darp6/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/darp7/edk2.config b/models/darp7/edk2.config index 340c751..28b2a3c 100644 --- a/models/darp7/edk2.config +++ b/models/darp7/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/galp2/edk2.config b/models/galp2/edk2.config index 340c751..28b2a3c 100644 --- a/models/galp2/edk2.config +++ b/models/galp2/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/galp3-b/edk2.config b/models/galp3-b/edk2.config index 340c751..28b2a3c 100644 --- a/models/galp3-b/edk2.config +++ b/models/galp3-b/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/galp3-c/edk2.config b/models/galp3-c/edk2.config index 340c751..28b2a3c 100644 --- a/models/galp3-c/edk2.config +++ b/models/galp3-c/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/galp3/edk2.config b/models/galp3/edk2.config index 340c751..28b2a3c 100644 --- a/models/galp3/edk2.config +++ b/models/galp3/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/galp4/edk2.config b/models/galp4/edk2.config index 340c751..28b2a3c 100644 --- a/models/galp4/edk2.config +++ b/models/galp4/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/galp5/edk2.config b/models/galp5/edk2.config index 340c751..28b2a3c 100644 --- a/models/galp5/edk2.config +++ b/models/galp5/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/gaze14_1650/edk2.config b/models/gaze14_1650/edk2.config index 340c751..28b2a3c 100644 --- a/models/gaze14_1650/edk2.config +++ b/models/gaze14_1650/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/gaze14_1660ti/edk2.config b/models/gaze14_1660ti/edk2.config index 340c751..28b2a3c 100644 --- a/models/gaze14_1660ti/edk2.config +++ b/models/gaze14_1660ti/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/gaze15/edk2.config b/models/gaze15/edk2.config index 340c751..28b2a3c 100644 --- a/models/gaze15/edk2.config +++ b/models/gaze15/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/gaze16-3050/edk2.config b/models/gaze16-3050/edk2.config index 340c751..28b2a3c 100644 --- a/models/gaze16-3050/edk2.config +++ b/models/gaze16-3050/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/gaze16-3060-b/edk2.config b/models/gaze16-3060-b/edk2.config index 340c751..28b2a3c 100644 --- a/models/gaze16-3060-b/edk2.config +++ b/models/gaze16-3060-b/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/gaze16-3060/edk2.config b/models/gaze16-3060/edk2.config index 340c751..28b2a3c 100644 --- a/models/gaze16-3060/edk2.config +++ b/models/gaze16-3060/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/lemp10/edk2.config b/models/lemp10/edk2.config index 340c751..28b2a3c 100644 --- a/models/lemp10/edk2.config +++ b/models/lemp10/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/lemp9/edk2.config b/models/lemp9/edk2.config index 340c751..28b2a3c 100644 --- a/models/lemp9/edk2.config +++ b/models/lemp9/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/oryp5/edk2.config b/models/oryp5/edk2.config index 340c751..28b2a3c 100644 --- a/models/oryp5/edk2.config +++ b/models/oryp5/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/oryp6/edk2.config b/models/oryp6/edk2.config index 340c751..28b2a3c 100644 --- a/models/oryp6/edk2.config +++ b/models/oryp6/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/oryp7/edk2.config b/models/oryp7/edk2.config index 340c751..28b2a3c 100644 --- a/models/oryp7/edk2.config +++ b/models/oryp7/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE diff --git a/models/oryp8/edk2.config b/models/oryp8/edk2.config index 340c751..28b2a3c 100644 --- a/models/oryp8/edk2.config +++ b/models/oryp8/edk2.config @@ -1,5 +1,7 @@ +BOOTLOADER=COREBOOT DISABLE_SERIAL_TERMINAL=TRUE PLATFORM_BOOT_TIMEOUT=2 +PS2_KEYBOARD_ENABLE=TRUE #SECURE_BOOT_ENABLE=TRUE SERIAL_DRIVER_ENABLE=FALSE SHELL_TYPE=NONE