Skip to content

Commit

Permalink
Better vboot-rwa.fmd for KGPE-D16.
Browse files Browse the repository at this point in the history
Bring patches/coreboot-4.11 on par with master

Removed patches/coreboot-4.11/0020-kgpe-d16-vboot.patch
Removed Vboot options from KGPE-D16 coreboot configs

Enabled TPM in kgpe-d16 board configs
Enabled measured boot in kgpe-d16 coreboot configs.

Added support for video cards that require nouveau, radeon and amdgpu drivers in linux-kgpe-d16_workstation.config

`nouveau.config=NvForcePost=1` to be added to kexec'd kernels for better Nvidia card support.
  • Loading branch information
Tonux599 committed Nov 28, 2020
1 parent ad21522 commit 66f309e
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 150 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y

export CONFIG_TPM=n
export CONFIG_TPM=y
#BOOT SCRIPT SELECTION
#export CONFIG_BOOTSCRIPT=/bin/generic-init
export CONFIG_BOOTSCRIPT=/bin/gui-init
Expand Down
2 changes: 1 addition & 1 deletion boards/kgpe-d16_server/kgpe-d16_server.config
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y

export CONFIG_TPM=n
export CONFIG_TPM=y
#BOOT SCRIPT SELECTION
export CONFIG_BOOTSCRIPT=/bin/generic-init
#export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
#Enable USB Keyboard support
export CONFIG_USB_KEYBOARD=y
#No TPM support for the moment
export CONFIG_TPM=n
export CONFIG_TPM=y
#BOOT SCRIPT SELECTION
#export CONFIG_BOOTSCRIPT=/bin/generic-init
export CONFIG_BOOTSCRIPT=/bin/gui-init
Expand All @@ -49,7 +49,7 @@ export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"
#Dual output to local console (tty0) and OpenBmc (ttyS1)
#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
#Single output to tty0
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=tty0"
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=tty0 nouveau.config=NvForcePost=1"
#export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
#export CONFIG_BOOT_STATIC_IP=192.168.2.3

Expand Down
4 changes: 2 additions & 2 deletions boards/kgpe-d16_workstation/kgpe-d16_workstation.config
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y

export CONFIG_TPM=n
export CONFIG_TPM=y
#BOOT SCRIPT SELECTION
#export CONFIG_BOOTSCRIPT=/bin/generic-init
export CONFIG_BOOTSCRIPT=/bin/gui-init
Expand All @@ -46,7 +46,7 @@ export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"
#Dual output to local console (tty0) and OpenBmc (ttyS1)
#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
#Single output to tty0
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=tty0"
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=tty0 nouveau.config=NvForcePost=1"
#export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
#export CONFIG_BOOT_STATIC_IP=192.168.2.3

Expand Down
5 changes: 2 additions & 3 deletions config/coreboot-kgpe-d16_server-whiptail.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ CONFIG_USE_OPTION_TABLE=y
CONFIG_VENDOR_ASUS=y
CONFIG_UART_FOR_CONSOLE=1
CONFIG_BOARD_ASUS_KGPE_D16=y
CONFIG_VBOOT=y
CONFIG_DRIVERS_PS2_KEYBOARD=y
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_VBOOT_MEASURED_BOOT=y
CONFIG_VBOOT_MEASURED_BOOT_RUNTIME_DATA="S3NV"
CONFIG_MEASURED_BOOT=y
CONFIG_USER_TPM1=y
CONFIG_TPM_RDRESP_NEED_DELAY=y
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_server-whiptail/bzImage"
Expand Down
5 changes: 2 additions & 3 deletions config/coreboot-kgpe-d16_server.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ CONFIG_USE_OPTION_TABLE=y
CONFIG_VENDOR_ASUS=y
CONFIG_UART_FOR_CONSOLE=1
CONFIG_BOARD_ASUS_KGPE_D16=y
CONFIG_VBOOT=y
CONFIG_DRIVERS_PS2_KEYBOARD=y
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_VBOOT_MEASURED_BOOT=y
CONFIG_VBOOT_MEASURED_BOOT_RUNTIME_DATA="S3NV"
CONFIG_MEASURED_BOOT=y
CONFIG_USER_TPM1=y
CONFIG_TPM_RDRESP_NEED_DELAY=y
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_LINUX_COMMAND_LINE="nohz=on console=ttyS1,115200n8 earlyprintk=ttyS1,115200"
Expand Down
5 changes: 2 additions & 3 deletions config/coreboot-kgpe-d16_workstation-usb_keyboard.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ CONFIG_USE_OPTION_TABLE=y
CONFIG_VENDOR_ASUS=y
CONFIG_UART_FOR_CONSOLE=1
CONFIG_BOARD_ASUS_KGPE_D16=y
CONFIG_VBOOT=y
CONFIG_DRIVERS_PS2_KEYBOARD=y
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_VBOOT_MEASURED_BOOT=y
CONFIG_VBOOT_MEASURED_BOOT_RUNTIME_DATA="S3NV"
CONFIG_MEASURED_BOOT=y
CONFIG_USER_TPM1=y
CONFIG_TPM_RDRESP_NEED_DELAY=y
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_workstation-usb_keyboard/bzImage"
Expand Down
5 changes: 2 additions & 3 deletions config/coreboot-kgpe-d16_workstation.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ CONFIG_USE_OPTION_TABLE=y
CONFIG_VENDOR_ASUS=y
CONFIG_UART_FOR_CONSOLE=1
CONFIG_BOARD_ASUS_KGPE_D16=y
CONFIG_VBOOT=y
CONFIG_DRIVERS_PS2_KEYBOARD=y
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_VBOOT_MEASURED_BOOT=y
CONFIG_VBOOT_MEASURED_BOOT_RUNTIME_DATA="S3NV"
CONFIG_MEASURED_BOOT=y
CONFIG_USER_TPM1=y
CONFIG_TPM_RDRESP_NEED_DELAY=y
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_workstation/bzImage"
Expand Down
3 changes: 3 additions & 0 deletions config/linux-kgpe-d16_workstation.config
Original file line number Diff line number Diff line change
Expand Up @@ -324,3 +324,6 @@ CONFIG_CRC8=m
CONFIG_XZ_DEC_TEST=m
CONFIG_CORDIC=m
CONFIG_IRQ_POLL=y
CONFIG_DRM_NOUVEAU=y
CONFIG_DRM_RADEON=y
CONFIG_DRM_AMDGPU=y
11 changes: 8 additions & 3 deletions patches/coreboot-4.11/0010-cross-compiler-support.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
--- clean/coreboot-4.8.1/Makefile 2018-05-16 21:00:17.000000000 +0200
+++ coreboot-4.8.1/Makefile 2020-01-08 17:01:32.998287979 +0100
@@ -152,6 +152,24 @@
diff --git a/Makefile b/Makefile
index f3f9592649..cb37557c81 100644
--- a/Makefile
+++ b/Makefile
@@ -164,6 +164,24 @@ $(if $(wildcard .xcompile)$(NOCOMPILE),,$(eval $(shell util/xcompile/xcompile $(

-include .xcompile

Expand All @@ -25,3 +27,6 @@
ifneq ($(XCOMPILE_COMPLETE),1)
$(shell rm -f .xcompile)
$(error .xcompile deleted because it's invalid. \
--
2.20.1

129 changes: 0 additions & 129 deletions patches/coreboot-4.11/0020-kgpe-d16-vboot.patch

This file was deleted.

0 comments on commit 66f309e

Please sign in to comment.