Skip to content

Commit a56dfa1

Browse files
tlauriontlaurion
committed
kgpe-d16: modify board configs so that non-whiptail is clear about it.
1 parent 3b3c49b commit a56dfa1

10 files changed

Lines changed: 125 additions & 52 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ jobs:
189189
- build/x86/coreboot-4.14
190190
- build/x86/coreboot-4.15
191191
- build/x86/coreboot-4.17
192+
- build/x86/coreboot-git
192193
- build/ppc64/coreboot-git
193194
- save_cache:
194195
#Generate cache for the exact same modules definitions if hash is not previously existing
@@ -225,6 +226,14 @@ workflows:
225226
requires:
226227
- x230-hotp-maximized
227228

229+
# Coreboot x86
230+
- build_and_persist:
231+
name: kgpe-d16_workstation
232+
target: kgpe-d16_workstation
233+
subcommand: ""
234+
requires:
235+
- prep_env
236+
228237
# Coreboot for Talos (PPC)
229238
- build_and_persist:
230239
name: talos-2
@@ -533,26 +542,26 @@ workflows:
533542
requires:
534543
- librem_14
535544

536-
# - build:
537-
# name: kgpe-d16_workstation-usb_keyboard
538-
# target: kgpe-d16_workstation-usb_keyboard
539-
# subcommand: ""
540-
# requires:
541-
# - kgpe-d16_workstation
545+
- build:
546+
name: kgpe-d16_workstation-usb_keyboard
547+
target: kgpe-d16_workstation-usb_keyboard
548+
subcommand: ""
549+
requires:
550+
- kgpe-d16_workstation
542551

543-
# - build:
544-
# name: kgpe-d16_server
545-
# target: kgpe-d16_server
546-
# subcommand: ""
547-
# requires:
548-
# - kgpe-d16_workstation
552+
- build:
553+
name: kgpe-d16_server
554+
target: kgpe-d16_server
555+
subcommand: ""
556+
requires:
557+
- kgpe-d16_workstation
549558

550-
# - build:
551-
# name: kgpe-d16_server-whiptail
552-
# target: kgpe-d16_server-whiptail
553-
# subcommand: ""
554-
# requires:
555-
# - kgpe-d16_workstation
559+
- build:
560+
name: kgpe-d16_server-whiptail
561+
target: kgpe-d16_server-whiptail
562+
subcommand: ""
563+
requires:
564+
- kgpe-d16_workstation
556565

557566
# - build:
558567
# name: librem_l1um

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
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=dasharo_kgpe-d16
2222
export CONFIG_LINUX_VERSION=5.10.5
2323

2424
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
@@ -57,11 +57,10 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init
5757

5858
#CONSOLE SELECTION
5959
#Single output to OpenBMC
60-
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 "
60+
#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 "
6161

6262
#Dual output to local console (tty0) and OpenBmc (ttyS1)
63-
#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
64-
63+
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
6564
#Single output to tty0
6665
#export CONFIG_BOOT_KERNEL_ADD="nohz=on"
6766
export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
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=dasharo_kgpe-d16
2020
export CONFIG_LINUX_VERSION=5.10.5
2121

2222
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
@@ -36,20 +36,30 @@ CONFIG_QRENCODE=y
3636
CONFIG_TPMTOTP=y
3737
CONFIG_DROPBEAR=y
3838

39+
#Whiptail
40+
#CONFIG_SLANG=y
41+
#CONFIG_NEWT=y
42+
#FBWhiptail
43+
#CONFIG_CAIRO=y
44+
#CONFIG_FBWHIPTAIL=y
45+
3946
CONFIG_LINUX_USB=y
4047
CONFIG_LINUX_E1000E=y
4148
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
4249

4350
export CONFIG_TPM=y
4451
#BOOT SCRIPT SELECTION
4552
export CONFIG_BOOTSCRIPT=/bin/generic-init
53+
#export CONFIG_BOOTSCRIPT=/bin/gui-init
4654
#export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery
4755

4856
#CONSOLE SELECTION
4957
#Single output to OpenBMC
5058
#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 "
5159
#Dual output to local console (tty0) and OpenBmc (ttyS1)
5260
export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
61+
#Single output to tty0
62+
#export CONFIG_BOOT_KERNEL_ADD="nohz=on"
5363
export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
5464
export CONFIG_BOOT_STATIC_IP=192.168.2.3
5565

‎boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# sure their operating system loads microcode updates.
1313

