Skip to content

Commit 89c847c

Browse files
tlauriontlaurion
committed
kgpe-d16: add AGESA 15h fork support with TPM1/TPM2 variants
Add coreboot-15h module pointing to the AGESA-based 15h fork: repo: https://git.15h.org/mrothfuss/coreboot-15h.git branch: 4.11_wip-tpm commit: 1afdea5572e4908c51c5b4bed43fcdc2a98fd768 Move all four kgpe-d16 boards out of unmaintained_boards/ to boards/ and create TPM1/TPM2 variants: - kgpe-d16_server-tpm1, kgpe-d16_server-tpm2 - kgpe-d16_workstation-tpm1, kgpe-d16_workstation-tpm2 - kgpe-d16_server-whiptail-tpm1, kgpe-d16_server-whiptail-tpm2 - kgpe-d16_workstation-usb_keyboard-tpm1, kgpe-d16_workstation-usb_keyboard-tpm2 Rename coreboot configs to match TPM variant (-tpm1/-tpm2 suffix). Add coreboot TPM configs: - TPM1: CONFIG_TPM1=y, CONFIG_TPM_INIT=y, CONFIG_USER_TPM1=y - TPM2: CONFIG_TPM2=y, CONFIG_TPM2_MODE=spt, CONFIG_TPM2_PPI=y, CONFIG_USER_TPM2=y Add board documentation with 15h.org wiki references: - Hardware specs (sockets, chipset, memory, PCIe slots) - TPM chip compatibility (SLB9635/SLB9655 for TPM1, SLB9665 for TPM2) - VGA_SW1 jumper for display selection - Fan control zones (CPUFAN_SEL1, CHAFAN_SEL1) - Flashing instructions (CH341a, CMOS clear) - BMC console configuration Add workstation GPU support: - Tested: Nvidia GPUs (require NvForcePost=1 for post) - Linux config: nouveau, radeon, amdgpu enabled Fix modules/coreboot typo: fan contol -> fan control circleci: add kgpe-d16 tpm1 and tpm2 build jobs Reproduction notes - saving configs in proper format: # Save coreboot config in defconfig format (minimal): ./docker_repro.sh make BOARD=$board coreboot.save_in_defconfig_format_backup # Save coreboot config in oldconfig format (full): ./docker_repro.sh make BOARD=$board coreboot.save_in_oldconfig_format_backup # Save linux config in defconfig format (minimal): ./docker_repro.sh make BOARD=$board linux.save_in_defconfig_format_backup # Save linux config in olddefconfig format (full): ./docker_repro.sh make BOARD=$board linux.save_in_olddefconfig_format_backup # Loop through all kgpe-d16 boards: for board in $(ls -d boards/*/ | grep kgpe | sed 's|boards/||g' | sed 's|/$||g'); do ./docker_repro.sh make BOARD=$board coreboot.save_in_defconfig_format_backup done Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent 426750a commit 89c847c

30 files changed

Lines changed: 3637 additions & 469 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,67 @@ workflows:
526526
requires:
527527
- x86-musl-cross-make
528528

529+
# 15h.org AGESA fork
530+
- x86_coreboot:
531+
name: kgpe-d16_workstation-tpm1
532+
target: kgpe-d16_workstation-tpm1
533+
subcommand: ""
534+
coreboot_dir: coreboot-15h
535+
requires:
536+
- x86-musl-cross-make
537+
538+
# 15h.org AGESA fork: seed is kgpe-d16_workstation-tpm1 (x86_coreboot job above)
539+
# coreboot fam15h - TPM1 variants
540+
- build:
541+
name: kgpe-d16_workstation-usb_keyboard-tpm1
542+
target: kgpe-d16_workstation-usb_keyboard-tpm1
543+
subcommand: ""
544+
requires:
545+
- kgpe-d16_workstation-tpm1
546+
547+
- build:
548+
name: kgpe-d16_server-tpm1
549+
target: kgpe-d16_server-tpm1
550+
subcommand: ""
551+
requires:
552+
- kgpe-d16_workstation-tpm1
553+
554+
- build:
555+
name: kgpe-d16_server-whiptail-tpm1
556+
target: kgpe-d16_server-whiptail-tpm1
557+
subcommand: ""
558+
requires:
559+
- kgpe-d16_workstation-tpm1
560+
561+
# coreboot fam15h - TPM2 variants (use 15h fork cache from tpm1 seed)
562+
- build:
563+
name: kgpe-d16_workstation-tpm2
564+
target: kgpe-d16_workstation-tpm2
565+
subcommand: ""
566+
requires:
567+
- kgpe-d16_workstation-tpm1
568+
569+
- build:
570+
name: kgpe-d16_workstation-usb_keyboard-tpm2
571+
target: kgpe-d16_workstation-usb_keyboard-tpm2
572+
subcommand: ""
573+
requires:
574+
- kgpe-d16_workstation-tpm2
575+
576+
- build:
577+
name: kgpe-d16_server-tpm2
578+
target: kgpe-d16_server-tpm2
579+
subcommand: ""
580+
requires:
581+
- kgpe-d16_workstation-tpm2
582+
583+
- build:
584+
name: kgpe-d16_server-whiptail-tpm2
585+
target: kgpe-d16_server-whiptail-tpm2
586+
subcommand: ""
587+
requires:
588+
- kgpe-d16_workstation-tpm2
589+
529590
# Those onboarding new boards should add their entries below.
530591
# coreboot 25.09 boards
531592
- build:
@@ -800,7 +861,9 @@ workflows:
800861
requires:
801862
- novacustom-v560tu
802863

