Add support for Acer Chromebook 515 Plus (CB515-2H) / Google Omnigul

Use MrChromeBox Coreboot and Linux 6.6.30.
Add CircleCI Board config.

Signed-off-by: Matthew Drobnak <[email protected]>

Author: mdrobnak

.circleci/config.yml

@@ -237,6 +237,14 @@ workflows:
           requires:
             - x86-musl-cross-make
 
+      # coreboot-git mrchromebox
+      - build:
+          name: omnigul
+          target: omnigul
+          subcommand: ""
+          requires:
+            - x86-musl-cross-make
+
       # coreboot purism
       - build_and_persist:
           name: librem_14

boards/omnigul/omnigul.config

@@ -1,9 +1,11 @@
-# Nitrokey Nitropad NV41 board configuration
-# Note: for reference, other GOP enabled FB board is librem_11
+# Configuration for a Acer Chromebook Plus 515 (CB515-2H/OMNIGUL)
+# Intel iGPU "UHD Graphics", 12th Gen Intel Core i3-1215U, 8GB RAM
+# 128GB UFS Storage (iNAND brand), Intel AX211 Wi-FI 6E,
+# 32MB Winbond Chip W25Q256JVEM - WSON8 8x6 probe needed.
 
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=dasharo
-export CONFIG_LINUX_VERSION=6.1.8
+export CONFIG_COREBOOT_VERSION=mrchromebox
+export CONFIG_LINUX_VERSION=6.6.30
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-omnigul.config
 CONFIG_LINUX_CONFIG=config/linux-omnigul.config
@@ -14,14 +16,18 @@ CONFIG_LINUX_CONFIG=config/linux-omnigul.config
 #Enable TPM2 pcap output under /tmp
 #export CONFIG_TPM2_CAPTURE_PCAP=y
 
+# Since the TPM 2.0 implementation in the CR50 is not complete
+# we are disabling TPM Disk Unlock
+CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
+
 #On-demand hardware support (modules.cpio)
 CONFIG_LINUX_USB=y
-CONFIG_LINUX_E1000=y
+CONFIG_LINUX_E1000=n
 CONFIG_MOBILE_TETHERING=y
 
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -30,8 +36,8 @@ CONFIG_LVM2=y
 CONFIG_MBEDTLS=y
 CONFIG_PCIUTILS=y
 #Runtime tools to write to EC/MSR
-CONFIG_IOTOOLS=y
-CONFIG_MSRTOOLS=y
+CONFIG_IOTOOLS=n
+CONFIG_MSRTOOLS=n
 #Remote attestation support
 # TPM2 requirements
 CONFIG_TPM2_TSS=y
@@ -42,7 +48,7 @@ CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
 #HOTP based remote attestation for supported USB Security dongle
 #With/Without TPM support
-CONFIG_HOTPKEY=y
+CONFIG_HOTPKEY=n
 #Nitrokey Storage admin tool (deprecated)
 #CONFIG_NKSTORECLI=n
 #GUI Support
@@ -68,8 +74,8 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init
 export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
-export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
-export CONFIG_BOOT_DEV="/dev/nvme0n1"
-export CONFIG_BOARD_NAME="Nitropad NV41"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_BOOT_KERNEL_REMOVE=""
+export CONFIG_BOOT_DEV="/dev/sda2"
+export CONFIG_BOARD_NAME="Google Omnigul"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd -i bios -i fd"
 export CONFIG_AUTO_BOOT_TIMEOUT=5

config/coreboot-omnigul.config

@@ -7,7 +7,7 @@
 # General setup
 #
 CONFIG_COREBOOT_BUILD=y
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="MrChromebox-4.22.4"
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
@@ -34,7 +34,9 @@ CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
 # CONFIG_NO_STAGE_CACHE is not set
 CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_BOOTSPLASH_IMAGE is not set
+CONFIG_BOOTSPLASH_IMAGE=y
+CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"
+# CONFIG_BOOTSPLASH_CONVERT is not set
 CONFIG_FW_CONFIG=y
 CONFIG_FW_CONFIG_SOURCE_CHROMEEC_CBI=y
 # CONFIG_FW_CONFIG_SOURCE_CBFS is not set
@@ -114,7 +116,7 @@ CONFIG_DIMM_SPD_SIZE=512
 CONFIG_FMDFILE=""
 CONFIG_NO_POST=y
 CONFIG_MAINBOARD_VENDOR="Google"
-CONFIG_CBFS_SIZE=0x450000
+CONFIG_CBFS_SIZE=0xBE0000
 # CONFIG_CONSOLE_SERIAL is not set
 CONFIG_MAX_CPUS=32
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
@@ -127,7 +129,7 @@ CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Google"
 CONFIG_INTEL_GMA_VBT_FILE="3rdparty/blobs/mainboard/google/brya/brya/omnigul/vbt.bin"
-# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
+CONFIG_DISABLE_HECI1_AT_PRE_BOOT=y
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0x4000
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 # CONFIG_USE_PM_ACPI_TIMER is not set
@@ -703,7 +705,6 @@ CONFIG_BOARD_GOOGLE_OMNIGUL=y
 # CONFIG_BOARD_GOOGLE_VILBOZ is not set
 # CONFIG_BOARD_GOOGLE_WOOMAX is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x40000
-CONFIG_EDK2_BOOT_TIMEOUT=2
 CONFIG_BASEBOARD_DIR="brya"
 CONFIG_DRIVER_TPM_I2C_BUS=0x1
 CONFIG_DRIVER_TPM_I2C_ADDR=0x50