1414
export CONFIG_COREBOOT=y
15-
export CONFIG_COREBOOT_VERSION=4.11
15+
export CONFIG_COREBOOT_VERSION=dasharo_kgpe-d16
1616
export CONFIG_LINUX_VERSION=5.10.5
1717

1818
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config

‎boards/kgpe-d16_workstation/kgpe-d16_workstation.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717

1818
export CONFIG_COREBOOT=y
19-
export CONFIG_COREBOOT_VERSION=4.11
19+
export CONFIG_COREBOOT_VERSION=dasharo_kgpe-d16
2020
export CONFIG_LINUX_VERSION=5.10.5
2121

2222
CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config

‎config/coreboot-kgpe-d16_server-whiptail.config‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
11
CONFIG_USE_OPTION_TABLE=y
2-
# CONFIG_COLLECT_TIMESTAMPS is not set
2+
CONFIG_CBMEM_STAGE_CACHE=y
33
CONFIG_VENDOR_ASUS=y
4-
CONFIG_UART_FOR_CONSOLE=1
4+
CONFIG_CBFS_SIZE=0x01000000
55
CONFIG_BOARD_ASUS_KGPE_D16=y
6-
CONFIG_DRIVERS_PS2_KEYBOARD=y
6+
CONFIG_CONSOLE_POST=y
7+
# CONFIG_DRIVERS_INTEL_WIFI is not set
8+
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
9+
CONFIG_PCIEXP_HOTPLUG_BUSES=32
10+
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
11+
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
12+
CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
713
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
14+
CONFIG_UART_PCI_ADDR=0x0
815
CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
9-
# CONFIG_DRIVERS_INTEL_WIFI is not set
10-
CONFIG_MEASURED_BOOT=y
11-
CONFIG_USER_TPM1=y
16+
CONFIG_PCIEXP_HOTPLUG_IO=0x1000
17+
CONFIG_NO_GFX_INIT=y
18+
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
19+
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
20+
CONFIG_DRIVERS_PS2_KEYBOARD=y
21+
CONFIG_USE_PC_CMOS_ALTCENTURY=y
22+
CONFIG_TPM1=y
1223
CONFIG_TPM_RDRESP_NEED_DELAY=y
24+
CONFIG_TPM_MEASURED_BOOT=y
1325
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
26+
CONFIG_POST_DEVICE_LPC=y
27+
CONFIG_POST_IO_PORT=0x80
1428
CONFIG_PAYLOAD_LINUX=y
1529
CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
16-
CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
1730
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
18-
CONFIG_CPU_MICROCODE_CBFS_NONE=y

‎config/coreboot-kgpe-d16_server.config‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,29 @@
11
CONFIG_USE_OPTION_TABLE=y
2-
# CONFIG_COLLECT_TIMESTAMPS is not set
2+
CONFIG_CBMEM_STAGE_CACHE=y
33
CONFIG_VENDOR_ASUS=y
4-
CONFIG_UART_FOR_CONSOLE=1
4+
CONFIG_CBFS_SIZE=0x01000000
55
CONFIG_BOARD_ASUS_KGPE_D16=y
6-
CONFIG_DRIVERS_PS2_KEYBOARD=y
6+
CONFIG_CONSOLE_POST=y
7+
# CONFIG_DRIVERS_INTEL_WIFI is not set
8+
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
9+
CONFIG_PCIEXP_HOTPLUG_BUSES=32
10+
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
11+
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
712
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
13+
CONFIG_UART_PCI_ADDR=0x0
814
CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
9-
# CONFIG_DRIVERS_INTEL_WIFI is not set
10-
CONFIG_MEASURED_BOOT=y
11-
CONFIG_USER_TPM1=y
15+
CONFIG_PCIEXP_HOTPLUG_IO=0x1000
16+
CONFIG_NO_GFX_INIT=y
17+
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
18+
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
19+
CONFIG_DRIVERS_PS2_KEYBOARD=y
20+
CONFIG_USE_PC_CMOS_ALTCENTURY=y
21+
CONFIG_TPM1=y
1222
CONFIG_TPM_RDRESP_NEED_DELAY=y
23+
CONFIG_TPM_MEASURED_BOOT=y
1324
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
25+
CONFIG_POST_DEVICE_LPC=y
26+
CONFIG_POST_IO_PORT=0x80
1427
CONFIG_PAYLOAD_LINUX=y
1528
CONFIG_LINUX_COMMAND_LINE="nohz=on console=ttyS1,115200n8 earlyprintk=ttyS1,115200"
1629
CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"