803-
# Dasharo msi_z690: shares dasharo_msi_z690 toolchain with UNTESTED_msi_z690a_ddr4
864+
# Dasharo msi_z690: shares dasharo_msi_z690 toolchain with UNTESTED_msi_z690a_ddr4
865+
866+
# dasharo_msi
804867
- build:
805868
name: UNTESTED_msi_z690a_ddr5
806869
target: UNTESTED_msi_z690a_ddr5

unmaintained_boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_kgpe-d16_server.config renamed to boards/kgpe-d16_server-tpm1/kgpe-d16_server-tpm1.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
# - Please contribute documentation on heads-wiki
1717
# - Please support https://github.com/osresearch/heads/issues/719
1818
export CONFIG_COREBOOT=y
19-
export CONFIG_COREBOOT_VERSION=4.11
19+
export CONFIG_COREBOOT_VERSION=15h
2020
export CONFIG_LINUX_VERSION=6.1.8
2121

22-
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
22+
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-tpm1.config
2323
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server.config
2424

2525
CONFIG_CRYPTSETUP2=y

‎boards/kgpe-d16_server-tpm2/kgpe-d16_server-tpm2.config‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# Configuration for a kgpe-d16_server (TPM2 variant)
2+
# See https://15h.org/index.php/ASUS_KGPE-D16 for full hardware details
3+
#
4+
# Hardware:
5+
# - Dual socket G34 for AMD Opteron 6200/6300 series (6100 series unsupported)
6+
# - AMD SR5690 northbridge, AMD SP5100 southbridge
7+
# - Winbond W83667HG-A Super I/O, ASPEED AST2050 BMC
8+
# - 16 DDR3 slots (8 channels), up to 512GB ECC UDIMM/RDIMM/LRDIMM
9+
# - 2 MiB DIP-8 flash socket (W25Q16V)
10+
# - Intel 82574L dual gigabit Ethernet
11+
#
12+
# Display:
13+
# - VGA_SW1 jumper: "Enable" = onboard AST2050 VGA, "Disable" = PCIe GPU
14+
# - This config uses onboard VGA (text mode) via BMC serial console
15+
#
16+
# Fan Control:
17+
# - CPUFAN_SEL1: CPU fan zone (4-pin PWM recommended)
18+
# - CHAFAN_SEL1: Chassis fan zone (4-pin PWM recommended)
19+
# - 3-pin fans will run at 100% in PWM mode
20+
#
21+
# TPM:
22+
# - Infineon SLB9665 (Asus TPM-L R2.0)
23+
# - See https://15h.org/index.php/KGPE-D16_(Raptor)#TPM
24+
#
25+
# Status:
26+
# - TPM support still in progress (see 15h.org wiki)
27+
# - Two black SATA ports are inactive
28+
# - SeaBIOS does not respond to keyboards behind USB hub
29+
# - S3 Suspend/Resume unsupported
30+
# - No microcode included (see Linux panics with latest microcode)
31+
# AMD Opteron 6300 series users: ensure OS loads microcode updates
32+
#
33+
# Flashing:
34+
# - External flashing required (3.3V CH341A programmer)
35+
# - CMOS clear required after flashing: move CLRTC1 to 2-3, wait 20s, restore
36+
# - Flash chip location: bottom right corner of board (labeled BIOS)
37+
#
38+
# BMC:
39+
# - Connect via ttyS1 at 115200n8
40+
# - https://github.com/osresearch/heads/issues/134#issuecomment-368922440
41+
#
42+
# Links:
43+
# - https://15h.org/index.php/ASUS_KGPE-D16
44+
# - https://15h.org/index.php/Coreboot-15h
45+
# - Please contribute documentation to heads-wiki
46+
47+
export CONFIG_COREBOOT=y
48+
export CONFIG_COREBOOT_VERSION=15h
49+
export CONFIG_LINUX_VERSION=6.1.8
50+
51+
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-tpm2.config
52+
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server.config
53+
54+
CONFIG_CRYPTSETUP2=y
55+
CONFIG_FLASHPROG=y
56+
CONFIG_FLASHPROG_AST1100=y
57+
CONFIG_FLASHTOOLS=y
58+
CONFIG_GPG2=y
59+
CONFIG_KEXEC=y
60+
CONFIG_UTIL_LINUX=y
61+
CONFIG_LVM2=y
62+
CONFIG_MBEDTLS=y
63+
CONFIG_PCIUTILS=y
64+
CONFIG_POPT=y
65+
CONFIG_QRENCODE=y
66+
CONFIG_TPMTOTP=y
67+
CONFIG_DROPBEAR=y
68+
69+
CONFIG_LINUX_USB=y
70+
CONFIG_LINUX_E1000E=y
71+
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
72+
73+
export CONFIG_TPM=y
74+
export CONFIG_TPM2=y
75+
export CONFIG_DEBUG_OUTPUT=n
76+
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
77+
export CONFIG_TPM2_CAPTURE_PCAP=n
78+
export CONFIG_QUIET_MODE=y
79+
export CONFIG_BOOTSCRIPT=/bin/generic-init.sh
80+
81+
# Console: dual output to BMC (ttyS1) and local VGA (tty0)
82+
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
83+
export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
84+
export CONFIG_BOOT_STATIC_IP=192.168.2.3
85+
86+
export CONFIG_BOOT_REQ_HASH=n
87+
export CONFIG_BOOT_REQ_ROLLBACK=n
88+
export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
89+
export CONFIG_BOARD_NAME="KGPE-D16 Server TPM2"
90+
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
91+
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

