omnigul : 24.12 based: fails on git pull of vboot, then on build...

Input for linuxboot#1658
(Sorry but bitrot is a thing. 24.12 is 2024/12 coreboot, which is already old. Nobody supports old versions of things. So if things break, this needs to be at least reported on a recent branch upstream, where here, upstream is MrChromebox coreboot fork)

make -C "/home/user/heads/build/x86/coreboot-mrchromebox/omnigul" -C /home/user/heads/build/x86/coreboot-mrchromebox obj=/home/user/heads/build/x86/coreboot-mrchromebox/omnigul DOTCONFIG=/home/user/heads/build/x86/coreboot-mrchromebox/omnigul/.config XGCCPATH=/home/user/heads/build/x86/coreboot-24.02.01/util/crossgcc/xgcc/bin/  BUILD_TIMELESS=1 -j1 --load-average=1
make[1]: Entering directory '/home/user/heads/build/x86/coreboot-mrchromebox'
Updating git submodules.
Skipping submodule '3rdparty/amd_blobs'
Skipping submodule '3rdparty/blobs'
Skipping submodule '3rdparty/cmocka'
Skipping submodule '3rdparty/fsp'
Skipping submodule '3rdparty/intel-microcode'
Skipping submodule '3rdparty/qc_blobs'
fatal: remote error: upload-pack: not our ref 7fd3d98a73e64f628c730e079769f0737e00ebc3
fatal: Fetched in submodule path '3rdparty/vboot', but it did not contain 7fd3d98a73e64f628c730e079769f0737e00ebc3. Direct fetching of that commit failed.