‎config/coreboot-kgpe-d16_workstation-usb_keyboard.config‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,29 @@
11
CONFIG_USE_OPTION_TABLE=y
2-
# CONFIG_COLLECT_TIMESTAMPS is not set
2+
CONFIG_CBMEM_STAGE_CACHE=y
33
CONFIG_VENDOR_ASUS=y
4-
CONFIG_UART_FOR_CONSOLE=1
4+
CONFIG_CBFS_SIZE=0x01000000
55
CONFIG_BOARD_ASUS_KGPE_D16=y
6-
CONFIG_DRIVERS_PS2_KEYBOARD=y
6+
CONFIG_CONSOLE_POST=y
7+
# CONFIG_DRIVERS_INTEL_WIFI is not set
8+
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
9+
CONFIG_PCIEXP_HOTPLUG_BUSES=32
10+
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
11+
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
712
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
13+
CONFIG_UART_PCI_ADDR=0x0
814
CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
9-
# CONFIG_DRIVERS_INTEL_WIFI is not set
10-
CONFIG_MEASURED_BOOT=y
11-
CONFIG_USER_TPM1=y
15+
CONFIG_PCIEXP_HOTPLUG_IO=0x1000
16+
CONFIG_NO_GFX_INIT=y
17+
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
18+
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
19+
CONFIG_DRIVERS_PS2_KEYBOARD=y
20+
CONFIG_USE_PC_CMOS_ALTCENTURY=y
21+
CONFIG_TPM1=y
1222
CONFIG_TPM_RDRESP_NEED_DELAY=y
23+
CONFIG_TPM_MEASURED_BOOT=y
1324
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
25+
CONFIG_POST_DEVICE_LPC=y
26+
CONFIG_POST_IO_PORT=0x80
1427
CONFIG_PAYLOAD_LINUX=y
1528
CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
1629
CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"

‎config/coreboot-kgpe-d16_workstation.config‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,29 @@
11
CONFIG_USE_OPTION_TABLE=y
2-
# CONFIG_COLLECT_TIMESTAMPS is not set
2+
CONFIG_CBMEM_STAGE_CACHE=y
33
CONFIG_VENDOR_ASUS=y
4-
CONFIG_UART_FOR_CONSOLE=1
4+
CONFIG_CBFS_SIZE=0x01000000
55
CONFIG_BOARD_ASUS_KGPE_D16=y
6-
CONFIG_DRIVERS_PS2_KEYBOARD=y
6+
CONFIG_CONSOLE_POST=y
7+
# CONFIG_DRIVERS_INTEL_WIFI is not set
8+
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
9+
CONFIG_PCIEXP_HOTPLUG_BUSES=32
10+
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
11+
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
712
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
13+
CONFIG_UART_PCI_ADDR=0x0
814
CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
9-
# CONFIG_DRIVERS_INTEL_WIFI is not set
10-
CONFIG_MEASURED_BOOT=y
11-
CONFIG_USER_TPM1=y
15+
CONFIG_PCIEXP_HOTPLUG_IO=0x1000
16+
CONFIG_NO_GFX_INIT=y
17+
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
18+
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
19+
CONFIG_DRIVERS_PS2_KEYBOARD=y
20+
CONFIG_USE_PC_CMOS_ALTCENTURY=y
21+
CONFIG_TPM1=y
1222
CONFIG_TPM_RDRESP_NEED_DELAY=y
23+
CONFIG_TPM_MEASURED_BOOT=y
1324
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
25+
CONFIG_POST_DEVICE_LPC=y
26+
CONFIG_POST_IO_PORT=0x80
1427
CONFIG_PAYLOAD_LINUX=y
1528
CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
1629
CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"

‎modules/coreboot‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ else ifeq "$(CONFIG_COREBOOT_VERSION)" "talos_2"
4646
coreboot_patch_version = talos_2
4747
coreboot_commit_hash = 068ad520e4ae898d356add72ea7d2a13913b76ab
4848
coreboot_repo := https://github.com/Dasharo/coreboot
49-
49+
else ifeq "$(CONFIG_COREBOOT_VERSION)" "dasharo_kgpe-d16"
50+
coreboot_version = git
51+
coreboot_commit_hash = 6edf2d06df3d5c28f1ddfb1705e076a0694df5a5
52+
coreboot_repo := https://github.com/Dasharo/coreboot
53+
EXTRA_FLAGS := -fdebug-prefix-map=$(pwd)=heads -gno-record-gcc-switches -Wno-error=packed-not-aligned -Wno-error=address-of-packed-member -Wno-error=null-dereference
5054
else
5155
$(error "$(BOARD): does not specify coreboot version under CONFIG_COREBOOT_VERSION")
5256
endif

0 commit comments

Comments
 (0)