Skip to content

Commit c182cb8

Browse files
tlauriontlaurion
committed
Test: build kgpe-d16_server-whiptail only in CircleCI pointing to github.com/dasharo/coreboot under modules/coreboot
- Pointing dasharo-coreboot to commit 6edf2d06df3d5c28f1ddfb1705e076a0694df5a5 (fix submodules auth problem) - modules/coreboot: added 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 - Build succeeds. Now testing is needed
1 parent ffd8ab9 commit c182cb8

10 files changed

+126
-75
lines changed

‎.circleci/config.yml

+40-44
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
@@ -234,12 +235,21 @@ workflows:
234235
requires:
235236
- prep_env
236237

238+
# Coreboot x86
239+
- build_and_persist:
240+
name: kgpe-d16_workstation
241+
target: kgpe-d16_workstation
242+
subcommand: ""
243+
requires:
244+
- prep_env
245+
237246
#Cache one workspace per Coreboot version, ideally the boards including the highest number of modules, since not rebuilt across builds.
238247
#Below, 4.11, 4.13, 4.17
239248
- save_cache:
240249
requires:
241250
- librem_14
242251
- talos-2_server
252+
- kgpe-d16_workstation
243253

244254
#
245255
#
@@ -290,43 +300,43 @@ workflows:
290300
- x230-hotp-maximized
291301

292302
- build:
293-
name: x230-legacy-flash
294-
target: x230-legacy-flash
303+
name: x230-flash
304+
target: x230-flash
295305
subcommand: ""
296306
requires:
297307
- x230-hotp-maximized
298308

299309
- build:
300-
name: t430-legacy-flash
301-
target: t430-legacy-flash
310+
name: t430-flash
311+
target: t430-flash
302312
subcommand: ""
303313
requires:
304314
- x230-hotp-maximized
305315

306316
- build:
307-
name: t430-legacy
308-
target: t430-legacy
317+
name: t430
318+
target: t430
309319
subcommand: ""
310320
requires:
311321
- x230-hotp-maximized
312322

313323
- build:
314-
name: t430-hotp-legacy
315-
target: t430-hotp-legacy
324+
name: t430-hotp-verification
325+
target: t430-hotp-verification
316326
subcommand: ""
317327
requires:
318328
- x230-hotp-maximized
319329

320330
- build:
321-
name: x230-legacy
322-
target: x230-legacy
331+
name: x230
332+
target: x230
323333
subcommand: ""
324334
requires:
325335
- x230-hotp-maximized
326336

327337
- build:
328-
name: x230-hotp-legacy
329-
target: x230-hotp-legacy
338+
name: x230-hotp-verification
339+
target: x230-hotp-verification
330340
subcommand: ""
331341
requires:
332342
- x230-hotp-maximized
@@ -352,20 +362,6 @@ workflows:
352362
requires:
353363
- x230-hotp-maximized
354364

355-
- build:
356-
name: x230-maximized-fhd_edp
357-
target: x230-maximized-fhd_edp
358-
subcommand: ""
359-
requires:
360-
- x230-hotp-maximized
361-
362-
- build:
363-
name: x230-hotp-maximized-fhd_edp
364-
target: x230-hotp-maximized-fhd_edp
365-
subcommand: ""
366-
requires:
367-
- x230-hotp-maximized
368-
369365
- build:
370366
name: t530-hotp-maximized
371367
target: t530-hotp-maximized
@@ -499,26 +495,26 @@ workflows:
499495
requires:
500496
- librem_14
501497

502-
# - build:
503-
# name: kgpe-d16_workstation-usb_keyboard
504-
# target: kgpe-d16_workstation-usb_keyboard
505-
# subcommand: ""
506-
# requires:
507-
# - kgpe-d16_workstation
498+
- build:
499+
name: kgpe-d16_workstation-usb_keyboard
500+
target: kgpe-d16_workstation-usb_keyboard
501+
subcommand: ""
502+
requires:
503+
- kgpe-d16_workstation
508504

509-
# - build:
510-
# name: kgpe-d16_server
511-
# target: kgpe-d16_server
512-
# subcommand: ""
513-
# requires:
514-
# - kgpe-d16_workstation
505+
- build:
506+
name: kgpe-d16_server
507+
target: kgpe-d16_server
508+
subcommand: ""
509+
requires:
510+
- kgpe-d16_workstation
515511

516-
# - build:
517-
# name: kgpe-d16_server-whiptail
518-
# target: kgpe-d16_server-whiptail
519-
# subcommand: ""
520-
# requires:
521-
# - kgpe-d16_workstation
512+
- build:
513+
name: kgpe-d16_server-whiptail
514+
target: kgpe-d16_server-whiptail
515+
subcommand: ""
516+
requires:
517+
- kgpe-d16_workstation
522518

523519
# - build:
524520
# name: librem_l1um

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

+1-1
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

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

+1-1
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

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

+1-1
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

+1-1
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

+20-8
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

+19-6
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

+19-6
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

+19-6
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

+5-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ else ifeq "$(CONFIG_COREBOOT_VERSION)" "talos_2"
3939
coreboot_version = git
4040
coreboot_commit_hash = 2207bbcccba31ad89cf21607b0d8d05d8dc47c03
4141
coreboot_repo := https://github.com/Dasharo/coreboot
42-
42+
else ifeq "$(CONFIG_COREBOOT_VERSION)" "dasharo_kgpe-d16"
43+
coreboot_version = git
44+
coreboot_commit_hash = 6edf2d06df3d5c28f1ddfb1705e076a0694df5a5
45+
coreboot_repo := https://github.com/Dasharo/coreboot
46+
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
4347
else
4448
$(error "$(BOARD): does not specify coreboot version under CONFIG_COREBOOT_VERSION")
4549
endif

0 commit comments

Comments
 (0)