unmaintained_boards/UNMAINTAINED_kgpe-d16_server-whiptail/UNMAINTAINED_kgpe-d16_server-whiptail.config renamed to boards/kgpe-d16_server-whiptail-tpm1/kgpe-d16_server-whiptail-tpm1.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
# sure their operating system loads microcode updates.
1919

2020
export CONFIG_COREBOOT=y
21-
export CONFIG_COREBOOT_VERSION=4.11
21+
export CONFIG_COREBOOT_VERSION=15h
2222
export CONFIG_LINUX_VERSION=6.1.8
2323

24-
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
24+
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail-tpm1.config
2525
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server-whiptail.config
2626

2727
CONFIG_CRYPTSETUP2=y

‎boards/kgpe-d16_server-whiptail-tpm2/kgpe-d16_server-whiptail-tpm2.config‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# Configuration for a kgpe-d16_server with whiptail (TPM2 variant)
2+
# See https://15h.org/index.php/ASUS_KGPE-D16 for full hardware details
3+
#
4+
# Hardware:
5+
# - Dual socket G34 for AMD Opteron 6200/6300 series (6100 series unsupported)
6+
# - AMD SR5690 northbridge, AMD SP5100 southbridge
7+
# - Winbond W83667HG-A Super I/O, ASPEED AST2050 BMC
8+
# - 16 DDR3 slots (8 channels), up to 512GB ECC UDIMM/RDIMM/LRDIMM
9+
# - 2 MiB DIP-8 flash socket (W25Q16V)
10+
# - Intel 82574L dual gigabit Ethernet
11+
#
12+
# Display:
13+
# - VGA_SW1 jumper: "Enable" = onboard AST2050 VGA, "Disable" = PCIe GPU
14+
# - This config uses onboard VGA (text mode) via BMC serial console
15+
#
16+
# Fan Control:
17+
# - CPUFAN_SEL1: CPU fan zone (4-pin PWM recommended)
18+
# - CHAFAN_SEL1: Chassis fan zone (4-pin PWM recommended)
19+
# - 3-pin fans will run at 100% in PWM mode
20+
#
21+
# TPM:
22+
# - Infineon SLB9665 (Asus TPM-L R2.0)
23+
# - See https://15h.org/index.php/KGPE-D16_(Raptor)#TPM
24+
#
25+
# Status:
26+
# - TPM support still in progress (see 15h.org wiki)
27+
# - Two black SATA ports are inactive
28+
# - SeaBIOS does not respond to keyboards behind USB hub
29+
# - S3 Suspend/Resume unsupported
30+
# - No microcode included (see Linux panics with latest microcode)
31+
# AMD Opteron 6300 series users: ensure OS loads microcode updates
32+
#
33+
# Flashing:
34+
# - External flashing required (3.3V CH341A programmer)
35+
# - CMOS clear required after flashing: move CLRTC1 to 2-3, wait 20s, restore
36+
# - Flash chip location: bottom right corner of board (labeled BIOS)
37+
#
38+
# BMC:
39+
# - Connect via ttyS1 at 115200n8
40+
# - https://github.com/osresearch/heads/issues/134#issuecomment-368922440
41+
#
42+
# Links:
43+
# - https://15h.org/index.php/ASUS_KGPE-D16
44+
# - https://15h.org/index.php/Coreboot-15h
45+
# - Please contribute documentation to heads-wiki
46+
47+
export CONFIG_COREBOOT=y
48+
export CONFIG_COREBOOT_VERSION=15h
49+
export CONFIG_LINUX_VERSION=6.1.8
50+
51+
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail-tpm2.config
52+
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server-whiptail.config
53+
54+
CONFIG_CRYPTSETUP2=y
55+
CONFIG_FLASHPROG=y
56+
CONFIG_FLASHTOOLS=y
57+
CONFIG_GPG2=y
58+
CONFIG_KEXEC=y
59+
CONFIG_UTIL_LINUX=y
60+
CONFIG_LVM2=y
61+
CONFIG_MBEDTLS=y
62+
CONFIG_PCIUTILS=y
63+
CONFIG_POPT=y
64+
CONFIG_QRENCODE=y
65+
CONFIG_TPMTOTP=y
66+
CONFIG_DROPBEAR=y
67+
68+
CONFIG_SLANG=y
69+
CONFIG_NEWT=y
70+
71+
CONFIG_LINUX_USB=y
72+
CONFIG_LINUX_E1000E=y
73+
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
74+
75+
export CONFIG_TPM=y
76+
export CONFIG_TPM2=y
77+
export CONFIG_DEBUG_OUTPUT=n
78+
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
79+
export CONFIG_TPM2_CAPTURE_PCAP=n
80+
export CONFIG_QUIET_MODE=y
81+
export CONFIG_BOOTSCRIPT=/bin/gui-init.sh
82+
83+
# Console: BMC serial console output
84+
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 "
85+
export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
86+
export CONFIG_BOOT_STATIC_IP=192.168.2.3
87+
88+
export CONFIG_BOOT_REQ_HASH=n
89+
export CONFIG_BOOT_REQ_ROLLBACK=n
90+
export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
91+
export CONFIG_BOARD_NAME="KGPE-D16 Server-whiptail TPM2"
92+
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
93+
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

