From 8fe6fc1b0ca0ebcd1022965c24904559f72807cd Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Thu, 13 Mar 2025 13:39:12 -0400 Subject: [PATCH] d16: adjust d16 boards coreboot configs, circleci config so all builds with 15h fork Rebased on master making arha commits co-signed since they were not signed-off repro: git fetch origin git rebase --signoff origin/master vi boards/*/*.config #so all boards point to 15h for coreboot fork ./docker_repro.sh make BOARD=*d16_boards* coreboot.modify_and_save_oldconfig_in_place #so oldconfig under config/coreboot* are updated with changes observable to15h fork, make sure measured boot on vi .circleci/config.yml #to readd d16 boards, make them depend on musl-cross-make for workstation, and then reuse workstation build cache for other boards Signed-off-by: Thierry Laurion Signed-off-by: arhabd --- .circleci/config.yml | 29 +++++++++++++++++++ .../UNMAINTAINED_kgpe-d16_server.config | 2 +- ...D_kgpe-d16_workstation-usb_keyboard.config | 2 +- config/coreboot-kgpe-d16_server.config | 15 ++++++++-- ...t-kgpe-d16_workstation-usb_keyboard.config | 15 ++++++++-- modules/coreboot | 1 + 6 files changed, 56 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f271c62e..4a71225c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -543,3 +543,32 @@ workflows: subcommand: "" requires: - novacustom-nv4x_adl + + # coreboot fam15h + - build: + name: UNMAINTAINED_kgpe-d16_workstation + target: UNMAINTAINED_kgpe-d16_workstation + subcommand: "" + requires: + - x86-musl-cross-make + + - build: + name: UNMAINTAINED_kgpe-d16_workstation-usb_keyboard + target: UNMAINTAINED_kgpe-d16_workstation-usb_keyboard + subcommand: "" + requires: + - UNMAINTAINED_kgpe-d16_workstation + + - build: + name: UNMAINTAINED_kgpe-d16_server + target: UNMAINTAINED_kgpe-d16_server + subcommand: "" + requires: + - UNMAINTAINED_kgpe-d16_workstation + + - build: + name: UNMAINTAINED_kgpe-d16_server-whiptail + target: UNMAINTAINED_kgpe-d16_server-whiptail + subcommand: "" + requires: + - UNMAINTAINED_kgpe-d16_workstation diff --git a/boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_kgpe-d16_server.config b/boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_kgpe-d16_server.config index 8ed475d7..1e4d8aff 100644 --- a/boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_kgpe-d16_server.config +++ b/boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_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=15h export CONFIG_LINUX_VERSION=6.1.8 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config diff --git a/boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config b/boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config index f5c4bfb8..8fdcc974 100644 --- a/boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config +++ b/boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_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=15h export CONFIG_LINUX_VERSION=6.1.8 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config diff --git a/config/coreboot-kgpe-d16_server.config b/config/coreboot-kgpe-d16_server.config index 32bf907c..b0dfd26f 100644 --- a/config/coreboot-kgpe-d16_server.config +++ b/config/coreboot-kgpe-d16_server.config @@ -28,7 +28,6 @@ CONFIG_NO_RELOCATABLE_RAMSTAGE=y # CONFIG_RELOCATABLE_RAMSTAGE is not set # CONFIG_UPDATE_IMAGE is not set # CONFIG_BOOTSPLASH_IMAGE is not set -CONFIG_MEASURED_BOOT=y # # Mainboard @@ -104,6 +103,7 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_DIMM_SPD_SIZE=256 # CONFIG_VGA_BIOS is not set CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" +CONFIG_VGA_BIOS_FILE="3rdparty/blobs/mainboard/asus/kgpe-d16/VGABIOS.bin" CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" @@ -161,12 +161,14 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16" CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7 # CONFIG_USBDEBUG is not set CONFIG_IPMI_KCS_REGISTER_SPACING=1 +CONFIG_IPMI_FRU_SINGLE_RW_SZ=16 CONFIG_MAINBOARD_VERSION="1.0" CONFIG_DRIVERS_PS2_KEYBOARD=y CONFIG_PCIEXP_L1_SUB_STATE=y # CONFIG_NO_POST is not set CONFIG_SMBIOS_ENCLOSURE_TYPE=0x03 CONFIG_HEAP_SIZE=0xc0000 +CONFIG_CPU_ADDR_BITS=48 # CONFIG_CONSOLE_POST is not set CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 @@ -209,7 +211,6 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1 # SoC # CONFIG_HAVE_BOOTBLOCK=y -CONFIG_CPU_ADDR_BITS=48 CONFIG_MMCONF_BUS_NUMBER=256 CONFIG_EHCI_BAR=0xfef00000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 @@ -325,6 +326,8 @@ CONFIG_DIMM_VOLTAGE_SET_SUPPORT=y CONFIG_LIMIT_HT_DOWN_WIDTH_16=y # CONFIG_LIMIT_HT_UP_WIDTH_8 is not set CONFIG_LIMIT_HT_UP_WIDTH_16=y +# CONFIG_AMD_NB_CIMX is not set +# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set # CONFIG_NORTHBRIDGE_AMD_PI is not set # @@ -449,6 +452,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000 # CONFIG_MAINBOARD_HAS_CRB_TPM is not set # CONFIG_GIC is not set CONFIG_IPMI_KCS=y +CONFIG_IPMI_KCS_TIMEOUT_MS=5000 # CONFIG_DRIVERS_LENOVO_WACOM is not set # CONFIG_RT8168_GET_MAC_FROM_VPD is not set # CONFIG_RT8168_SET_LED_MODE is not set @@ -488,7 +492,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y # CONFIG_DRIVERS_AMD_PI is not set CONFIG_DRIVERS_ASPEED_AST2050=y CONFIG_DRIVERS_ASPEED_AST_COMMON=y -# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set # CONFIG_DRIVERS_I2C_MAX98373 is not set # CONFIG_DRIVERS_I2C_MAX98927 is not set # CONFIG_DRIVERS_I2C_PCA9538 is not set @@ -529,6 +532,7 @@ CONFIG_VGA=y # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set # CONFIG_DRIVERS_SIL_3114 is not set # CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set +# CONFIG_MAINBOARD_HAS_SPI_TPM is not set # CONFIG_DRIVER_TI_TPS65090 is not set # CONFIG_DRIVERS_TI_TPS65913 is not set # CONFIG_DRIVERS_TI_TPS65913_RTC is not set @@ -542,6 +546,7 @@ CONFIG_VGA=y # # Verified Boot (vboot) # +CONFIG_VBOOT_LIB=y # # Trusted Platform Module @@ -553,10 +558,13 @@ CONFIG_USER_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set CONFIG_TPM_RDRESP_NEED_DELAY=y +CONFIG_TPM_MEASURED_BOOT=y +CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" # # Memory initialization # +# CONFIG_STM is not set # CONFIG_ACPI_SATA_GENERATOR is not set # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set @@ -691,6 +699,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_MALLOC is not set # CONFIG_DEBUG_CONSOLE_INIT is not set # CONFIG_DEBUG_SPI_FLASH is not set +# CONFIG_DEBUG_IPMI is not set # CONFIG_TRACE is not set # CONFIG_DEBUG_BOOT_STATE is not set # CONFIG_DEBUG_ADA_CODE is not set diff --git a/config/coreboot-kgpe-d16_workstation-usb_keyboard.config b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config index b4adf654..e958b6fb 100644 --- a/config/coreboot-kgpe-d16_workstation-usb_keyboard.config +++ b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config @@ -28,7 +28,6 @@ CONFIG_NO_RELOCATABLE_RAMSTAGE=y # CONFIG_RELOCATABLE_RAMSTAGE is not set # CONFIG_UPDATE_IMAGE is not set # CONFIG_BOOTSPLASH_IMAGE is not set -CONFIG_MEASURED_BOOT=y # # Mainboard @@ -104,6 +103,7 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_DIMM_SPD_SIZE=256 # CONFIG_VGA_BIOS is not set CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" +CONFIG_VGA_BIOS_FILE="3rdparty/blobs/mainboard/asus/kgpe-d16/VGABIOS.bin" CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS" CONFIG_DEVICETREE="devicetree.cb" @@ -161,12 +161,14 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16" CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7 # CONFIG_USBDEBUG is not set CONFIG_IPMI_KCS_REGISTER_SPACING=1 +CONFIG_IPMI_FRU_SINGLE_RW_SZ=16 CONFIG_MAINBOARD_VERSION="1.0" CONFIG_DRIVERS_PS2_KEYBOARD=y CONFIG_PCIEXP_L1_SUB_STATE=y # CONFIG_NO_POST is not set CONFIG_SMBIOS_ENCLOSURE_TYPE=0x03 CONFIG_HEAP_SIZE=0xc0000 +CONFIG_CPU_ADDR_BITS=48 # CONFIG_CONSOLE_POST is not set CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 @@ -209,7 +211,6 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1 # SoC # CONFIG_HAVE_BOOTBLOCK=y -CONFIG_CPU_ADDR_BITS=48 CONFIG_MMCONF_BUS_NUMBER=256 CONFIG_EHCI_BAR=0xfef00000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 @@ -325,6 +326,8 @@ CONFIG_DIMM_VOLTAGE_SET_SUPPORT=y CONFIG_LIMIT_HT_DOWN_WIDTH_16=y # CONFIG_LIMIT_HT_UP_WIDTH_8 is not set CONFIG_LIMIT_HT_UP_WIDTH_16=y +# CONFIG_AMD_NB_CIMX is not set +# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set # CONFIG_NORTHBRIDGE_AMD_PI is not set # @@ -449,6 +452,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000 # CONFIG_MAINBOARD_HAS_CRB_TPM is not set # CONFIG_GIC is not set CONFIG_IPMI_KCS=y +CONFIG_IPMI_KCS_TIMEOUT_MS=5000 # CONFIG_DRIVERS_LENOVO_WACOM is not set # CONFIG_RT8168_GET_MAC_FROM_VPD is not set # CONFIG_RT8168_SET_LED_MODE is not set @@ -488,7 +492,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y # CONFIG_DRIVERS_AMD_PI is not set CONFIG_DRIVERS_ASPEED_AST2050=y CONFIG_DRIVERS_ASPEED_AST_COMMON=y -# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set # CONFIG_DRIVERS_I2C_MAX98373 is not set # CONFIG_DRIVERS_I2C_MAX98927 is not set # CONFIG_DRIVERS_I2C_PCA9538 is not set @@ -529,6 +532,7 @@ CONFIG_VGA=y # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set # CONFIG_DRIVERS_SIL_3114 is not set # CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set +# CONFIG_MAINBOARD_HAS_SPI_TPM is not set # CONFIG_DRIVER_TI_TPS65090 is not set # CONFIG_DRIVERS_TI_TPS65913 is not set # CONFIG_DRIVERS_TI_TPS65913_RTC is not set @@ -542,6 +546,7 @@ CONFIG_VGA=y # # Verified Boot (vboot) # +CONFIG_VBOOT_LIB=y # # Trusted Platform Module @@ -553,10 +558,13 @@ CONFIG_USER_TPM1=y # CONFIG_TPM_DEACTIVATE is not set # CONFIG_DEBUG_TPM is not set CONFIG_TPM_RDRESP_NEED_DELAY=y +CONFIG_TPM_MEASURED_BOOT=y +CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA="" # # Memory initialization # +# CONFIG_STM is not set # CONFIG_ACPI_SATA_GENERATOR is not set # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set @@ -691,6 +699,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_MALLOC is not set # CONFIG_DEBUG_CONSOLE_INIT is not set # CONFIG_DEBUG_SPI_FLASH is not set +# CONFIG_DEBUG_IPMI is not set # CONFIG_TRACE is not set # CONFIG_DEBUG_BOOT_STATE is not set # CONFIG_DEBUG_ADA_CODE is not set diff --git a/modules/coreboot b/modules/coreboot index c9770a71..a7e22943 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -117,6 +117,7 @@ coreboot-15h_repo := https://git.15h.org/mrothfuss/coreboot-15h.git coreboot-15h_commit_hash := 1c529657c0c1221f1c63dd8cd1fd096c7821de9c $(eval $(call coreboot_module,15h,)) + # Check that the board configured the coreboot version correctly ifeq "$(CONFIG_COREBOOT_VERSION)" "" $(error "$(BOARD): does not specify coreboot version under CONFIG_COREBOOT_VERSION")