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

.circleci/config.yml

@@ -189,6 +189,7 @@ jobs:
             - build/x86/coreboot-4.14
             - build/x86/coreboot-4.15
             - build/x86/coreboot-4.17
+            - build/x86/coreboot-git
             - build/ppc64/coreboot-git
       - save_cache:
           #Generate cache for the exact same modules definitions if hash is not previously existing
@@ -234,13 +235,20 @@ workflows:
           requires:
             - prep_env
 
-      #Cache one workspace per Coreboot version, ideally the boards including the highest number of modules, since not rebuilt across builds.
+      # Coreboot x86
+      - build_and_persist:
+          name: kgpe-d16_workstation
+          target: kgpe-d16_workstation
+          subcommand: ""
+          requires:
+            - librem_14
+
+      #Cache one workspace per arch, ideally the boards including the highest number of modules, since not rebuilt across builds.
       #Below, 4.11, 4.13, 4.17
       - save_cache:
           requires:
-            - librem_14
             - talos-2_server
-
+            - kgpe-d16_workstation
 #
 #
 # Those onboarding new boards should add their entries below.
@@ -499,26 +507,26 @@ workflows:
           requires:
             - librem_14
 
-#      - build:
-#          name: kgpe-d16_workstation-usb_keyboard
-#          target: kgpe-d16_workstation-usb_keyboard
-#          subcommand: ""
-#          requires:
-#            - kgpe-d16_workstation
+      - build:
+          name: kgpe-d16_workstation-usb_keyboard
+          target: kgpe-d16_workstation-usb_keyboard
+          subcommand: ""
+          requires:
+            - kgpe-d16_workstation
 
-#      - build:
-#          name: kgpe-d16_server
-#          target: kgpe-d16_server
-#          subcommand: ""
-#          requires:
-#            - kgpe-d16_workstation
+      - build:
+          name: kgpe-d16_server
+          target: kgpe-d16_server
+          subcommand: ""
+          requires:
+            - kgpe-d16_workstation
 
-#      - build:
-#          name: kgpe-d16_server-whiptail
-#          target: kgpe-d16_server-whiptail
-#          subcommand: ""
-#          requires:
-#            - kgpe-d16_workstation
+      - build:
+          name: kgpe-d16_server-whiptail
+          target: kgpe-d16_server-whiptail
+          subcommand: ""
+          requires:
+            - kgpe-d16_workstation
 
 #      - build:
 #          name: librem_l1um

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

@@ -18,7 +18,7 @@
 #   sure their operating system loads microcode updates.
 
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.11
+export CONFIG_COREBOOT_VERSION=dasharo_kgpe-d16
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config

boards/kgpe-d16_server/kgpe-d16_server.config

@@ -16,7 +16,7 @@
 # - 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_COREBOOT_VERSION=dasharo_kgpe-d16
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config

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

@@ -12,7 +12,7 @@
 #   sure their operating system loads microcode updates.
 
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.11
+export CONFIG_COREBOOT_VERSION=dasharo_kgpe-d16
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config

boards/kgpe-d16_workstation/kgpe-d16_workstation.config

@@ -16,7 +16,7 @@
 
 
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.11
+export CONFIG_COREBOOT_VERSION=dasharo_kgpe-d16
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config

config/coreboot-kgpe-d16_server-whiptail.config

@@ -1,18 +1,25 @@
 CONFIG_USE_OPTION_TABLE=y
-# CONFIG_COLLECT_TIMESTAMPS is not set
 CONFIG_VENDOR_ASUS=y
-CONFIG_UART_FOR_CONSOLE=1
+CONFIG_CBFS_SIZE=0x01000000
 CONFIG_BOARD_ASUS_KGPE_D16=y
-CONFIG_DRIVERS_PS2_KEYBOARD=y
+CONFIG_UART_FOR_CONSOLE=1
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
+CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
 CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_UART_PCI_ADDR=0x0
 CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
-# CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_MEASURED_BOOT=y
-CONFIG_USER_TPM1=y
+CONFIG_PCIEXP_HOTPLUG_IO=0x1000
+CONFIG_NO_GFX_INIT=y
+CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
+CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
+CONFIG_TPM1=y
 CONFIG_TPM_RDRESP_NEED_DELAY=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+CONFIG_POST_IO_PORT=0x80
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
-CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
 CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
-CONFIG_CPU_MICROCODE_CBFS_NONE=y

