From 9227476afa2e9cc7975c18fa10183422a8eb3002 Mon Sep 17 00:00:00 2001 From: gaspar-ilom Date: Fri, 14 Mar 2025 16:29:28 +0100 Subject: [PATCH] Revert "t440p/w541 use broadwell mrc blob" This reverts commit 95322c66291d7e34c437f77f12cdd89707a6b0ce. Signed-off-by: gaspar-ilom --- blobs/broadwell/.gitignore | 1 - blobs/broadwell/obtain-mrc | 44 ------------------- boards/t440p-maximized/t440p-maximized.config | 6 +-- boards/w541-maximized/w541-maximized.config | 6 +-- config/coreboot-t440p.config | 16 +++---- config/coreboot-w541.config | 16 +++---- 6 files changed, 16 insertions(+), 73 deletions(-) delete mode 100644 blobs/broadwell/.gitignore delete mode 100755 blobs/broadwell/obtain-mrc diff --git a/blobs/broadwell/.gitignore b/blobs/broadwell/.gitignore deleted file mode 100644 index b3810c18..00000000 --- a/blobs/broadwell/.gitignore +++ /dev/null @@ -1 +0,0 @@ -mrc.bin diff --git a/blobs/broadwell/obtain-mrc b/blobs/broadwell/obtain-mrc deleted file mode 100755 index 2fdd0408..00000000 --- a/blobs/broadwell/obtain-mrc +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -e - -function usage() { - echo -n \ - "Usage: $(basename "$0") path_to_output_directory -Obtain mrc.bin from a Broadwell Chromebook firmware image. -" -} - -MRC_BIN_HASH="dd05ab481e1fe0ce20ade164cf3dbef3c479592801470e6e79faa17624751343" - -if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then - if [[ "${1:-}" == "--help" ]]; then - usage - else - if [[ -z "${COREBOOT_DIR}" ]]; then - echo "ERROR: No COREBOOT_DIR variable defined." - exit 1 - fi - - output_dir="$(realpath "${1:-./}")" - - # Obtain broadwell mrc blob - if [[ ! -f "${output_dir}/mrc.bin" ]]; then - pushd "${COREBOOT_DIR}" - - make -C util/cbfstool - cd util/chromeos - ./crosfirmware.sh samus - ../cbfstool/cbfstool coreboot-*.bin extract -f mrc.bin -n mrc.bin -r RO_SECTION - - mv mrc.bin "${output_dir}/mrc.bin" - - popd - fi - - if ! echo "${MRC_BIN_HASH} ${output_dir}/mrc.bin" | sha256sum --check; then - echo "ERROR: SHA256 checksum for mrc.bin doesn't match." - exit 1 - fi - fi -fi diff --git a/boards/t440p-maximized/t440p-maximized.config b/boards/t440p-maximized/t440p-maximized.config index 1e6bb277..20730d0f 100644 --- a/boards/t440p-maximized/t440p-maximized.config +++ b/boards/t440p-maximized/t440p-maximized.config @@ -49,11 +49,7 @@ export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal" # Make the Coreboot build depend on the following 3rd party blobs: $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \ - $(pwd)/blobs/broadwell/mrc.bin $(pwd)/blobs/t440p/me.bin - -$(pwd)/blobs/broadwell/mrc.bin: - COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \ - $(pwd)/blobs/broadwell/obtain-mrc $(pwd)/blobs/broadwell + $(pwd)/blobs/t440p/me.bin $(pwd)/blobs/t440p/me.bin: COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \ diff --git a/boards/w541-maximized/w541-maximized.config b/boards/w541-maximized/w541-maximized.config index 8cc6614d..e9db1529 100644 --- a/boards/w541-maximized/w541-maximized.config +++ b/boards/w541-maximized/w541-maximized.config @@ -49,11 +49,7 @@ export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal" # Make the Coreboot build depend on the following 3rd party blobs: $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \ - $(pwd)/blobs/broadwell/mrc.bin $(pwd)/blobs/w541/me.bin - -$(pwd)/blobs/broadwell/mrc.bin: - COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \ - $(pwd)/blobs/broadwell/obtain-mrc $(pwd)/blobs/broadwell + $(pwd)/blobs/w541/me.bin $(pwd)/blobs/w541/me.bin: COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \ diff --git a/config/coreboot-t440p.config b/config/coreboot-t440p.config index 2f588581..a4a3e1ca 100644 --- a/config/coreboot-t440p.config +++ b/config/coreboot-t440p.config @@ -153,9 +153,9 @@ CONFIG_MAX_SOCKET=1 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 CONFIG_TPM_PIRQ=0x0 CONFIG_DCACHE_RAM_BASE=0xff7c0000 -CONFIG_DCACHE_RAM_SIZE=0x10000 +CONFIG_DCACHE_RAM_SIZE=0x40000 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000 -CONFIG_DCACHE_BSP_STACK_SIZE=0x2000 +CONFIG_DCACHE_BSP_STACK_SIZE=0x20000 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144 CONFIG_HAVE_INTEL_FIRMWARE=y CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 @@ -275,7 +275,7 @@ CONFIG_SMM_MODULE_STACK_SIZE=0x400 CONFIG_SERIRQ_CONTINUOUS_MODE=y CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xf0000000 -CONFIG_EHCI_BAR=0xd8000000 +CONFIG_EHCI_BAR=0xe8000000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 CONFIG_IED_REGION_SIZE=0x400000 @@ -284,9 +284,7 @@ CONFIG_INTEL_GMA_BCLV_WIDTH=16 CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256 CONFIG_INTEL_GMA_BCLM_WIDTH=16 CONFIG_BOOTBLOCK_IN_CBFS=y -CONFIG_HAVE_MRC=y -CONFIG_MRC_FILE="@BLOB_DIR@/broadwell/mrc.bin" -CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000 +CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 @@ -337,9 +335,7 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y # Northbridge # CONFIG_NORTHBRIDGE_INTEL_HASWELL=y -# CONFIG_USE_NATIVE_RAMINIT is not set -CONFIG_USE_BROADWELL_MRC=y -CONFIG_HASWELL_HIDE_PEG_FROM_MRC=y +CONFIG_USE_NATIVE_RAMINIT=y # # Southbridge @@ -695,6 +691,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # General Debug Settings # # CONFIG_DEBUG_CBFS is not set +CONFIG_HAVE_DEBUG_RAM_SETUP=y +# CONFIG_DEBUG_RAM_SETUP is not set CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_SMBUS is not set # CONFIG_DEBUG_CONSOLE_INIT is not set diff --git a/config/coreboot-w541.config b/config/coreboot-w541.config index 2ab61cf3..aac258dd 100644 --- a/config/coreboot-w541.config +++ b/config/coreboot-w541.config @@ -153,9 +153,9 @@ CONFIG_MAX_SOCKET=1 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 CONFIG_TPM_PIRQ=0x0 CONFIG_DCACHE_RAM_BASE=0xff7c0000 -CONFIG_DCACHE_RAM_SIZE=0x10000 +CONFIG_DCACHE_RAM_SIZE=0x40000 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000 -CONFIG_DCACHE_BSP_STACK_SIZE=0x2000 +CONFIG_DCACHE_BSP_STACK_SIZE=0x20000 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144 CONFIG_HAVE_INTEL_FIRMWARE=y CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 @@ -275,7 +275,7 @@ CONFIG_SMM_MODULE_STACK_SIZE=0x400 CONFIG_SERIRQ_CONTINUOUS_MODE=y CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xf0000000 -CONFIG_EHCI_BAR=0xd8000000 +CONFIG_EHCI_BAR=0xe8000000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 CONFIG_IED_REGION_SIZE=0x400000 @@ -284,9 +284,7 @@ CONFIG_INTEL_GMA_BCLV_WIDTH=16 CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256 CONFIG_INTEL_GMA_BCLM_WIDTH=16 CONFIG_BOOTBLOCK_IN_CBFS=y -CONFIG_HAVE_MRC=y -CONFIG_MRC_FILE="@BLOB_DIR@/broadwell/mrc.bin" -CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000 +CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 @@ -337,9 +335,7 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y # Northbridge # CONFIG_NORTHBRIDGE_INTEL_HASWELL=y -# CONFIG_USE_NATIVE_RAMINIT is not set -CONFIG_USE_BROADWELL_MRC=y -CONFIG_HASWELL_HIDE_PEG_FROM_MRC=y +CONFIG_USE_NATIVE_RAMINIT=y # # Southbridge @@ -694,6 +690,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # General Debug Settings # # CONFIG_DEBUG_CBFS is not set +CONFIG_HAVE_DEBUG_RAM_SETUP=y +# CONFIG_DEBUG_RAM_SETUP is not set CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_SMBUS is not set # CONFIG_DEBUG_CONSOLE_INIT is not set