@@ -740,8 +741,8 @@ CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
 CONFIG_FSP_TEMP_RAM_SIZE=0x20000
 CONFIG_HEAP_SIZE=0x10000
 CONFIG_EC_GPE_SCI=0x50
-CONFIG_EDK2_BOOTSPLASH_FILE="Documentation/coreboot_logo.bmp"
-# CONFIG_TPM_MEASURED_BOOT is not set
+CONFIG_TPM_MEASURED_BOOT=y
+CONFIG_LINUX_COMMAND_LINE=""
 CONFIG_BOARD_ROMSIZE_KB_32768=y
 # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -760,10 +761,10 @@ CONFIG_COREBOOT_ROMSIZE_KB=32768
 CONFIG_ROM_SIZE=0x02000000
 CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
 CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
-# CONFIG_POWER_STATE_OFF_AFTER_FAILURE is not set
-CONFIG_POWER_STATE_ON_AFTER_FAILURE=y
+CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
+# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
 # CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
-CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
+CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
 # end of Mainboard
 
 CONFIG_VPD=y
@@ -772,10 +773,8 @@ CONFIG_FSP_HEADER_PATH="3rdparty/fsp/RaptorLakeFspBinPkg/Client/RaptorLakeP/Incl
 CONFIG_FSP_M_FILE="$(obj)/Fsp_M.fd"
 CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd"
 CONFIG_PCIEXP_HOTPLUG_IO=0x6000
-CONFIG_EDK2_TAG_OR_REV="origin/uefipayload_2402"
 CONFIG_EDK2_BOOT_MANAGER_ESCAPE=y
 CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
-# CONFIG_EDK2_FULL_SCREEN_SETUP is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
 #
@@ -1082,9 +1081,9 @@ CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_NONE=y
 CONFIG_HAVE_ME_BIN=y
 # CONFIG_STITCH_ME_BIN is not set
 CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS=y
-CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y
+# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
 # CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-# CONFIG_UNLOCK_FLASH_REGIONS is not set
+CONFIG_UNLOCK_FLASH_REGIONS=y
 CONFIG_MAINBOARD_HAS_CHROMEOS=y
 
 #
@@ -1138,10 +1137,9 @@ CONFIG_NO_EARLY_GFX_INIT=y
 #
 # Display
 #
-CONFIG_WANT_LINEAR_FRAMEBUFFER=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
-# CONFIG_BOOTSPLASH is not set
+CONFIG_BOOTSPLASH=y
 # end of Display
 
 CONFIG_PCI=y
@@ -1299,6 +1297,13 @@ CONFIG_TPM2=y
 CONFIG_TPM=y
 CONFIG_MAINBOARD_HAS_TPM2=y
 # CONFIG_DEBUG_TPM is not set
+# CONFIG_TPM_LOG_CB is not set
+CONFIG_TPM_LOG_TPM2=y
+# CONFIG_TPM_HASH_SHA1 is not set
+CONFIG_TPM_HASH_SHA256=y
+# CONFIG_TPM_HASH_SHA384 is not set
+# CONFIG_TPM_HASH_SHA512 is not set
+CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
 CONFIG_PCR_BOOT_MODE=1
 CONFIG_PCR_HWID=1
 CONFIG_PCR_SRTM=2
@@ -1391,35 +1396,12 @@ CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 # CONFIG_PAYLOAD_LINUXBOOT is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
 # CONFIG_PAYLOAD_UBOOT is not set
-CONFIG_PAYLOAD_EDK2=y
-# CONFIG_PAYLOAD_LINUX is not set
-CONFIG_PAYLOAD_FILE="omnigul/UEFIPAYLOAD.fd"
+# CONFIG_PAYLOAD_EDK2 is not set
+CONFIG_PAYLOAD_LINUX=y
+CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_PAYLOAD_OPTIONS=""
-CONFIG_EDK2_UEFIPAYLOAD=y
-# CONFIG_EDK2_UNIVERSAL_PAYLOAD is not set
-CONFIG_EDK2_REPO_MRCHROMEBOX=y
-# CONFIG_EDK2_REPO_OFFICIAL is not set
-# CONFIG_EDK2_REPO_CUSTOM is not set
-CONFIG_EDK2_REPOSITORY="https://github.com/mrchromebox/edk2"
-# CONFIG_EDK2_USE_EDK2_PLATFORMS is not set
-# CONFIG_EDK2_DEBUG is not set
-CONFIG_EDK2_RELEASE=y
-# CONFIG_EDK2_CBMEM_LOGGING is not set
-CONFIG_EDK2_CPU_TIMER_LIB=y
-CONFIG_EDK2_HAVE_EFI_SHELL=y
-CONFIG_EDK2_PRIORITIZE_INTERNAL=y
-CONFIG_EDK2_PS2_SUPPORT=y
-CONFIG_EDK2_SD_MMC_TIMEOUT=10
-# CONFIG_EDK2_SERIAL_SUPPORT is not set
-CONFIG_EDK2_SECURE_BOOT_SUPPORT=y
-# CONFIG_EDK2_NETWORK_PXE_SUPPORT is not set
-# CONFIG_EDK2_DISABLE_TPM is not set
-CONFIG_EDK2_UFS_ENABLE=y
-CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D VARIABLE_SUPPORT=SMMSTORE"
 # CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
-CONFIG_COMPRESSED_PAYLOAD_LZMA=y
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
+CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 
 #