Then make in debug 'reset && ./docker_repro.sh make -d BOARD=omnigul V=1 CPUS=1'
excerpt:
[...]
FIRMWARE_ARCH=x86 CC="/home/user/heads/build/x86/coreboot-24.02.01/util/crossgcc/xgcc/bin/i386-elf-gcc" CFLAGS="-I/home/user/heads/build/x86/coreboot-mrchromebox/src -I/home/user/heads/build/x86/coreboot-mrchromebox/src/include -I/home/user/heads/build/x86/coreboot-mrchromebox/src/commonlib/include -I/home/user/heads/build/x86/coreboot-mrchromebox/src/commonlib/bsd/include -I/home/user/heads/build/x86/coreboot-mrchromebox/3rdparty/vboot/firmware/include -include /home/user/heads/build/x86/coreboot-mrchromebox/src/include/kconfig.h -include /home/user/heads/build/x86/coreboot-mrchromebox/src/include/rules.h -include /home/user/heads/build/x86/coreboot-mrchromebox/src/commonlib/bsd/include/commonlib/bsd/compiler.h -I/home/user/heads/build/x86/coreboot-mrchromebox/3rdparty -D__BUILD_DIR__=\"omnigul\" -D__TIMELESS__ -I/home/user/heads/build/x86/coreboot-mrchromebox/src/soc/intel/alderlake -I/home/user/heads/build/x86/coreboot-mrchromebox/src/soc/intel/alderlake/include -I/home/user/heads/build/x86/coreboot-mrchromebox/src/drivers/intel/fsp2_0/include -I/home/user/heads/build/x86/coreboot-mrchromebox/"3rdparty/fsp/RaptorLakeFspBinPkg/Client/RaptorLakeP/Include/" -I/home/user/heads/build/x86/coreboot-mrchromebox/src/mainboard/google/brya/variants/baseboard/include -I/home/user/heads/build/x86/coreboot-mrchromebox/src/mainboard/google/brya/variants/baseboard/brya/include -I/home/user/heads/build/x86/coreboot-mrchromebox/src/mainboard/google/brya/variants/omnigul/include -I/home/user/heads/build/x86/coreboot-mrchromebox/src/soc/intel/common/basecode/include/ -I/home/user/heads/build/x86/coreboot-mrchromebox/src/soc/intel/common/block/include/ -I/home/user/heads/build/x86/coreboot-mrchromebox/src/soc/intel/common/pch/include/ -I/home/user/heads/build/x86/coreboot-mrchromebox/src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include -I/home/user/heads/build/x86/coreboot-mrchromebox/src/vendorcode/intel/edk2/edk2-stable202005/IntelFsp2Pkg/Include -I/home/user/heads/build/x86/coreboot-mrchromebox/src/vendorcode/intel/edk2/edk2-stable202005/MdeModulePkg/Include -I/home/user/heads/build/x86/coreboot-mrchromebox/src/soc/intel/common/block/fast_spi -I/home/user/heads/build/x86/coreboot-mrchromebox/src/arch/x86/include -I/home/user/heads/build/x86/coreboot-mrchromebox/src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/Ia32 -D__ARCH_x86_32__ -pipe -g -nostdinc -std=gnu11 -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wno-trigraphs -Wimplicit-fallthrough -Wshadow -Wdate-time -Wtype-limits -Wvla -Wold-style-definition -Wdangling-else -Wmissing-include-dirs -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer -fstrict-aliasing -ffunction-sections -fdata-sections -fno-pie -Wold-style-declaration -Wno-packed-not-aligned -fconserve-stack -Wnull-dereference -Wlogical-op -Wduplicated-cond -Wno-array-compare -Werror -Os -Wno-address-of-packed-member --param=min-pagesize=1024  -m32  -fuse-ld=bfd -fno-stack-protector -Wl,--build-id=none -fno-delete-null-pointer-checks -Wlogical-op -march=i686 -mno-mmx -mno-sse -D__ROMSTAGE__ -I/home/user/heads/build/x86/coreboot-mrchromebox/omnigul -Wno-missing-prototypes -DVBOOT_DEBUG" VBOOT2="y" EC_EFS="" X86_SHA_EXT="" VB2_X86_RSA_ACCELERATION="" ARMV8_CRYPTO_EXT="" make -C 3rdparty/vboot BUILD=/home/user/heads/build/x86/coreboot-mrchromebox/omnigul/external/vboot_reference-romstage V=1 USE_FLASHROM=0 fwlib
Live child 0x18606460 (omnigul/external/vboot_reference-romstage/vboot_fw.a) PID 2751
GNU Make 4.4.1
Built for x86_64-pc-linux-gnu
Copyright (C) 1988-2023 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Reading makefiles...
Updating makefiles....
 Considering target file 'GNUmakefile'.
  File 'GNUmakefile' does not exist.
  Looking for an implicit rule for 'GNUmakefile'.
  No implicit rule found for 'GNUmakefile'.
 Finished prerequisites of target file 'GNUmakefile'.
 Must remake target 'GNUmakefile'.
 Failed to remake target file 'GNUmakefile'.
 Considering target file 'makefile'.
  File 'makefile' does not exist.
  Looking for an implicit rule for 'makefile'.
  No implicit rule found for 'makefile'.
 Finished prerequisites of target file 'makefile'.
 Must remake target 'makefile'.
 Failed to remake target file 'makefile'.
 Considering target file 'Makefile'.
  File 'Makefile' does not exist.
  Looking for an implicit rule for 'Makefile'.
  No implicit rule found for 'Makefile'.
 Finished prerequisites of target file 'Makefile'.
 Must remake target 'Makefile'.
 Failed to remake target file 'Makefile'.
Updating goal targets....
Considering target file 'fwlib'.
 File 'fwlib' does not exist.
 Looking for an implicit rule for 'fwlib'.
 No implicit rule found for 'fwlib'.
Finished prerequisites of target file 'fwlib'.
Must remake target 'fwlib'.
make[2]: *** No rule to make target 'fwlib'.  Stop.
Reaping losing child 0x18606460 PID 2751
make[1]: *** [src/security/vboot/Makefile.mk:52: omnigul/external/vboot_reference-romstage/vboot_fw.a] Error 2