unmaintained_boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config renamed to boards/kgpe-d16_workstation-tpm1/kgpe-d16_workstation-tpm1.config

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,24 @@
66
# Status:
77
# - TPM support in romstage (not bootblock) with TPM SLB9635 TT 1.2 by Infineon
88
# - To connect to BMC: https://github.com/osresearch/heads/issues/134#issuecomment-368922440
9-
# - Please contribute documentation on heads-wiki
9+
# - Please contribute documentation on heads-wiki / 15h.org
1010
# - Please support https://github.com/osresearch/heads/issues/719
1111
# - Disk Unlock Key released by TPM since not deactivated
1212
# - Currently, no microcode is included with coreboot. This is due to to a bug
1313
# in which newer Linux releases panics when the newest microcode is loaded by
1414
# coreboot. AMD Opteron 6300 series users are STRONGLY encouraged to make
1515
# sure their operating system loads microcode updates.
16-
16+
#
17+
# Since Qubes OS version 4.2 you need to use a speculative execution workaround to utilize qubes with pcie devices attached see https://15h.org/index.php/Qubes_OS
18+
# ask in the 15h.org matrix group about this if you are unsure or have trouble getting it to work
19+
#
20+
# read more about this board https://15h.org/index.php/KGPE-D16
1721

1822
export CONFIG_COREBOOT=y
19-
export CONFIG_COREBOOT_VERSION=4.11
23+
export CONFIG_COREBOOT_VERSION=15h
2024
export CONFIG_LINUX_VERSION=6.1.8
2125

22-
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config
26+
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-tpm1.config
2327
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
2428

2529
CONFIG_CRYPTSETUP2=y

0 commit comments

Comments
 (0)