Skip to content

Commit b9748f0

Browse files
tlauriontlaurion
committed
Merge branch 'kgpe-d16_dasharo_test' into kgpe-d16_dasharo_test_2
- Add requirements so that serial is going to bmc for server boards only (CONFIG_UART_FOR_CONSOLE=1) - Workstation boards should output to serial normally since they do not have CONFIG_UART_FOR_CONSOLE=1 under coreboot configs) -CircleCI: add boards, depending on workspace cache of Librem14 (longer build time and kgpe-d16 being built last 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
2 parents 1646a16 + cd82066 commit b9748f0

10 files changed

Lines changed: 96 additions & 58 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 29 additions & 21 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
@@ -234,13 +235,20 @@ workflows:
234235
requires:
235236
- prep_env
236237

237-
#Cache one workspace per Coreboot version, ideally the boards including the highest number of modules, since not rebuilt across builds.
238+
# Coreboot x86
239+
- build_and_persist:
240+
name: kgpe-d16_workstation
241+
target: kgpe-d16_workstation
242+
subcommand: ""
243+
requires:
244+
- librem_14
245+
246+
#Cache one workspace per arch, 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:
241-
- librem_14
242250
- talos-2_server
243-
251+
- kgpe-d16_workstation
244252
#
245253
#
246254
# Those onboarding new boards should add their entries below.
@@ -499,26 +507,26 @@ workflows:
499507
requires:
500508
- librem_14
501509

502-
# - build:
503-
# name: kgpe-d16_workstation-usb_keyboard
504-
# target: kgpe-d16_workstation-usb_keyboard
505-
# subcommand: ""
506-
# requires:
507-
# - kgpe-d16_workstation
510+
- build:
511+
name: kgpe-d16_workstation-usb_keyboard
512+
target: kgpe-d16_workstation-usb_keyboard
513+
subcommand: ""
514+
requires:
515+
- kgpe-d16_workstation
508516

509-
# - build:
510-
# name: kgpe-d16_server
511-
# target: kgpe-d16_server
512-
# subcommand: ""
513-
# requires:
514-
# - kgpe-d16_workstation
517+
- build:
518+
name: kgpe-d16_server
519+
target: kgpe-d16_server
520+
subcommand: ""
521+
requires:
522+
- kgpe-d16_workstation
515523

516-
# - build:
517-
# name: kgpe-d16_server-whiptail
518-
# target: kgpe-d16_server-whiptail
519-
# subcommand: ""
520-
# requires:
521-
# - kgpe-d16_workstation
524+
- build:
525+
name: kgpe-d16_server-whiptail
526+
target: kgpe-d16_server-whiptail
527+
subcommand: ""
528+
requires:
529+
- kgpe-d16_workstation
522530

523531
# - build:
524532
# name: librem_l1um

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

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 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

‎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: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
CONFIG_USE_OPTION_TABLE=y
2-
# CONFIG_COLLECT_TIMESTAMPS is not set
32
CONFIG_VENDOR_ASUS=y
4-
CONFIG_UART_FOR_CONSOLE=1
3+
CONFIG_CBFS_SIZE=0x01000000
54
CONFIG_BOARD_ASUS_KGPE_D16=y
6-
CONFIG_DRIVERS_PS2_KEYBOARD=y
5+
CONFIG_UART_FOR_CONSOLE=1
6+
# CONFIG_DRIVERS_INTEL_WIFI is not set
7+
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
8+
CONFIG_PCIEXP_HOTPLUG_BUSES=32
9+
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
10+
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
11+
CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
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_TPM1=y
1220
CONFIG_TPM_RDRESP_NEED_DELAY=y
1321
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
22+
CONFIG_POST_IO_PORT=0x80
1423
CONFIG_PAYLOAD_LINUX=y
1524
CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
16-
CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
1725
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
18-
CONFIG_CPU_MICROCODE_CBFS_NONE=y

‎config/coreboot-kgpe-d16_server.config‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
CONFIG_USE_OPTION_TABLE=y
2-
# CONFIG_COLLECT_TIMESTAMPS is not set
32
CONFIG_VENDOR_ASUS=y
4-
CONFIG_UART_FOR_CONSOLE=1
3+
CONFIG_CBFS_SIZE=0x01000000
54
CONFIG_BOARD_ASUS_KGPE_D16=y
6-
CONFIG_DRIVERS_PS2_KEYBOARD=y
5+
CONFIG_UART_FOR_CONSOLE=1
6+
# CONFIG_DRIVERS_INTEL_WIFI is not set
7+
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
8+
CONFIG_PCIEXP_HOTPLUG_BUSES=32
9+
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
10+
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
11+
CONFIG_LINUX_COMMAND_LINE="nohz=on console=ttyS1,115200n8 earlyprintk=ttyS1,115200"
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_TPM1=y
1220
CONFIG_TPM_RDRESP_NEED_DELAY=y
1321
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
22+
CONFIG_POST_IO_PORT=0x80
1423
CONFIG_PAYLOAD_LINUX=y
15-
CONFIG_LINUX_COMMAND_LINE="nohz=on console=ttyS1,115200n8 earlyprintk=ttyS1,115200"
1624
CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
1725
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
18-
CONFIG_CPU_MICROCODE_CBFS_NONE=y

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
CONFIG_USE_OPTION_TABLE=y
2-
# CONFIG_COLLECT_TIMESTAMPS is not set
32
CONFIG_VENDOR_ASUS=y
4-
CONFIG_UART_FOR_CONSOLE=1
3+
CONFIG_CBFS_SIZE=0x01000000
54
CONFIG_BOARD_ASUS_KGPE_D16=y
6-
CONFIG_DRIVERS_PS2_KEYBOARD=y
5+
# CONFIG_DRIVERS_INTEL_WIFI is not set
6+
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
7+
CONFIG_PCIEXP_HOTPLUG_BUSES=32
8+
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
9+
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
10+
CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
711
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
12+
CONFIG_UART_PCI_ADDR=0x0
813
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
14+
CONFIG_PCIEXP_HOTPLUG_IO=0x1000
15+
CONFIG_NO_GFX_INIT=y
16+
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
17+
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
18+
CONFIG_TPM1=y
1219
CONFIG_TPM_RDRESP_NEED_DELAY=y
1320
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
21+
CONFIG_POST_IO_PORT=0x80
1422
CONFIG_PAYLOAD_LINUX=y
1523
CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
16-
CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
1724
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
18-
CONFIG_CPU_MICROCODE_CBFS_NONE=y

‎config/coreboot-kgpe-d16_workstation.config‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
CONFIG_USE_OPTION_TABLE=y
2-
# CONFIG_COLLECT_TIMESTAMPS is not set
32
CONFIG_VENDOR_ASUS=y
4-
CONFIG_UART_FOR_CONSOLE=1
3+
CONFIG_CBFS_SIZE=0x01000000
54
CONFIG_BOARD_ASUS_KGPE_D16=y
6-
CONFIG_DRIVERS_PS2_KEYBOARD=y
5+
# CONFIG_DRIVERS_INTEL_WIFI is not set
6+
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
7+
CONFIG_PCIEXP_HOTPLUG_BUSES=32
8+
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
9+
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
10+
CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
711
CONFIG_COREBOOT_ROMSIZE_KB_16384=y
12+
CONFIG_UART_PCI_ADDR=0x0
813
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
14+
CONFIG_PCIEXP_HOTPLUG_IO=0x1000
15+
CONFIG_NO_GFX_INIT=y
16+
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
17+
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
18+
CONFIG_TPM1=y
1219
CONFIG_TPM_RDRESP_NEED_DELAY=y
1320
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
21+
CONFIG_POST_IO_PORT=0x80
1422
CONFIG_PAYLOAD_LINUX=y
1523
CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
16-
CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
1724
CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
18-
CONFIG_CPU_MICROCODE_CBFS_NONE=y

‎modules/coreboot‎

Lines changed: 5 additions & 1 deletion
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)