Seems like something is wrong with mrchromebox + 24.02.04/24.12.
Reporting to MrChromebox would help

Signed-off-by: Thierry Laurion <insurgo@riseup.net>

Author: tlaurion

.circleci/config.yml

@@ -197,6 +197,7 @@ jobs:
             - build/x86/coreboot-24.02.01
             - build/x86/coreboot-24.12
             - build/x86/coreboot-dasharo
+            - build/x86/coreboot-mrchromebox
             - build/x86/coreboot-purism
             - build/x86/musl-cross-make-38e52db8358c043ae82b346a2e6e66bc86a53bc1
             - crossgcc

BOARD_TESTERS.md

@@ -37,6 +37,10 @@ xx8x(Kaby Lake Refresh):
 ===
 - [ ] t480: @gaspar-ilom @doritos4mlady @MattClifton76 @notgivenby @akunterkontrolle
 
+ChromeBooks (CR50 based TPM2: does not support TPM unsealed Disk Unlock Key)
+===
+- [ ] Omnigul (AlderLake: Intel 12th Gen): @mdrobnak
+
 Librems:
 ===
 - [ ] Librem 11(JasperLake): @JonathonHall-Purism

config/coreboot-omnigul.config

@@ -995,6 +995,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
 CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
 CONFIG_SOC_INTEL_COMMON_PCH_BASE=y
 CONFIG_SOC_INTEL_COMMON_PCH_LOCKDOWN=y
+CONFIG_SOC_INTEL_COMMON_SPI_LOCKDOWN_SMM=y
 CONFIG_PCH_SPECIFIC_BASE_OPTIONS=y
 CONFIG_PCH_SPECIFIC_DISCRETE_OPTIONS=y
 CONFIG_PCH_SPECIFIC_CLIENT_OPTIONS=y
@@ -1058,8 +1059,10 @@ CONFIG_PCIEXP_HOTPLUG=y
 CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
+CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
 CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
 # CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
+# CONFIG_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
 CONFIG_RCBA_LENGTH=0x4000
 
@@ -1257,7 +1260,7 @@ CONFIG_DRIVERS_INTEL_SOUNDWIRE=y
 # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_MC146818=y
-CONFIG_USE_PC_CMOS_ALTCENTURY=y
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
 # CONFIG_DRIVERS_SIL_3114 is not set
 CONFIG_DRIVERS_SOUNDWIRE_ALC5682=y

modules/coreboot

@@ -91,10 +91,14 @@ coreboot-purism_repo := https://source.puri.sm/firmware/coreboot.git
 coreboot-purism_commit_hash := bea9947a1279be7d4a72b38a601d0288d10d1cb8
 $(eval $(call coreboot_module,purism,24.02.01))
 
-# MrChromebox is based on 24.02, but focusing on Chromebooks / Chromeboxes.
+# MrChromebox offer a 24.12 based coreboot branch, focusing on Chromebooks / Chromeboxes. Point to latest commit of that branch
+#  Reuse 24.12 crossgcc env built in tree for other boards, not duplicating crossgcc build env to build coreboot
+#  Note that some patches are applied on top of coreboot cloned tree from patches/coreboot-mrchromebox:
+#   PR0 as of now only since not merged upstream yet for post-skylake
+#     This is https://review.coreboot.org/c/coreboot/+/85278
 coreboot-mrchromebox_repo := https://github.com/MrChromebox/coreboot.git
-coreboot-mrchromebox_commit_hash := f063753d235b67547736eb022f54ac0cc8dcfa61
-$(eval $(call coreboot_module,mrchromebox,24.02.01,))
+coreboot-mrchromebox_commit_hash := a1532790b90c714ab3e51555b68d4df1539ad72b
+$(eval $(call coreboot_module,mrchromebox,24.12,))
 
 # MSI and NovaCustom NV4xPZ, NS5xPU, V560TU boards are based on Dasharo
 # coreboot fork, based on upstream coreboot version 24.02