From bac1d54bde578c6f76418bca8c4d2e8ae9e8a655 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 23 Oct 2018 08:43:36 -0400 Subject: [PATCH 1/4] Activate dual console by default and restructure board config Changing CONFIG_USB_BOOT_DEV to sdc1, adding back CONFIG_BOOT_STATIC_IP to 192.168.2.3, adding dual console to OpenBMC and tty0 in attempt to have QubesOS graphic installer which complains with no networking when attempting to start VNC Adding dual console to OpenBmc and tty0 putting kgpe-d16-coreboot.conf in defconfig format NO_HZ wasn't included in kernel config. Adding it. Wasn't able to have both console firing up QubesOS gui installer, complaining about hvc1 console errors. Splitting up Workstation and server config. This one works for Worstation Removing serial configuration and static IP stuff since we have a workstation here. Seperate Workstation and Server board configurations until dual console truely works through QubesOS gui installation. kgpe-d16 board config removed until then. Placing files in good directories Corrrect flashrom options for kgpe-d16 server and workstation boards kgpe-d16 linux: NO_HZ_IDLE instead of NO_HZ kgpe-d16: seperate board for workstation to be AST and gui-init based, while kgpe-d16-> kgpe-d16_server kgpe-d16_server: boots, shows ASpeed text on VGA, controllable through BMC via SSH. kgpe-d16_workstation on ASpeed console. WIP. (Includes CIs configs to build server and workstation) kgpe-d16_workstation in defconfig format kgpe-d16 boards: pass from GPG to GPG2 board definitions kgpe-d16_workstation : Adding Cairo and FbWhpitail in board config for gui-init to work in FB mode kgpe-d16: removing plymouth.ignore-serial-consoles to fix server terminal output kgpe-d16: bring par with staging branch https://gitlab.com/tlaurion/heads/commits/kgpe-d16_staging kgpe-d16 : expressively export CONFIG_TPM=n kgpe-d16_wokstation gui-init variables were missing kgpe-d16 boards: add CONFIG_LINUX_USB_COMPANION_CONTROLLER so that usb is recognized linux-kgpe-d16*: add support for Pike kgpe-d16_workstation-usb_keyboard board support addition kgpe-d16_server-whiptail: Add board and dependencies to have gui-init in whiptail (console mode, not FbWhiptail based GitlabCI: kgpe-d16 fixes and upstream merge of change kgpe-d16* board: add statement to fixate coreboot version to 4.8.1 for the moment kgpe-d16: add missing config/linux-kgpe-d16_server-whiptail.config file KGPE-D16: community work migration to coreboot 4.11 to fix issue #740 KGPE-D16 boards: Adding VBOOT+measured boot, musl-cross patch and 4.11 patch brought up per https://github.com/osresearch/heads/pull/709 kgpe-d16* boards: add VBOOT Kconfig patch per @miczyg1 recommendation under https://github.com/osresearch/heads/pull/795#issuecomment-671214637 KGPE-D16* coreboot configs: Add S3NV as a Runtime data whitelist (so that it is not measured at term) per @miczyg1 recommendation under https://github.com/osresearch/heads/pull/795#issuecomment-671214637 kgpe-d16 coreboot 4.11: add https://review.coreboot.org/c/coreboot/+/36908 patch kgpe-d16 boards: add Linux kernel version where missing. CircleCI: Add debug output on fail for kgpe-d16 board builds to bring par with upstream after rebasing on master coreboot module: typo correction (tabs vs spaces) CircleCI: trying to address "g++: fatal error: Killed signal terminated program cc1plus." happening under coreboot 4.11 and coreboot 4.12 builds CircleCI: remove past addition to test recommendation from CircleCI: "resource_class: large" CircleCi: Ok.... lets output dmesg content prior of other logs.... I'm out of ideas. Next step, ask CircleCI for support At this stage: - job's "make --load" is supposed to guarantee that the number of thread doesn't exhaust pass of a load of 2 (medium, free class, CircleCI has 32 cores so possibility of a load of 32) - "--max_old_space_size=4096" in CircleCI environement is supposed to limit memory consumption to 4096Mb of memory, the max of a medium class free tier CircleCI node CircleCI: remove verbose build (no more V=1), in case of failed build, find all logs modified in last minute and output each of them on console. coreboot module: implement load average respect inside of problematic CI build for coreboot 4.11+ being killed in the action (32 cores with 4Gb ram get gcc OOM) coreboot module: replace nproc by number of Gb actually available as number of CPUs, since each thread is expected to have 1Gb of ram. CircleCI & coreboot config: fix merge conflict rebasing on master coreboot 4.11 kgpe-d16 vboot patches addendum, credits goes to @Tonux599 Fix merge conflicts and make sure all boards are inside of CircleCI builds. PoC build for #867 --- .circleci/config.yml | 72 +++- .gitlab-ci.yml.deprecated | 46 ++- boards/kgpe-d16/kgpe-d16.config | 36 -- .../kgpe-d16_server-whiptail.config | 75 ++++ boards/kgpe-d16_server/kgpe-d16_server.config | 59 ++++ .../kgpe-d16_workstation-usb_keyboard.config | 61 ++++ .../kgpe-d16_workstation.config | 58 ++++ .../coreboot-kgpe-d16_server-whiptail.config | 20 ++ ...config => coreboot-kgpe-d16_server.config} | 10 +- ...t-kgpe-d16_workstation-usb_keyboard.config | 20 ++ config/coreboot-kgpe-d16_workstation.config | 20 ++ ... => linux-kgpe-d16_server-whiptail.config} | 7 +- config/linux-kgpe-d16_server.config | 326 ++++++++++++++++++ config/linux-kgpe-d16_workstation.config | 326 ++++++++++++++++++ ...6-smm-Use-PRIxPTR-to-print-uintptr_t.patch | 47 +++ .../0010-cross-compiler-support.patch | 11 +- .../coreboot-4.11/0020-kgpe-d16-vboot.patch | 129 +++++++ ...021-kgpe-d16_c-environment_bootblock.patch | 50 +++ 18 files changed, 1319 insertions(+), 54 deletions(-) delete mode 100644 boards/kgpe-d16/kgpe-d16.config create mode 100644 boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config create mode 100644 boards/kgpe-d16_server/kgpe-d16_server.config create mode 100644 boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config create mode 100644 boards/kgpe-d16_workstation/kgpe-d16_workstation.config create mode 100644 config/coreboot-kgpe-d16_server-whiptail.config rename config/{coreboot-kgpe-d16.config => coreboot-kgpe-d16_server.config} (57%) create mode 100644 config/coreboot-kgpe-d16_workstation-usb_keyboard.config create mode 100644 config/coreboot-kgpe-d16_workstation.config rename config/{linux-kgpe-d16.config => linux-kgpe-d16_server-whiptail.config} (98%) create mode 100644 config/linux-kgpe-d16_server.config create mode 100644 config/linux-kgpe-d16_workstation.config create mode 100644 patches/coreboot-4.11/0001-cpu-x86-smm-Use-PRIxPTR-to-print-uintptr_t.patch create mode 100644 patches/coreboot-4.11/0020-kgpe-d16-vboot.patch create mode 100644 patches/coreboot-4.11/0021-kgpe-d16_c-environment_bootblock.patch diff --git a/.circleci/config.yml b/.circleci/config.yml index 92bc07469..33cabb474 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,6 +59,77 @@ jobs: # - store-artifacts: # path: build/qemu-linuxboot/hashes.txt + - run: + name: kgpe-d16_workstation + command: | + rm -rf build/kgpe-d16_workstation/* build/log/* && \ + make CPUS=4 V=1 BOARD=kgpe-d16_workstation || \ + (find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \ + no_output_timeout: 3h + - run: + name: Ouput kgpe-d16_workstation hashes + command: | + cat build/kgpe-d16_workstation/hashes.txt \ + - run: + name: Archiving build logs for kgpe-d16_workstation + command: | + tar zcvf build/kgpe-d16_workstation/logs.tar.gz build/log/* + - store-artifacts: + path: build/kgpe-d16_workstation + + - run: + name: kgpe-d16_workstation-usb_keyboard + command: | + rm -rf build/kgpe-d16_workstation-usb_keyboard/* build/log/* && \ + make CPUS=4 V=1 BOARD=kgpe-d16_workstation-usb_keyboard || \ + (find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \ + no_output_timeout: 3h + - run: + name: Ouput kgpe-d16_workstation-usb_keyboard hashes + command: | + cat build/kgpe-d16_workstation-usb_keyboard/hashes.txt \ + - run: + name: Archiving build logs for kgpe-d16_workstation-usb_keyboard + command: | + tar zcvf build/kgpe-d16_workstation-usb_keyboard/logs.tar.gz build/log/* + - store-artifacts: + path: build/kgpe-d16_workstation-usb_keyboard + + - run: + name: kgpe-d16_server + command: | + rm -rf build/kgpe-d16_server/* build/log/* && \ + make CPUS=4 V=1 BOARD=kgpe-d16_server || \ + (find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \ + no_output_timeout: 3h + - run: + name: Ouput kgpe-d16_server hashes + command: | + cat build/kgpe-d16_server/hashes.txt \ + - run: + name: Archiving build logs for kgpe-d16_server + command: | + tar zcvf build/kgpe-d16_server/logs.tar.gz build/log/* + - store-artifacts: + path: build/kgpe-d16_server + + - run: + name: kgpe-d16_server-whiptail + command: | + rm -rf build/kgpe-d16_server-whiptail/* build/log/* && \ + make CPUS=4 V=1 BOARD=kgpe-d16_server-whiptail || \ + (find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \ + no_output_timeout: 3h + - run: + name: Ouput kgpe-d16_server-whiptail hashes + command: | + cat build/kgpe-d16_server-whiptail/hashes.txt \ + - run: + name: Archiving build logs for kgpe-d16_server-whiptail + command: | + tar zcvf build/kgpe-d16_server-whiptail/logs.tar.gz build/log/* + - store-artifacts: + path: build/kgpe-d16_server-whiptail - run: name: librem_l1um command: | @@ -121,7 +192,6 @@ jobs: - run: name: x230-flash - #We delete build/make-4.2.1/ directory until issue #799 is fixed. command: | rm -rf build/x230-flash/* build/log/* && make CPUS=4 V=1 BOARD=x230-flash || touch /tmp/failed_build no_output_timeout: 3h diff --git a/.gitlab-ci.yml.deprecated b/.gitlab-ci.yml.deprecated index 545d8b59a..f425d1e52 100644 --- a/.gitlab-ci.yml.deprecated +++ b/.gitlab-ci.yml.deprecated @@ -8,7 +8,7 @@ stages: build: stage: build - retry: 1 + retry: 2 cache: paths: - packages @@ -55,7 +55,6 @@ build: - cat ./build/x230/hashes.txt - echo "Archiving x230 logs..." - tar zcvf ./build/x230/logs.tar.gz ./build/log/* - - echo "Removing old t430 artifacts..." - rm -rf ./build/t430/* - rm -rf ./build/log/* @@ -65,8 +64,43 @@ build: - cat ./build/t430/hashes.txt - echo "Archiving t430 logs..." - tar zcvf ./build/t430/logs.tar.gz ./build/log/* - - - echo "Removing old qemu-coreboot artifacts..." + - echo "Removing old kgpe-d16_workstation artifacts..." + - rm -rf ./build/kgpe-d16_workstation/* + - rm -rf ./build/log/* + - echo "Building BOARD=kgpe-d16_workstation board..." + - make BOARD=kgpe-d16_workstation || (find ./build/log/ -cmin 1|xargs tail; exit 1) + - echo "kgpe-d16_workstation hashes:" + - cat ./build/kgpe-d16_workstation/hashes.txt + - echo "Archiving kgpe-d16_workstation logs..." + - tar zcvf ./build/kgpe-d16_workstation/logs.tar.gz ./build/log/* + - echo "Removing old kgpe-d16_workstation-usb_keyboard artifacts..." + - rm -rf ./build/kgpe-d16_workstation-usb_keyboard/* + - rm -rf ./build/log/* + - echo "Building BOARD=kgpe-d16_workstation-usb_keyboard board..." + - make BOARD=kgpe-d16_workstation || (find ./build/log/ -cmin 1|xargs tail; exit 1) + - echo "kgpe-d16_workstation-usb_keyboard hashes:" + - cat ./build/kgpe-d16_workstation-usb_keyboard/hashes.txt + - echo "Archiving kgpe-d16_workstation-usb_keyboard logs..." + - tar zcvf ./build/kgpe-d16_workstation-usb_keyboard/logs.tar.gz ./build/log/* + - echo "Removing old kgpe-d16_server-whiptail artifacts..." + - rm -rf ./build/kgpe-d16_server-whiptail/* + - rm -rf ./build/log/* + - echo "Building BOARD=kgpe-d16_server-whiptail board..." + - make BOARD=kgpe-d16_server-whiptail || (find ./build/log/ -cmin 1|xargs tail; exit 1) + - echo "kgpe-d16_server-whiptail hashes:" + - cat ./build/kgpe-d16_server-whiptail/hashes.txt + - echo "Archiving kgpe-d16_server-whiptail logs..." + - tar zcvf ./build/kgpe-d16_server-whiptail/logs.tar.gz ./build/log/* + - echo "Removing old kgpe-d16_server artifacts..." + - rm -rf ./build/kgpe-d16_server/* + - rm -rf ./build/log/* + - echo "Building BOARD=kgpe-d16_server board..." + - make BOARD=kgpe-d16_server || (find ./build/log/ -cmin 1|xargs tail; exit 1) + - echo "kgpe-d16_server hashes:" + - cat ./build/kgpe-d16_server/hashes.txt + - echo "Archiving kgpe-d16_server logs..." + - tar zcvf ./build/kgpe-d16_server/logs.tar.gz ./build/log/* + - echo "Removing old qemu-coreboot artifacts..." - rm -rf ./build/qemu-coreboot/* - rm -rf ./build/log/* - echo "Building BOARD=qemu-coreboot board..." @@ -79,9 +113,11 @@ build: - du -shc packages crossgcc build artifacts: paths: + - ./build/kgpe-d16_workstation + - ./build/kgpe-d16_workstation-usb_keyboard + - ./build/kgpe-d16_server - ./build/qemu-coreboot - ./build/x230-flash - ./build/t430-flash - ./build/x230-hotp-verification - ./build/x230 - - ./build/t430 diff --git a/boards/kgpe-d16/kgpe-d16.config b/boards/kgpe-d16/kgpe-d16.config deleted file mode 100644 index 6c2c4ac60..000000000 --- a/boards/kgpe-d16/kgpe-d16.config +++ /dev/null @@ -1,36 +0,0 @@ -# Configuration for a kgpe-d16 running non-Qubes -export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=4.8.1 -export CONFIG_LINUX_VERSION=4.14.62 - -CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16.config -CONFIG_LINUX_CONFIG=config/linux-kgpe-d16.config - -CONFIG_CRYPTSETUP=y -CONFIG_FLASHROM=y -CONFIG_FLASHTOOLS=y -CONFIG_GPG=y -CONFIG_KEXEC=y -CONFIG_UTIL_LINUX=y -CONFIG_LVM2=y -CONFIG_MBEDTLS=y -CONFIG_PCIUTILS=y -CONFIG_POPT=y -CONFIG_QRENCODE=y -CONFIG_TPMTOTP=y -CONFIG_DROPBEAR=y - -CONFIG_LINUX_USB=y -CONFIG_LINUX_E1000E=y - -export CONFIG_BOOTSCRIPT=/bin/generic-init -#export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery - -export CONFIG_BOOT_REQ_HASH=n -export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 " -export CONFIG_BOOT_KERNEL_REMOVE="" -export CONFIG_BOOT_DEV="/dev/sda1" -export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0" -export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal" -#export CONFIG_BOOT_STATIC_IP=192.168.1.2 diff --git a/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config b/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config new file mode 100644 index 000000000..5a5a91ef2 --- /dev/null +++ b/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config @@ -0,0 +1,75 @@ +# Configuration for a kgpe-d16_server with whiptail, permitting usage of gui-init on console without FB graphic +# per https://www.raptorengineering.com/coreboot/kgpe-d16-bmc-port-status.php work, with patches merged into Heads +# +# Tested: ASMBV4 reprogrammed per https://www.raptorengineering.com/coreboot/kgpe-d16-bmc-port-status.php +# +# Status: +# - ASpeed text output given on VGA +# - All console output rerirected to sttyS0 +# - No TPM support while 20-1 TPM 1.2 chips can be ordered. Report status in Heads +# +# - To connect to BMC: https://github.com/osresearch/heads/issues/134#issuecomment-368922440 +# - Please contribute documentation on heads-wiki +# - Please support https://github.com/osresearch/heads/issues/719 +export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.11 +export CONFIG_LINUX_VERSION=4.14.62 + +CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config +CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server-whiptail.config + +CONFIG_CRYPTSETUP=y +CONFIG_FLASHROM=y +CONFIG_FLASHTOOLS=y +CONFIG_GPG2=y +CONFIG_KEXEC=y +CONFIG_UTIL_LINUX=y +CONFIG_LVM2=y +CONFIG_MBEDTLS=y +CONFIG_PCIUTILS=y +CONFIG_POPT=y +CONFIG_QRENCODE=y +CONFIG_TPMTOTP=y +CONFIG_DROPBEAR=y + +#Whiptail +CONFIG_SLANG=y +CONFIG_NEWT=y +#FBWhiptail +#CONFIG_CAIRO=y +#CONFIG_FBWHIPTAIL=y + +CONFIG_LINUX_USB=y +CONFIG_LINUX_E1000E=y +export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y + +export CONFIG_TPM=n +#BOOT SCRIPT SELECTION +#export CONFIG_BOOTSCRIPT=/bin/generic-init +export CONFIG_BOOTSCRIPT=/bin/gui-init +#export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery +export CONFIG_BOOT_GUI_MENU_NAME="KGPE-D16 Heads Boot Menu" +export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0" +export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0" + +#CONSOLE SELECTION +#Single output to OpenBMC +export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 " + +#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" +export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0" +export CONFIG_BOOT_STATIC_IP=192.168.2.3 + + +export CONFIG_BOOT_REQ_HASH=n +export CONFIG_BOOT_REQ_ROLLBACK=n +export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles" +export CONFIG_BOOT_DEV="/dev/sda1" +export CONFIG_USB_BOOT_DEV="/dev/sdb1" + +export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal" +#export CONFIG_BOOT_STATIC_IP=192.168.1.2 diff --git a/boards/kgpe-d16_server/kgpe-d16_server.config b/boards/kgpe-d16_server/kgpe-d16_server.config new file mode 100644 index 000000000..0cc40ba29 --- /dev/null +++ b/boards/kgpe-d16_server/kgpe-d16_server.config @@ -0,0 +1,59 @@ +# Configuration for a kgpe-d16_server +# per https://www.raptorengineering.com/coreboot/kgpe-d16-bmc-port-status.php work, with patches merged into Heads +# +# Tested: ASMBV4 reprogrammed per https://www.raptorengineering.com/coreboot/kgpe-d16-bmc-port-status.php +# +# Status: +# - ASpeed text output given on VGA +# - All console output rerirected to sttyS0 +# - No TPM support while 20-1 TPM 1.2 chips can be ordered. Report status in Heads +# +# - To connect to BMC: https://github.com/osresearch/heads/issues/134#issuecomment-368922440 +# - Please contribute documentation on heads-wiki +# - Please support https://github.com/osresearch/heads/issues/719 +export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.11 +export CONFIG_LINUX_VERSION=4.14.62 + +CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config +CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server.config + +CONFIG_CRYPTSETUP=y +CONFIG_FLASHROM=y +CONFIG_FLASHTOOLS=y +CONFIG_GPG2=y +CONFIG_KEXEC=y +CONFIG_UTIL_LINUX=y +CONFIG_LVM2=y +CONFIG_MBEDTLS=y +CONFIG_PCIUTILS=y +CONFIG_POPT=y +CONFIG_QRENCODE=y +CONFIG_TPMTOTP=y +CONFIG_DROPBEAR=y + +CONFIG_LINUX_USB=y +CONFIG_LINUX_E1000E=y +export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y + +export CONFIG_TPM=n +#BOOT SCRIPT SELECTION +export CONFIG_BOOTSCRIPT=/bin/generic-init +#export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery + +#CONSOLE SELECTION +#Single output to OpenBMC +#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 " +#Dual output to local console (tty0) and OpenBmc (ttyS1) +export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0" +export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0" +export CONFIG_BOOT_STATIC_IP=192.168.2.3 + +export CONFIG_BOOT_REQ_HASH=n +export CONFIG_BOOT_REQ_ROLLBACK=n +export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles" +export CONFIG_BOOT_DEV="/dev/sda1" +export CONFIG_USB_BOOT_DEV="/dev/sdb1" + +export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal" +#export CONFIG_BOOT_STATIC_IP=192.168.1.2 diff --git a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config new file mode 100644 index 000000000..3e89d9b0d --- /dev/null +++ b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config @@ -0,0 +1,61 @@ +# Configuration for a kgpe-d16 with USB keyboard support, FBwhiptail on onboard ASpeed GPU +export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.11 +export CONFIG_LINUX_VERSION=4.14.62 + +CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config +CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config + +CONFIG_CRYPTSETUP=y +CONFIG_FLASHROM=y +CONFIG_FLASHTOOLS=y +CONFIG_GPG2=y +CONFIG_KEXEC=y +CONFIG_UTIL_LINUX=y +CONFIG_LVM2=y +CONFIG_MBEDTLS=y +CONFIG_PCIUTILS=y +CONFIG_POPT=y +CONFIG_QRENCODE=y +CONFIG_TPMTOTP=y +CONFIG_DROPBEAR=y + +#Whiptail +#CONFIG_SLANG=y +#CONFIG_NEWT=y +#FBWhiptail +CONFIG_CAIRO=y +CONFIG_FBWHIPTAIL=y + +CONFIG_LINUX_USB=y +CONFIG_LINUX_E1000E=y +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 +#BOOT SCRIPT SELECTION +#export CONFIG_BOOTSCRIPT=/bin/generic-init +export CONFIG_BOOTSCRIPT=/bin/gui-init +#export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery +export CONFIG_BOOT_GUI_MENU_NAME="KGPE-D16 Heads Boot Menu" +export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0" +export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0" + +#CONSOLE SELECTION +#Single output to OpenBMC +#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 " +#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_RECOVERY_SERIAL="/dev/ttyS0" +#export CONFIG_BOOT_STATIC_IP=192.168.2.3 + +export CONFIG_BOOT_REQ_HASH=n +export CONFIG_BOOT_REQ_ROLLBACK=n +export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles" +export CONFIG_BOOT_DEV="/dev/sda1" +export CONFIG_USB_BOOT_DEV="/dev/sdb1" +export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal" diff --git a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config new file mode 100644 index 000000000..7272841ed --- /dev/null +++ b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config @@ -0,0 +1,58 @@ +# Configuration for a kgpe-d16 running non-Qubes +export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.11 +export CONFIG_LINUX_VERSION=4.14.62 + +CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config +CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config + +CONFIG_CRYPTSETUP=y +CONFIG_FLASHROM=y +CONFIG_FLASHTOOLS=y +CONFIG_GPG2=y +CONFIG_KEXEC=y +CONFIG_UTIL_LINUX=y +CONFIG_LVM2=y +CONFIG_MBEDTLS=y +CONFIG_PCIUTILS=y +CONFIG_POPT=y +CONFIG_QRENCODE=y +CONFIG_TPMTOTP=y +CONFIG_DROPBEAR=y + +#Whiptail +#CONFIG_SLANG=y +#CONFIG_NEWT=y +#FBWhiptail +CONFIG_CAIRO=y +CONFIG_FBWHIPTAIL=y + +CONFIG_LINUX_USB=y +CONFIG_LINUX_E1000E=y +export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y + +export CONFIG_TPM=n +#BOOT SCRIPT SELECTION +#export CONFIG_BOOTSCRIPT=/bin/generic-init +export CONFIG_BOOTSCRIPT=/bin/gui-init +#export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery +export CONFIG_BOOT_GUI_MENU_NAME="KGPE-D16 Heads Boot Menu" +export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0" +export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0" + +#CONSOLE SELECTION +#Single output to OpenBMC +#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 " +#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_RECOVERY_SERIAL="/dev/ttyS0" +#export CONFIG_BOOT_STATIC_IP=192.168.2.3 + +export CONFIG_BOOT_REQ_HASH=n +export CONFIG_BOOT_REQ_ROLLBACK=n +export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles" +export CONFIG_BOOT_DEV="/dev/sda1" +export CONFIG_USB_BOOT_DEV="/dev/sdb1" +export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal" diff --git a/config/coreboot-kgpe-d16_server-whiptail.config b/config/coreboot-kgpe-d16_server-whiptail.config new file mode 100644 index 000000000..caa339c64 --- /dev/null +++ b/config/coreboot-kgpe-d16_server-whiptail.config @@ -0,0 +1,20 @@ +CONFIG_LOCALVERSION="heads" +CONFIG_ANY_TOOLCHAIN=y +CONFIG_USE_OPTION_TABLE=y +# CONFIG_COLLECT_TIMESTAMPS is not set +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_USER_TPM1=y +CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y +CONFIG_PAYLOAD_LINUX=y +CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_server-whiptail/bzImage" +CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0" +CONFIG_LINUX_INITRD="../../build/kgpe-d16_server-whiptail/initrd.cpio.xz" diff --git a/config/coreboot-kgpe-d16.config b/config/coreboot-kgpe-d16_server.config similarity index 57% rename from config/coreboot-kgpe-d16.config rename to config/coreboot-kgpe-d16_server.config index 3c341acd1..338a88247 100644 --- a/config/coreboot-kgpe-d16.config +++ b/config/coreboot-kgpe-d16_server.config @@ -1,14 +1,20 @@ +CONFIG_LOCALVERSION="heads" CONFIG_ANY_TOOLCHAIN=y CONFIG_USE_OPTION_TABLE=y # CONFIG_COLLECT_TIMESTAMPS is not set 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_USER_TPM1=y CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y CONFIG_PAYLOAD_LINUX=y -CONFIG_PAYLOAD_FILE="../../build/kgpe-d16/bzImage" CONFIG_LINUX_COMMAND_LINE="nohz=on console=ttyS1,115200n8 earlyprintk=ttyS1,115200" -CONFIG_LINUX_INITRD="../../build/kgpe-d16/initrd.cpio.xz" +CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_server/bzImage" +CONFIG_LINUX_INITRD="../../build/kgpe-d16_server/initrd.cpio.xz" diff --git a/config/coreboot-kgpe-d16_workstation-usb_keyboard.config b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config new file mode 100644 index 000000000..2d4333351 --- /dev/null +++ b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config @@ -0,0 +1,20 @@ +CONFIG_LOCALVERSION="heads" +CONFIG_ANY_TOOLCHAIN=y +CONFIG_USE_OPTION_TABLE=y +# CONFIG_COLLECT_TIMESTAMPS is not set +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_USER_TPM1=y +CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y +CONFIG_PAYLOAD_LINUX=y +CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_workstation-usb_keyboard/bzImage" +CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0" +CONFIG_LINUX_INITRD="../../build/kgpe-d16_workstation-usb_keyboard/initrd.cpio.xz" diff --git a/config/coreboot-kgpe-d16_workstation.config b/config/coreboot-kgpe-d16_workstation.config new file mode 100644 index 000000000..2104ac28c --- /dev/null +++ b/config/coreboot-kgpe-d16_workstation.config @@ -0,0 +1,20 @@ +CONFIG_LOCALVERSION="heads" +CONFIG_ANY_TOOLCHAIN=y +CONFIG_USE_OPTION_TABLE=y +# CONFIG_COLLECT_TIMESTAMPS is not set +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_USER_TPM1=y +CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y +CONFIG_PAYLOAD_LINUX=y +CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_workstation/bzImage" +CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0" +CONFIG_LINUX_INITRD="../../build/kgpe-d16_workstation/initrd.cpio.xz" diff --git a/config/linux-kgpe-d16.config b/config/linux-kgpe-d16_server-whiptail.config similarity index 98% rename from config/linux-kgpe-d16.config rename to config/linux-kgpe-d16_server-whiptail.config index bef4cfb4d..72354147e 100644 --- a/config/linux-kgpe-d16.config +++ b/config/linux-kgpe-d16_server-whiptail.config @@ -91,6 +91,7 @@ CONFIG_BLK_DEV_SR=y CONFIG_CHR_DEV_SG=y CONFIG_SCSI_SCAN_ASYNC=y CONFIG_ISCSI_TCP=y +CONFIG_SCSI_MPT3SAS=y CONFIG_ATA=y CONFIG_SATA_AHCI=y # CONFIG_ATA_SFF is not set @@ -182,6 +183,7 @@ CONFIG_PTP_1588_CLOCK=y # CONFIG_X86_PKG_TEMP_THERMAL is not set CONFIG_MFD_SYSCON=y CONFIG_DRM=y +CONFIG_DRM_AST=y CONFIG_FB_VESA=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set @@ -193,6 +195,9 @@ CONFIG_USB_XHCI_HCD=m CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_PLATFORM=m +CONFIG_USB_UHCI_HCD=m CONFIG_USB_STORAGE=m CONFIG_RTC_CLASS=y # CONFIG_X86_PLATFORM_DEVICES is not set @@ -204,9 +209,7 @@ CONFIG_GENERIC_PHY=y # CONFIG_BTT is not set # CONFIG_FIRMWARE_MEMMAP is not set # CONFIG_DMIID is not set -# CONFIG_EXT2_FS is not set CONFIG_EXT4_FS=y -CONFIG_EXT4_USE_FOR_EXT2=y # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY_USER is not set CONFIG_ISO9660_FS=y diff --git a/config/linux-kgpe-d16_server.config b/config/linux-kgpe-d16_server.config new file mode 100644 index 000000000..72354147e --- /dev/null +++ b/config/linux-kgpe-d16_server.config @@ -0,0 +1,326 @@ +CONFIG_LOCALVERSION="-heads" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_KERNEL_XZ=y +# CONFIG_SWAP is not set +# CONFIG_CROSS_MEMORY_ATTACH is not set +# CONFIG_FHANDLE is not set +CONFIG_NO_HZ_IDLE=y +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio" +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_SGETMASK_SYSCALL is not set +# CONFIG_SYSFS_SYSCALL is not set +# CONFIG_BASE_FULL is not set +# CONFIG_SIGNALFD is not set +# CONFIG_TIMERFD is not set +# CONFIG_EVENTFD is not set +# CONFIG_AIO is not set +# CONFIG_ADVISE_SYSCALLS is not set +# CONFIG_MEMBARRIER is not set +CONFIG_EMBEDDED=y +# CONFIG_VM_EVENT_COUNTERS is not set +# CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_JUMP_LABEL=y +CONFIG_CC_STACKPROTECTOR_STRONG=y +CONFIG_MODULES=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_SMP=y +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_PROCESSOR_SELECT=y +# CONFIG_CPU_SUP_CENTAUR is not set +CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +# CONFIG_X86_MCE_AMD is not set +# CONFIG_PERF_EVENTS_INTEL_RAPL is not set +# CONFIG_MICROCODE is not set +# CONFIG_SPARSEMEM_VMEMMAP is not set +# CONFIG_COMPACTION is not set +# CONFIG_BOUNCE is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 +CONFIG_X86_PMEM_LEGACY=y +# CONFIG_MTRR is not set +# CONFIG_X86_SMAP is not set +# CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set +# CONFIG_SECCOMP is not set +CONFIG_KEXEC=y +CONFIG_KEXEC_FILE=y +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x1000000 +# CONFIG_MODIFY_LDT_SYSCALL is not set +# CONFIG_SUSPEND is not set +CONFIG_ACPI_VIDEO=y +CONFIG_PCI_MSI=y +# CONFIG_HT_IRQ is not set +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +# CONFIG_COREDUMP is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_SYN_COOKIES=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set +# CONFIG_IPV6 is not set +# CONFIG_WIRELESS is not set +# CONFIG_UEVENT_HELPER is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +# CONFIG_FIRMWARE_IN_KERNEL is not set +# CONFIG_ALLOW_DEV_COREDUMP is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_EEPROM_93CX6=m +CONFIG_INTEL_MEI_ME=m +CONFIG_INTEL_MEI_TXE=m +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=y +CONFIG_CHR_DEV_SG=y +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_ISCSI_TCP=y +CONFIG_SCSI_MPT3SAS=y +CONFIG_ATA=y +CONFIG_SATA_AHCI=y +# CONFIG_ATA_SFF is not set +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_CRYPT=y +CONFIG_DM_VERITY=y +CONFIG_DM_VERITY_FEC=y +CONFIG_NETDEVICES=y +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_ADAPTEC is not set +# CONFIG_NET_VENDOR_AGERE is not set +# CONFIG_NET_VENDOR_ALTEON is not set +# CONFIG_NET_VENDOR_AMAZON is not set +# CONFIG_NET_VENDOR_AMD is not set +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_VENDOR_ATHEROS is not set +# CONFIG_NET_CADENCE is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_BROCADE is not set +# CONFIG_NET_VENDOR_CAVIUM is not set +# CONFIG_NET_VENDOR_CHELSIO is not set +# CONFIG_NET_VENDOR_CISCO is not set +# CONFIG_NET_VENDOR_DEC is not set +# CONFIG_NET_VENDOR_DLINK is not set +# CONFIG_NET_VENDOR_EMULEX is not set +# CONFIG_NET_VENDOR_EZCHIP is not set +# CONFIG_NET_VENDOR_EXAR is not set +# CONFIG_NET_VENDOR_HP is not set +CONFIG_E1000=m +CONFIG_E1000E=m +# CONFIG_NET_VENDOR_I825XX is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MYRI is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_NETRONOME is not set +# CONFIG_NET_VENDOR_NVIDIA is not set +# CONFIG_NET_VENDOR_OKI is not set +# CONFIG_NET_PACKET_ENGINE is not set +# CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_QUALCOMM is not set +# CONFIG_NET_VENDOR_REALTEK is not set +# CONFIG_NET_VENDOR_RENESAS is not set +# CONFIG_NET_VENDOR_RDC is not set +# CONFIG_NET_VENDOR_ROCKER is not set +# CONFIG_NET_VENDOR_SAMSUNG is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SILAN is not set +# CONFIG_NET_VENDOR_SIS is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_SUN is not set +# CONFIG_NET_VENDOR_TEHUTI is not set +# CONFIG_NET_VENDOR_TI is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set +# CONFIG_NET_VENDOR_SYNOPSYS is not set +# CONFIG_USB_NET_DRIVERS is not set +# CONFIG_WLAN is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO_SERPORT is not set +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +# CONFIG_SERIAL_8250_PNP is not set +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_PCI is not set +# CONFIG_SERIAL_8250_LPSS is not set +# CONFIG_SERIAL_8250_MID is not set +CONFIG_TTY_PRINTK=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_TPM=m +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_MUX=m +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_REG=m +# CONFIG_I2C_HELPER_AUTO is not set +CONFIG_I2C_SLAVE=y +CONFIG_PTP_1588_CLOCK=y +# CONFIG_HWMON is not set +# CONFIG_X86_PKG_TEMP_THERMAL is not set +CONFIG_MFD_SYSCON=y +CONFIG_DRM=y +CONFIG_DRM_AST=y +CONFIG_FB_VESA=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_PLATFORM=m +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_STORAGE=m +CONFIG_RTC_CLASS=y +# CONFIG_X86_PLATFORM_DEVICES is not set +CONFIG_INTEL_IOMMU=y +CONFIG_INTEL_IOMMU_SVM=y +CONFIG_GENERIC_PHY=y +# CONFIG_BLK_DEV_PMEM is not set +# CONFIG_ND_BLK is not set +# CONFIG_BTT is not set +# CONFIG_FIRMWARE_MEMMAP is not set +# CONFIG_DMIID is not set +CONFIG_EXT4_FS=y +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY_USER is not set +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +# CONFIG_PROC_SYSCTL is not set +# CONFIG_PROC_PAGE_MONITOR is not set +CONFIG_TMPFS=y +# CONFIG_MISC_FILESYSTEMS is not set +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_UTF8=y +CONFIG_PRINTK_TIME=y +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_DYNAMIC_DEBUG=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF4=y +CONFIG_GDB_SCRIPTS=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +CONFIG_DEBUG_FS=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_WQ_WATCHDOG=y +# CONFIG_SCHED_DEBUG is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_RCU_TRACE is not set +# CONFIG_FTRACE is not set +# CONFIG_STRICT_DEVMEM is not set +# CONFIG_X86_VERBOSE_BOOTUP is not set +# CONFIG_DOUBLEFAULT is not set +CONFIG_IO_DELAY_0XED=y +CONFIG_OPTIMIZE_INLINING=y +# CONFIG_X86_DEBUG_FPU is not set +CONFIG_HARDENED_USERCOPY=y +CONFIG_CRYPTO_RSA=m +CONFIG_CRYPTO_USER=y +CONFIG_CRYPTO_MCRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_LRW=y +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=y +CONFIG_CRYPTO_KEYWRAP=m +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m +CONFIG_CRYPTO_CRC32C_INTEL=y +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m +CONFIG_CRYPTO_POLY1305_X86_64=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1_SSSE3=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m +CONFIG_CRYPTO_AES_NI_INTEL=y +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_X86_64=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m +CONFIG_CRYPTO_DES3_EDE_X86_64=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_CHACHA20_X86_64=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_842=m +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_HASH=y +CONFIG_CRYPTO_DRBG_CTR=y +CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_CRYPTO_USER_API_SKCIPHER=y +CONFIG_CRYPTO_USER_API_RNG=y +CONFIG_CRYPTO_USER_API_AEAD=y +# CONFIG_CRYPTO_HW is not set +# CONFIG_VIRTUALIZATION is not set +CONFIG_CRC_CCITT=m +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_XZ_DEC_TEST=m +CONFIG_CORDIC=m +CONFIG_IRQ_POLL=y diff --git a/config/linux-kgpe-d16_workstation.config b/config/linux-kgpe-d16_workstation.config new file mode 100644 index 000000000..72354147e --- /dev/null +++ b/config/linux-kgpe-d16_workstation.config @@ -0,0 +1,326 @@ +CONFIG_LOCALVERSION="-heads" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_KERNEL_XZ=y +# CONFIG_SWAP is not set +# CONFIG_CROSS_MEMORY_ATTACH is not set +# CONFIG_FHANDLE is not set +CONFIG_NO_HZ_IDLE=y +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio" +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_SGETMASK_SYSCALL is not set +# CONFIG_SYSFS_SYSCALL is not set +# CONFIG_BASE_FULL is not set +# CONFIG_SIGNALFD is not set +# CONFIG_TIMERFD is not set +# CONFIG_EVENTFD is not set +# CONFIG_AIO is not set +# CONFIG_ADVISE_SYSCALLS is not set +# CONFIG_MEMBARRIER is not set +CONFIG_EMBEDDED=y +# CONFIG_VM_EVENT_COUNTERS is not set +# CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_JUMP_LABEL=y +CONFIG_CC_STACKPROTECTOR_STRONG=y +CONFIG_MODULES=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_SMP=y +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_PROCESSOR_SELECT=y +# CONFIG_CPU_SUP_CENTAUR is not set +CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +# CONFIG_X86_MCE_AMD is not set +# CONFIG_PERF_EVENTS_INTEL_RAPL is not set +# CONFIG_MICROCODE is not set +# CONFIG_SPARSEMEM_VMEMMAP is not set +# CONFIG_COMPACTION is not set +# CONFIG_BOUNCE is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 +CONFIG_X86_PMEM_LEGACY=y +# CONFIG_MTRR is not set +# CONFIG_X86_SMAP is not set +# CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set +# CONFIG_SECCOMP is not set +CONFIG_KEXEC=y +CONFIG_KEXEC_FILE=y +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x1000000 +# CONFIG_MODIFY_LDT_SYSCALL is not set +# CONFIG_SUSPEND is not set +CONFIG_ACPI_VIDEO=y +CONFIG_PCI_MSI=y +# CONFIG_HT_IRQ is not set +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +# CONFIG_COREDUMP is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_SYN_COOKIES=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set +# CONFIG_IPV6 is not set +# CONFIG_WIRELESS is not set +# CONFIG_UEVENT_HELPER is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +# CONFIG_FIRMWARE_IN_KERNEL is not set +# CONFIG_ALLOW_DEV_COREDUMP is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_EEPROM_93CX6=m +CONFIG_INTEL_MEI_ME=m +CONFIG_INTEL_MEI_TXE=m +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=y +CONFIG_CHR_DEV_SG=y +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_ISCSI_TCP=y +CONFIG_SCSI_MPT3SAS=y +CONFIG_ATA=y +CONFIG_SATA_AHCI=y +# CONFIG_ATA_SFF is not set +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_CRYPT=y +CONFIG_DM_VERITY=y +CONFIG_DM_VERITY_FEC=y +CONFIG_NETDEVICES=y +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_ADAPTEC is not set +# CONFIG_NET_VENDOR_AGERE is not set +# CONFIG_NET_VENDOR_ALTEON is not set +# CONFIG_NET_VENDOR_AMAZON is not set +# CONFIG_NET_VENDOR_AMD is not set +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_VENDOR_ATHEROS is not set +# CONFIG_NET_CADENCE is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_BROCADE is not set +# CONFIG_NET_VENDOR_CAVIUM is not set +# CONFIG_NET_VENDOR_CHELSIO is not set +# CONFIG_NET_VENDOR_CISCO is not set +# CONFIG_NET_VENDOR_DEC is not set +# CONFIG_NET_VENDOR_DLINK is not set +# CONFIG_NET_VENDOR_EMULEX is not set +# CONFIG_NET_VENDOR_EZCHIP is not set +# CONFIG_NET_VENDOR_EXAR is not set +# CONFIG_NET_VENDOR_HP is not set +CONFIG_E1000=m +CONFIG_E1000E=m +# CONFIG_NET_VENDOR_I825XX is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MYRI is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_NETRONOME is not set +# CONFIG_NET_VENDOR_NVIDIA is not set +# CONFIG_NET_VENDOR_OKI is not set +# CONFIG_NET_PACKET_ENGINE is not set +# CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_QUALCOMM is not set +# CONFIG_NET_VENDOR_REALTEK is not set +# CONFIG_NET_VENDOR_RENESAS is not set +# CONFIG_NET_VENDOR_RDC is not set +# CONFIG_NET_VENDOR_ROCKER is not set +# CONFIG_NET_VENDOR_SAMSUNG is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SILAN is not set +# CONFIG_NET_VENDOR_SIS is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_SUN is not set +# CONFIG_NET_VENDOR_TEHUTI is not set +# CONFIG_NET_VENDOR_TI is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set +# CONFIG_NET_VENDOR_SYNOPSYS is not set +# CONFIG_USB_NET_DRIVERS is not set +# CONFIG_WLAN is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO_SERPORT is not set +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +# CONFIG_SERIAL_8250_PNP is not set +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_PCI is not set +# CONFIG_SERIAL_8250_LPSS is not set +# CONFIG_SERIAL_8250_MID is not set +CONFIG_TTY_PRINTK=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_TPM=m +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_MUX=m +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_REG=m +# CONFIG_I2C_HELPER_AUTO is not set +CONFIG_I2C_SLAVE=y +CONFIG_PTP_1588_CLOCK=y +# CONFIG_HWMON is not set +# CONFIG_X86_PKG_TEMP_THERMAL is not set +CONFIG_MFD_SYSCON=y +CONFIG_DRM=y +CONFIG_DRM_AST=y +CONFIG_FB_VESA=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_PLATFORM=m +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_STORAGE=m +CONFIG_RTC_CLASS=y +# CONFIG_X86_PLATFORM_DEVICES is not set +CONFIG_INTEL_IOMMU=y +CONFIG_INTEL_IOMMU_SVM=y +CONFIG_GENERIC_PHY=y +# CONFIG_BLK_DEV_PMEM is not set +# CONFIG_ND_BLK is not set +# CONFIG_BTT is not set +# CONFIG_FIRMWARE_MEMMAP is not set +# CONFIG_DMIID is not set +CONFIG_EXT4_FS=y +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY_USER is not set +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +# CONFIG_PROC_SYSCTL is not set +# CONFIG_PROC_PAGE_MONITOR is not set +CONFIG_TMPFS=y +# CONFIG_MISC_FILESYSTEMS is not set +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_UTF8=y +CONFIG_PRINTK_TIME=y +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_DYNAMIC_DEBUG=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF4=y +CONFIG_GDB_SCRIPTS=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +CONFIG_DEBUG_FS=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_WQ_WATCHDOG=y +# CONFIG_SCHED_DEBUG is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_RCU_TRACE is not set +# CONFIG_FTRACE is not set +# CONFIG_STRICT_DEVMEM is not set +# CONFIG_X86_VERBOSE_BOOTUP is not set +# CONFIG_DOUBLEFAULT is not set +CONFIG_IO_DELAY_0XED=y +CONFIG_OPTIMIZE_INLINING=y +# CONFIG_X86_DEBUG_FPU is not set +CONFIG_HARDENED_USERCOPY=y +CONFIG_CRYPTO_RSA=m +CONFIG_CRYPTO_USER=y +CONFIG_CRYPTO_MCRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_LRW=y +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=y +CONFIG_CRYPTO_KEYWRAP=m +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m +CONFIG_CRYPTO_CRC32C_INTEL=y +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m +CONFIG_CRYPTO_POLY1305_X86_64=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1_SSSE3=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m +CONFIG_CRYPTO_AES_NI_INTEL=y +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_X86_64=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m +CONFIG_CRYPTO_DES3_EDE_X86_64=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_CHACHA20_X86_64=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_842=m +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_HASH=y +CONFIG_CRYPTO_DRBG_CTR=y +CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_CRYPTO_USER_API_SKCIPHER=y +CONFIG_CRYPTO_USER_API_RNG=y +CONFIG_CRYPTO_USER_API_AEAD=y +# CONFIG_CRYPTO_HW is not set +# CONFIG_VIRTUALIZATION is not set +CONFIG_CRC_CCITT=m +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_XZ_DEC_TEST=m +CONFIG_CORDIC=m +CONFIG_IRQ_POLL=y diff --git a/patches/coreboot-4.11/0001-cpu-x86-smm-Use-PRIxPTR-to-print-uintptr_t.patch b/patches/coreboot-4.11/0001-cpu-x86-smm-Use-PRIxPTR-to-print-uintptr_t.patch new file mode 100644 index 000000000..b8e0f3569 --- /dev/null +++ b/patches/coreboot-4.11/0001-cpu-x86-smm-Use-PRIxPTR-to-print-uintptr_t.patch @@ -0,0 +1,47 @@ +From 06f2fcc0ffc1a903f304d8a3382f3a57163989a1 Mon Sep 17 00:00:00 2001 +From: Jacob Garber +Date: Mon, 4 Nov 2019 09:35:15 -0700 +Subject: [PATCH] cpu/x86/smm: Use PRIxPTR to print uintptr_t + +Since 'base' is a uintptr_t, it needs the PRIxPTR format specifier. This +fixes a compilation error when targeting x86_64 or using Clang 9.0.0. + +Change-Id: Ib806e2b3cbb255ef208b361744ac4547b8ba262f +Signed-off-by: Jacob Garber +Reviewed-on: https://review.coreboot.org/c/coreboot/+/36785 +Tested-by: build bot (Jenkins) +Reviewed-by: HAOUAS Elyes +--- + src/cpu/x86/smm/tseg_region.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/cpu/x86/smm/tseg_region.c b/src/cpu/x86/smm/tseg_region.c +index a8b8bb7b9a..5b5c5729d5 100644 +--- a/src/cpu/x86/smm/tseg_region.c ++++ b/src/cpu/x86/smm/tseg_region.c +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + /* + * Subregions within SMM +@@ -88,11 +89,11 @@ void smm_list_regions(void) + return; + + printk(BIOS_DEBUG, "SMM Memory Map\n"); +- printk(BIOS_DEBUG, "SMRAM : 0x%zx 0x%zx\n", base, size); ++ printk(BIOS_DEBUG, "SMRAM : 0x%" PRIxPTR " 0x%zx\n", base, size); + + for (i = 0; i < SMM_SUBREGION_NUM; i++) { + if (smm_subregion(i, &base, &size)) + continue; +- printk(BIOS_DEBUG, " Subregion %d: 0x%zx 0x%zx\n", i, base, size); ++ printk(BIOS_DEBUG, " Subregion %d: 0x%" PRIxPTR " 0x%zx\n", i, base, size); + } + } +-- +2.21.1 + + diff --git a/patches/coreboot-4.11/0010-cross-compiler-support.patch b/patches/coreboot-4.11/0010-cross-compiler-support.patch index aa925348b..b99941df7 100644 --- a/patches/coreboot-4.11/0010-cross-compiler-support.patch +++ b/patches/coreboot-4.11/0010-cross-compiler-support.patch @@ -1,8 +1,6 @@ -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 $( +--- 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 @@ -include .xcompile @@ -27,6 +25,3 @@ index f3f9592649..cb37557c81 100644 ifneq ($(XCOMPILE_COMPLETE),1) $(shell rm -f .xcompile) $(error .xcompile deleted because it's invalid. \ --- -2.20.1 - diff --git a/patches/coreboot-4.11/0020-kgpe-d16-vboot.patch b/patches/coreboot-4.11/0020-kgpe-d16-vboot.patch new file mode 100644 index 000000000..e46eb3855 --- /dev/null +++ b/patches/coreboot-4.11/0020-kgpe-d16-vboot.patch @@ -0,0 +1,129 @@ +diff --git a/src/mainboard/asus/kgpe-d16/Kconfig b/src/mainboard/asus/kgpe-d16/Kconfig +index ffbfd53169..45e1a55b88 100644 +--- a/src/mainboard/asus/kgpe-d16/Kconfig ++++ b/src/mainboard/asus/kgpe-d16/Kconfig +@@ -34,6 +34,31 @@ config BOARD_SPECIFIC_OPTIONS + select POWER_STATE_DEFAULT_ON_AFTER_FAILURE + select IPMI_KCS + ++ select TPM1 ++ ++ select VBOOT ++ select VBOOT_VBNV_CMOS ++ select VBOOT_NO_BOARD_SUPPORT ++ #select GBB_FLAG_DISABLE_LID_SHUTDOWN ++ #select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC ++ #select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC ++ #select GBB_FLAG_DISABLE_FWMP ++ select RTC ++ select VBOOT_STARTS_IN_ROMSTAGE ++ select VBOOT_MEASURED_BOOT ++ ++config VBOOT_VBNV_OFFSET ++ hex ++ default 0x2f ++ ++config FMDFILE ++ string ++ default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT ++ ++config VBOOT_MEASURED_BOOT_RUNTIME_DATA ++ string ++ default "S3NV" ++ + config MAINBOARD_DIR + string + default "asus/kgpe-d16" +diff --git a/src/mainboard/asus/kgpe-d16/cmos.layout b/src/mainboard/asus/kgpe-d16/cmos.layout +index 1c8d4662c3..2a2f11c574 100644 +--- a/src/mainboard/asus/kgpe-d16/cmos.layout ++++ b/src/mainboard/asus/kgpe-d16/cmos.layout +@@ -54,6 +54,13 @@ entries + 481 1 e 1 experimental_memory_speed_boost + 482 1 r 0 allow_spd_nvram_cache_restore + 483 4 h 0 maximum_p_state_limit ++ ++ ++# VBOOT ++488 128 r 0 vbnv ++ ++ ++ + 728 256 h 0 user_data + 984 16 h 0 check_sum + # Reserve the extended AMD configuration registers +diff --git a/src/mainboard/asus/kgpe-d16/vboot-rwa.fmd b/src/mainboard/asus/kgpe-d16/vboot-rwa.fmd +new file mode 100644 +index 0000000000..1b666000cf +--- /dev/null ++++ b/src/mainboard/asus/kgpe-d16/vboot-rwa.fmd +@@ -0,0 +1,24 @@ ++FLASH@0xff800000 0x800000 { ++ SI_ALL@0x0 0x500000 { ++ SI_DESC@0x0 0x1000 ++ SI_GBE@0x1000 0x2000 ++ SI_ME@0x3000 0x4ed000 ++ } ++ SI_BIOS@0x500000 0x300000 { ++ UNIFIED_MRC_CACHE@0x180000 0x20000 { ++ RECOVERY_MRC_CACHE@0x0 0x10000 ++ RW_MRC_CACHE@0x10000 0x10000 ++ } ++ RW_VPD(PRESERVE)@0x1a0000 0x1000 ++ SMMSTORE(PRESERVE)@0x1a1000 0x40000 ++ ++ WP_RO@0x1e1000 0x11f000 { ++ FMAP@0x0 0x800 ++ RO_FRID@0x800 0x40 ++ RO_PADDING@0x840 0x7c0 ++ RO_VPD(PRESERVE)@0x1000 0x1000 ++ GBB@0x2000 0x1e000 ++ COREBOOT(CBFS)@0x20000 0xff000 ++ } ++ } ++} +diff --git a/src/southbridge/amd/sb700/Makefile.inc b/src/southbridge/amd/sb700/Makefile.inc +index 0a20a8c8b3..c1cd41678a 100644 +--- a/src/southbridge/amd/sb700/Makefile.inc ++++ b/src/southbridge/amd/sb700/Makefile.inc +@@ -24,4 +24,8 @@ romstage-y += smbus.c + romstage-y += ramtop.c + ramstage-y += ramtop.c + ++romstage-y += pmutil.c ++verstage-y += pmutil.c ++ramstage-y += pmutil.c ++ + endif +diff --git a/src/southbridge/amd/sb700/pmutil.c b/src/southbridge/amd/sb700/pmutil.c +new file mode 100644 +index 0000000000..2c2db3df43 +--- /dev/null ++++ b/src/southbridge/amd/sb700/pmutil.c +@@ -0,0 +1,25 @@ ++/* ++ * This file is part of the coreboot project. ++ * ++ * Copyright 2017 Google Inc. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; version 2 of the License. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++ ++int vbnv_cmos_failed(void) ++{ ++ /* If CMOS power has failed, the century will be set to 0xff */ ++ return cmos_read(RTC_CLK_ALTCENTURY) == 0xff; ++} + diff --git a/patches/coreboot-4.11/0021-kgpe-d16_c-environment_bootblock.patch b/patches/coreboot-4.11/0021-kgpe-d16_c-environment_bootblock.patch new file mode 100644 index 000000000..c674c2798 --- /dev/null +++ b/patches/coreboot-4.11/0021-kgpe-d16_c-environment_bootblock.patch @@ -0,0 +1,50 @@ +From 92023c6cfc3db86f9236a01897754a1579afdf64 Mon Sep 17 00:00:00 2001 +From: Arthur Heymans +Date: Sun, 17 Nov 2019 12:20:30 +0100 +Subject: [PATCH] lib/fmap.c: Properly handle cache for + !C_ENVIRONMENT_BOOTBLOCK + +On platforms without C_ENVIRONMENT_BOOTBLOCK the first stage +accessing FMAP is romstage. + +Change-Id: I7d70585b0c076707e73e20c2ed3f11e4c9ffdf37 +Signed-off-by: Arthur Heymans +--- + src/lib/fmap.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/src/lib/fmap.c b/src/lib/fmap.c +index 48aab8f3d5..06e9e202b6 100644 +--- a/src/lib/fmap.c ++++ b/src/lib/fmap.c +@@ -58,6 +58,12 @@ static void report(const struct fmap *fmap) + car_set_var(fmap_print_once, 1); + } + ++#if CONFIG(C_ENVIRONMENT_BOOTBLOCK) ++#define FIRST_C_STAGE ENV_BOOTBLOCK ++#else ++#define FIRST_C_STAGE ENV_ROMSTAGE ++#endif ++ + static void setup_preram_cache(struct mem_region_device *cache_mrdev) + { + if (CONFIG(NO_FMAP_CACHE)) +@@ -81,10 +87,10 @@ static void setup_preram_cache(struct mem_region_device *cache_mrdev) + } + + struct fmap *fmap = (struct fmap *)_fmap_cache; +- if (!ENV_BOOTBLOCK) { +- /* NOTE: This assumes that for all platforms running this code, +- the bootblock is the first stage and the bootblock will make +- at least one FMAP access (usually from finding CBFS). */ ++ /* NOTE: This assumes that for all platforms running this code, ++ the first stage running in a C (!romcc) environment does ++ at least one FMAP access (usually from finding CBFS). */ ++ if (!FIRST_C_STAGE) { + if (!check_signature(fmap)) + goto register_cache; + +-- +2.20.1 + From 6bd3f815e4897d263e243821102fd24d7d27b049 Mon Sep 17 00:00:00 2001 From: Thomas Clarke Date: Tue, 22 Sep 2020 23:54:57 +0100 Subject: [PATCH 2/4] Better vboot-rwa.fmd for KGPE-D16. 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. --- .../kgpe-d16_server-whiptail.config | 2 +- boards/kgpe-d16_server/kgpe-d16_server.config | 2 +- .../kgpe-d16_workstation-usb_keyboard.config | 4 +- .../kgpe-d16_workstation.config | 4 +- .../coreboot-kgpe-d16_server-whiptail.config | 5 +- config/coreboot-kgpe-d16_server.config | 5 +- ...t-kgpe-d16_workstation-usb_keyboard.config | 5 +- config/coreboot-kgpe-d16_workstation.config | 5 +- config/linux-kgpe-d16_workstation.config | 3 + .../0010-cross-compiler-support.patch | 11 +- .../coreboot-4.11/0020-kgpe-d16-vboot.patch | 129 ------------------ 11 files changed, 25 insertions(+), 150 deletions(-) delete mode 100644 patches/coreboot-4.11/0020-kgpe-d16-vboot.patch diff --git a/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config b/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config index 5a5a91ef2..8e495b243 100644 --- a/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config +++ b/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config @@ -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 diff --git a/boards/kgpe-d16_server/kgpe-d16_server.config b/boards/kgpe-d16_server/kgpe-d16_server.config index 0cc40ba29..0c69cd8c3 100644 --- a/boards/kgpe-d16_server/kgpe-d16_server.config +++ b/boards/kgpe-d16_server/kgpe-d16_server.config @@ -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 diff --git a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config index 3e89d9b0d..336c46146 100644 --- a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config +++ b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config @@ -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 @@ -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 diff --git a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config index 7272841ed..3a7e93dec 100644 --- a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config +++ b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config @@ -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 @@ -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 diff --git a/config/coreboot-kgpe-d16_server-whiptail.config b/config/coreboot-kgpe-d16_server-whiptail.config index caa339c64..fca9d9102 100644 --- a/config/coreboot-kgpe-d16_server-whiptail.config +++ b/config/coreboot-kgpe-d16_server-whiptail.config @@ -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" diff --git a/config/coreboot-kgpe-d16_server.config b/config/coreboot-kgpe-d16_server.config index 338a88247..17ba13af7 100644 --- a/config/coreboot-kgpe-d16_server.config +++ b/config/coreboot-kgpe-d16_server.config @@ -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" diff --git a/config/coreboot-kgpe-d16_workstation-usb_keyboard.config b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config index 2d4333351..75b0fb239 100644 --- a/config/coreboot-kgpe-d16_workstation-usb_keyboard.config +++ b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config @@ -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" diff --git a/config/coreboot-kgpe-d16_workstation.config b/config/coreboot-kgpe-d16_workstation.config index 2104ac28c..a3a1f33d1 100644 --- a/config/coreboot-kgpe-d16_workstation.config +++ b/config/coreboot-kgpe-d16_workstation.config @@ -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" diff --git a/config/linux-kgpe-d16_workstation.config b/config/linux-kgpe-d16_workstation.config index 72354147e..94654a49f 100644 --- a/config/linux-kgpe-d16_workstation.config +++ b/config/linux-kgpe-d16_workstation.config @@ -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 diff --git a/patches/coreboot-4.11/0010-cross-compiler-support.patch b/patches/coreboot-4.11/0010-cross-compiler-support.patch index b99941df7..aa925348b 100644 --- a/patches/coreboot-4.11/0010-cross-compiler-support.patch +++ b/patches/coreboot-4.11/0010-cross-compiler-support.patch @@ -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 @@ -25,3 +27,6 @@ ifneq ($(XCOMPILE_COMPLETE),1) $(shell rm -f .xcompile) $(error .xcompile deleted because it's invalid. \ +-- +2.20.1 + diff --git a/patches/coreboot-4.11/0020-kgpe-d16-vboot.patch b/patches/coreboot-4.11/0020-kgpe-d16-vboot.patch deleted file mode 100644 index e46eb3855..000000000 --- a/patches/coreboot-4.11/0020-kgpe-d16-vboot.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/src/mainboard/asus/kgpe-d16/Kconfig b/src/mainboard/asus/kgpe-d16/Kconfig -index ffbfd53169..45e1a55b88 100644 ---- a/src/mainboard/asus/kgpe-d16/Kconfig -+++ b/src/mainboard/asus/kgpe-d16/Kconfig -@@ -34,6 +34,31 @@ config BOARD_SPECIFIC_OPTIONS - select POWER_STATE_DEFAULT_ON_AFTER_FAILURE - select IPMI_KCS - -+ select TPM1 -+ -+ select VBOOT -+ select VBOOT_VBNV_CMOS -+ select VBOOT_NO_BOARD_SUPPORT -+ #select GBB_FLAG_DISABLE_LID_SHUTDOWN -+ #select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC -+ #select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC -+ #select GBB_FLAG_DISABLE_FWMP -+ select RTC -+ select VBOOT_STARTS_IN_ROMSTAGE -+ select VBOOT_MEASURED_BOOT -+ -+config VBOOT_VBNV_OFFSET -+ hex -+ default 0x2f -+ -+config FMDFILE -+ string -+ default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT -+ -+config VBOOT_MEASURED_BOOT_RUNTIME_DATA -+ string -+ default "S3NV" -+ - config MAINBOARD_DIR - string - default "asus/kgpe-d16" -diff --git a/src/mainboard/asus/kgpe-d16/cmos.layout b/src/mainboard/asus/kgpe-d16/cmos.layout -index 1c8d4662c3..2a2f11c574 100644 ---- a/src/mainboard/asus/kgpe-d16/cmos.layout -+++ b/src/mainboard/asus/kgpe-d16/cmos.layout -@@ -54,6 +54,13 @@ entries - 481 1 e 1 experimental_memory_speed_boost - 482 1 r 0 allow_spd_nvram_cache_restore - 483 4 h 0 maximum_p_state_limit -+ -+ -+# VBOOT -+488 128 r 0 vbnv -+ -+ -+ - 728 256 h 0 user_data - 984 16 h 0 check_sum - # Reserve the extended AMD configuration registers -diff --git a/src/mainboard/asus/kgpe-d16/vboot-rwa.fmd b/src/mainboard/asus/kgpe-d16/vboot-rwa.fmd -new file mode 100644 -index 0000000000..1b666000cf ---- /dev/null -+++ b/src/mainboard/asus/kgpe-d16/vboot-rwa.fmd -@@ -0,0 +1,24 @@ -+FLASH@0xff800000 0x800000 { -+ SI_ALL@0x0 0x500000 { -+ SI_DESC@0x0 0x1000 -+ SI_GBE@0x1000 0x2000 -+ SI_ME@0x3000 0x4ed000 -+ } -+ SI_BIOS@0x500000 0x300000 { -+ UNIFIED_MRC_CACHE@0x180000 0x20000 { -+ RECOVERY_MRC_CACHE@0x0 0x10000 -+ RW_MRC_CACHE@0x10000 0x10000 -+ } -+ RW_VPD(PRESERVE)@0x1a0000 0x1000 -+ SMMSTORE(PRESERVE)@0x1a1000 0x40000 -+ -+ WP_RO@0x1e1000 0x11f000 { -+ FMAP@0x0 0x800 -+ RO_FRID@0x800 0x40 -+ RO_PADDING@0x840 0x7c0 -+ RO_VPD(PRESERVE)@0x1000 0x1000 -+ GBB@0x2000 0x1e000 -+ COREBOOT(CBFS)@0x20000 0xff000 -+ } -+ } -+} -diff --git a/src/southbridge/amd/sb700/Makefile.inc b/src/southbridge/amd/sb700/Makefile.inc -index 0a20a8c8b3..c1cd41678a 100644 ---- a/src/southbridge/amd/sb700/Makefile.inc -+++ b/src/southbridge/amd/sb700/Makefile.inc -@@ -24,4 +24,8 @@ romstage-y += smbus.c - romstage-y += ramtop.c - ramstage-y += ramtop.c - -+romstage-y += pmutil.c -+verstage-y += pmutil.c -+ramstage-y += pmutil.c -+ - endif -diff --git a/src/southbridge/amd/sb700/pmutil.c b/src/southbridge/amd/sb700/pmutil.c -new file mode 100644 -index 0000000000..2c2db3df43 ---- /dev/null -+++ b/src/southbridge/amd/sb700/pmutil.c -@@ -0,0 +1,25 @@ -+/* -+ * This file is part of the coreboot project. -+ * -+ * Copyright 2017 Google Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; version 2 of the License. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#include -+#include -+#include -+#include -+ -+int vbnv_cmos_failed(void) -+{ -+ /* If CMOS power has failed, the century will be set to 0xff */ -+ return cmos_read(RTC_CLK_ALTCENTURY) == 0xff; -+} - From 9f751f11feea0506bd50595738a90f63d0e9b141 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sun, 25 Oct 2020 12:26:46 -0400 Subject: [PATCH 3/4] KGPE-D16: fix coreboot config to have LOCAL_VERSION injected since not defined, describe better board configs applications --- .../kgpe-d16_server-whiptail.config | 4 +++- boards/kgpe-d16_server/kgpe-d16_server.config | 2 +- .../kgpe-d16_workstation-usb_keyboard.config | 12 ++++++++++-- .../kgpe-d16_workstation.config | 14 +++++++++++++- config/coreboot-kgpe-d16_server-whiptail.config | 1 - config/coreboot-kgpe-d16_server.config | 1 - ...reboot-kgpe-d16_workstation-usb_keyboard.config | 1 - config/coreboot-kgpe-d16_workstation.config | 1 - 8 files changed, 27 insertions(+), 9 deletions(-) diff --git a/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config b/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config index 8e495b243..5ebc96be0 100644 --- a/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config +++ b/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config @@ -6,11 +6,13 @@ # Status: # - ASpeed text output given on VGA # - All console output rerirected to sttyS0 -# - No TPM support while 20-1 TPM 1.2 chips can be ordered. Report status in Heads +# - TPM support in romstage (not bootblock) with TPM SLB9635 TT 1.2 by Infineon # # - To connect to BMC: https://github.com/osresearch/heads/issues/134#issuecomment-368922440 # - Please contribute documentation on heads-wiki # - Please support https://github.com/osresearch/heads/issues/719 +# - Disk Unlock Key released by TPM since not deactivated + export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.11 export CONFIG_LINUX_VERSION=4.14.62 diff --git a/boards/kgpe-d16_server/kgpe-d16_server.config b/boards/kgpe-d16_server/kgpe-d16_server.config index 0c69cd8c3..dafa7672a 100644 --- a/boards/kgpe-d16_server/kgpe-d16_server.config +++ b/boards/kgpe-d16_server/kgpe-d16_server.config @@ -6,7 +6,7 @@ # Status: # - ASpeed text output given on VGA # - All console output rerirected to sttyS0 -# - No TPM support while 20-1 TPM 1.2 chips can be ordered. Report status in Heads +# - TPM support in romstage (not bootblock) with TPM SLB9635 TT 1.2 by Infineon # # - To connect to BMC: https://github.com/osresearch/heads/issues/134#issuecomment-368922440 # - Please contribute documentation on heads-wiki diff --git a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config index 336c46146..b035ce51e 100644 --- a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config +++ b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config @@ -1,4 +1,12 @@ -# Configuration for a kgpe-d16 with USB keyboard support, FBwhiptail on onboard ASpeed GPU +# Configuration for a kgpe-d16_workstation-usb_keyboard +# Linux configuration supporting Nvidia, AMD GPUs, enforcing post on nvidia. +# Please make sure jumper forces external GPU +# +# Status: +# - TPM support in romstage (not bootblock) with TPM SLB9635 TT 1.2 by Infineon +# - USB ealy support activated for USB keyboard +# - Disk Unlock Key released by TPM since not deactivated + export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.11 export CONFIG_LINUX_VERSION=4.14.62 @@ -33,7 +41,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=y #BOOT SCRIPT SELECTION #export CONFIG_BOOTSCRIPT=/bin/generic-init diff --git a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config index 3a7e93dec..17391ba69 100644 --- a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config +++ b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config @@ -1,4 +1,16 @@ -# Configuration for a kgpe-d16 running non-Qubes +# Configuration for a kgpe-d16_workstation +# Linux configuration supporting Nvidia, AMD GPUs, enforcing post on nvidia. +# Please make sure jumper forces external GPU +# +# +# Status: +# - TPM support in romstage (not bootblock) with TPM SLB9635 TT 1.2 by Infineon +# - To connect to BMC: https://github.com/osresearch/heads/issues/134#issuecomment-368922440 +# - Please contribute documentation on heads-wiki +# - Please support https://github.com/osresearch/heads/issues/719 +# - Disk Unlock Key released by TPM since not deactivated + + export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.11 export CONFIG_LINUX_VERSION=4.14.62 diff --git a/config/coreboot-kgpe-d16_server-whiptail.config b/config/coreboot-kgpe-d16_server-whiptail.config index fca9d9102..249774ef9 100644 --- a/config/coreboot-kgpe-d16_server-whiptail.config +++ b/config/coreboot-kgpe-d16_server-whiptail.config @@ -1,4 +1,3 @@ -CONFIG_LOCALVERSION="heads" CONFIG_ANY_TOOLCHAIN=y CONFIG_USE_OPTION_TABLE=y # CONFIG_COLLECT_TIMESTAMPS is not set diff --git a/config/coreboot-kgpe-d16_server.config b/config/coreboot-kgpe-d16_server.config index 17ba13af7..7d6d8e643 100644 --- a/config/coreboot-kgpe-d16_server.config +++ b/config/coreboot-kgpe-d16_server.config @@ -1,4 +1,3 @@ -CONFIG_LOCALVERSION="heads" CONFIG_ANY_TOOLCHAIN=y CONFIG_USE_OPTION_TABLE=y # CONFIG_COLLECT_TIMESTAMPS is not set diff --git a/config/coreboot-kgpe-d16_workstation-usb_keyboard.config b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config index 75b0fb239..07a3b5523 100644 --- a/config/coreboot-kgpe-d16_workstation-usb_keyboard.config +++ b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config @@ -1,4 +1,3 @@ -CONFIG_LOCALVERSION="heads" CONFIG_ANY_TOOLCHAIN=y CONFIG_USE_OPTION_TABLE=y # CONFIG_COLLECT_TIMESTAMPS is not set diff --git a/config/coreboot-kgpe-d16_workstation.config b/config/coreboot-kgpe-d16_workstation.config index a3a1f33d1..b284c8081 100644 --- a/config/coreboot-kgpe-d16_workstation.config +++ b/config/coreboot-kgpe-d16_workstation.config @@ -1,4 +1,3 @@ -CONFIG_LOCALVERSION="heads" CONFIG_ANY_TOOLCHAIN=y CONFIG_USE_OPTION_TABLE=y # CONFIG_COLLECT_TIMESTAMPS is not set From 572f5b341497785c700be8ecb16debfd189e83ff Mon Sep 17 00:00:00 2001 From: Thomas Clarke Date: Mon, 26 Oct 2020 18:14:03 +0000 Subject: [PATCH 4/4] On KGPE-D16 boards, ensure linux-kgpe-d16*.config are up-to-date by: cp config/linux.. ./build/linux*/.config cd build/linux* make savedefconfig cp defconfig ../../config/linux.. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resulting in only linux-kgpe-d16_workstation.config being updated. For KGPE-D16 workstation boards: Remove `console=tty0` from `CONFIG_BOOT_KERNEL_ADD` as was blocking Qubes graphical installer (CLI installer was launched). Comment out `export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"` to provide a more desktop like experience. Removed 0001-cpu-x86-smm-Use-PRIxPTR-to-print-uintptr_t.patch as already exists as 0000-cpu-x86-smm-Use-PRIxPTR-to-print-uintptr_t.patch Added 0020-kgpe-d16_measured-boot-support.patch for coreboot 4.11 Fix TPM errors when microcode is measured by initialising TPM earlier and loading the microcode later. Thanks to Michał Żygowski for condition suggestion: `if (CONFIG(MEASURED_BOOT) && CONFIG(LPC_TPM) && boot_cpu())` Locate bootblock location and size with CBFS API. Credit to: Michał Żygowski --- .../kgpe-d16_workstation-usb_keyboard.config | 4 +- .../kgpe-d16_workstation.config | 4 +- config/linux-kgpe-d16_workstation.config | 11 +-- ...6-smm-Use-PRIxPTR-to-print-uintptr_t.patch | 47 ------------- .../0020-kgpe-d16_measured-boot-support.patch | 67 +++++++++++++++++++ 5 files changed, 74 insertions(+), 59 deletions(-) delete mode 100644 patches/coreboot-4.11/0001-cpu-x86-smm-Use-PRIxPTR-to-print-uintptr_t.patch create mode 100644 patches/coreboot-4.11/0020-kgpe-d16_measured-boot-support.patch diff --git a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config index b035ce51e..65caf4222 100644 --- a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config +++ b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config @@ -57,13 +57,13 @@ 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 nouveau.config=NvForcePost=1" +export CONFIG_BOOT_KERNEL_ADD="nohz=on nouveau.config=NvForcePost=1" #export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0" #export CONFIG_BOOT_STATIC_IP=192.168.2.3 export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles" +#export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles" export CONFIG_BOOT_DEV="/dev/sda1" export CONFIG_USB_BOOT_DEV="/dev/sdb1" export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal" diff --git a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config index 17391ba69..1c492defd 100644 --- a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config +++ b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config @@ -58,13 +58,13 @@ 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 nouveau.config=NvForcePost=1" +export CONFIG_BOOT_KERNEL_ADD="nohz=on nouveau.config=NvForcePost=1" #export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0" #export CONFIG_BOOT_STATIC_IP=192.168.2.3 export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles" +#export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles" export CONFIG_BOOT_DEV="/dev/sda1" export CONFIG_USB_BOOT_DEV="/dev/sdb1" export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal" diff --git a/config/linux-kgpe-d16_workstation.config b/config/linux-kgpe-d16_workstation.config index 94654a49f..81e6eaa47 100644 --- a/config/linux-kgpe-d16_workstation.config +++ b/config/linux-kgpe-d16_workstation.config @@ -56,7 +56,6 @@ CONFIG_KEXEC_FILE=y CONFIG_PHYSICAL_ALIGN=0x1000000 # CONFIG_MODIFY_LDT_SYSCALL is not set # CONFIG_SUSPEND is not set -CONFIG_ACPI_VIDEO=y CONFIG_PCI_MSI=y # CONFIG_HT_IRQ is not set CONFIG_PCI_IOV=y @@ -179,15 +178,15 @@ CONFIG_I2C_MUX_REG=m # CONFIG_I2C_HELPER_AUTO is not set CONFIG_I2C_SLAVE=y CONFIG_PTP_1588_CLOCK=y -# CONFIG_HWMON is not set # CONFIG_X86_PKG_TEMP_THERMAL is not set CONFIG_MFD_SYSCON=y CONFIG_DRM=y +CONFIG_DRM_RADEON=y +CONFIG_DRM_AMDGPU=y +CONFIG_DRM_NOUVEAU=y CONFIG_DRM_AST=y CONFIG_FB_VESA=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_USB=y @@ -200,7 +199,6 @@ CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_STORAGE=m CONFIG_RTC_CLASS=y -# CONFIG_X86_PLATFORM_DEVICES is not set CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_SVM=y CONFIG_GENERIC_PHY=y @@ -324,6 +322,3 @@ 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 diff --git a/patches/coreboot-4.11/0001-cpu-x86-smm-Use-PRIxPTR-to-print-uintptr_t.patch b/patches/coreboot-4.11/0001-cpu-x86-smm-Use-PRIxPTR-to-print-uintptr_t.patch deleted file mode 100644 index b8e0f3569..000000000 --- a/patches/coreboot-4.11/0001-cpu-x86-smm-Use-PRIxPTR-to-print-uintptr_t.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 06f2fcc0ffc1a903f304d8a3382f3a57163989a1 Mon Sep 17 00:00:00 2001 -From: Jacob Garber -Date: Mon, 4 Nov 2019 09:35:15 -0700 -Subject: [PATCH] cpu/x86/smm: Use PRIxPTR to print uintptr_t - -Since 'base' is a uintptr_t, it needs the PRIxPTR format specifier. This -fixes a compilation error when targeting x86_64 or using Clang 9.0.0. - -Change-Id: Ib806e2b3cbb255ef208b361744ac4547b8ba262f -Signed-off-by: Jacob Garber -Reviewed-on: https://review.coreboot.org/c/coreboot/+/36785 -Tested-by: build bot (Jenkins) -Reviewed-by: HAOUAS Elyes ---- - src/cpu/x86/smm/tseg_region.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/cpu/x86/smm/tseg_region.c b/src/cpu/x86/smm/tseg_region.c -index a8b8bb7b9a..5b5c5729d5 100644 ---- a/src/cpu/x86/smm/tseg_region.c -+++ b/src/cpu/x86/smm/tseg_region.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - /* - * Subregions within SMM -@@ -88,11 +89,11 @@ void smm_list_regions(void) - return; - - printk(BIOS_DEBUG, "SMM Memory Map\n"); -- printk(BIOS_DEBUG, "SMRAM : 0x%zx 0x%zx\n", base, size); -+ printk(BIOS_DEBUG, "SMRAM : 0x%" PRIxPTR " 0x%zx\n", base, size); - - for (i = 0; i < SMM_SUBREGION_NUM; i++) { - if (smm_subregion(i, &base, &size)) - continue; -- printk(BIOS_DEBUG, " Subregion %d: 0x%zx 0x%zx\n", i, base, size); -+ printk(BIOS_DEBUG, " Subregion %d: 0x%" PRIxPTR " 0x%zx\n", i, base, size); - } - } --- -2.21.1 - - diff --git a/patches/coreboot-4.11/0020-kgpe-d16_measured-boot-support.patch b/patches/coreboot-4.11/0020-kgpe-d16_measured-boot-support.patch new file mode 100644 index 000000000..98324f080 --- /dev/null +++ b/patches/coreboot-4.11/0020-kgpe-d16_measured-boot-support.patch @@ -0,0 +1,67 @@ +diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c +index 637ec42109..8a92f88375 100644 +--- a/src/mainboard/asus/kgpe-d16/romstage.c ++++ b/src/mainboard/asus/kgpe-d16/romstage.c +@@ -46,6 +46,12 @@ + #include + #include + ++#include ++#include ++#include ++#include ++#include ++ + #include "cpu/amd/quadcore/quadcore.c" + + #define SERIAL_0_DEV PNP_DEV(0x2e, W83667HG_A_SP1) +@@ -547,7 +553,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) + power_on_reset = 1; + + initialize_mca(1, power_on_reset); +- update_microcode(val); + + post_code(0x33); + +@@ -573,6 +578,13 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) + sr5650_early_setup(); + sb7xx_51xx_early_setup(); + ++ if (CONFIG(MEASURED_BOOT) && CONFIG(LPC_TPM) && boot_cpu()) { ++ tpm_setup(0); ++ tlcl_lib_init(); ++ } ++ ++ update_microcode(val); ++ + if (CONFIG(LOGICAL_CPUS)) { + /* Core0 on each node is configured. Now setup any additional cores. */ + printk(BIOS_DEBUG, "start_other_cores()\n"); +@@ -687,6 +699,17 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) + pci_write_config16(PCI_DEV(0, 0x14, 0), 0x54, 0x0707); + pci_write_config16(PCI_DEV(0, 0x14, 0), 0x56, 0x0bb0); + pci_write_config16(PCI_DEV(0, 0x14, 0), 0x5a, 0x0ff0); ++ ++ if (CONFIG(MEASURED_BOOT) && CONFIG(LPC_TPM)) { ++ size_t bootblock_size = 0; ++ const void *bootblock = cbfs_boot_map_with_leak("bootblock", 1, &bootblock_size); ++ tlcl_measure(2, bootblock, bootblock_size); ++ ++ extern char _romstage, _eromstage; ++ tlcl_measure(2, &_romstage, &_eromstage - &_romstage); ++ } ++ ++ + } + + /** +@@ -718,3 +741,9 @@ BOOL AMD_CB_ManualBUIDSwapList (u8 node, u8 link, const u8 **List) + + return 0; + } ++ ++void platform_segment_loaded(uintptr_t start, size_t size, int flags) ++{ ++ if (CONFIG(MEASURED_BOOT) && !(flags & SEG_NO_MEASURE)) ++ tlcl_measure(2, (const void *) start, size); ++}