config/coreboot-kgpe-d16_server.config

@@ -1,18 +1,25 @@
 CONFIG_USE_OPTION_TABLE=y
-# CONFIG_COLLECT_TIMESTAMPS is not set
 CONFIG_VENDOR_ASUS=y
-CONFIG_UART_FOR_CONSOLE=1
+CONFIG_CBFS_SIZE=0x01000000
 CONFIG_BOARD_ASUS_KGPE_D16=y
-CONFIG_DRIVERS_PS2_KEYBOARD=y
+CONFIG_UART_FOR_CONSOLE=1
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
+CONFIG_LINUX_COMMAND_LINE="nohz=on console=ttyS1,115200n8 earlyprintk=ttyS1,115200"
 CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_UART_PCI_ADDR=0x0
 CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
-# CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_MEASURED_BOOT=y
-CONFIG_USER_TPM1=y
+CONFIG_PCIEXP_HOTPLUG_IO=0x1000
+CONFIG_NO_GFX_INIT=y
+CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
+CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
+CONFIG_TPM1=y
 CONFIG_TPM_RDRESP_NEED_DELAY=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+CONFIG_POST_IO_PORT=0x80
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_LINUX_COMMAND_LINE="nohz=on console=ttyS1,115200n8 earlyprintk=ttyS1,115200"
 CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
-CONFIG_CPU_MICROCODE_CBFS_NONE=y

config/coreboot-kgpe-d16_workstation-usb_keyboard.config

@@ -1,18 +1,24 @@
 CONFIG_USE_OPTION_TABLE=y
-# CONFIG_COLLECT_TIMESTAMPS is not set
 CONFIG_VENDOR_ASUS=y
-CONFIG_UART_FOR_CONSOLE=1
+CONFIG_CBFS_SIZE=0x01000000
 CONFIG_BOARD_ASUS_KGPE_D16=y
-CONFIG_DRIVERS_PS2_KEYBOARD=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
+CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
 CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_UART_PCI_ADDR=0x0
 CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
-# CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_MEASURED_BOOT=y
-CONFIG_USER_TPM1=y
+CONFIG_PCIEXP_HOTPLUG_IO=0x1000
+CONFIG_NO_GFX_INIT=y
+CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
+CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
+CONFIG_TPM1=y
 CONFIG_TPM_RDRESP_NEED_DELAY=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+CONFIG_POST_IO_PORT=0x80
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
-CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
 CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
-CONFIG_CPU_MICROCODE_CBFS_NONE=y

config/coreboot-kgpe-d16_workstation.config

@@ -1,18 +1,24 @@
 CONFIG_USE_OPTION_TABLE=y
-# CONFIG_COLLECT_TIMESTAMPS is not set
 CONFIG_VENDOR_ASUS=y
-CONFIG_UART_FOR_CONSOLE=1
+CONFIG_CBFS_SIZE=0x01000000
 CONFIG_BOARD_ASUS_KGPE_D16=y
-CONFIG_DRIVERS_PS2_KEYBOARD=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
+CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
 CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_UART_PCI_ADDR=0x0
 CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
-# CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_MEASURED_BOOT=y
-CONFIG_USER_TPM1=y
+CONFIG_PCIEXP_HOTPLUG_IO=0x1000
+CONFIG_NO_GFX_INIT=y
+CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
+CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
+CONFIG_TPM1=y
 CONFIG_TPM_RDRESP_NEED_DELAY=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+CONFIG_POST_IO_PORT=0x80
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
-CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
 CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
-CONFIG_CPU_MICROCODE_CBFS_NONE=y

modules/coreboot

@@ -39,7 +39,11 @@ else ifeq "$(CONFIG_COREBOOT_VERSION)" "talos_2"
 	coreboot_version = git
 	coreboot_commit_hash = 2207bbcccba31ad89cf21607b0d8d05d8dc47c03
 	coreboot_repo := https://github.com/Dasharo/coreboot
-
+else ifeq "$(CONFIG_COREBOOT_VERSION)" "dasharo_kgpe-d16"
+        coreboot_version = git
+        coreboot_commit_hash = 6edf2d06df3d5c28f1ddfb1705e076a0694df5a5
+        coreboot_repo := https://github.com/Dasharo/coreboot
+	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
 else
 	$(error "$(BOARD): does not specify coreboot version under CONFIG_COREBOOT_VERSION")
 endif