Merge pull request #1298 from tlaurion/fixup_xx20_xx30_cbfs_size

xx20/xx30 maximized coreboot configs: Fix CONFIG_CBFS_SIZE to reflect ifd.bin's BIOS region (xx20: gain of 0.59mb, xx30: gain of 0.4mb
linuxboot · Feb 9, 2023 · 5b6370c · 5b6370c
2 parents 77f8d5a + e7f1e3e
commit 5b6370c
Show file tree

Hide file tree

Showing 25 changed files with 25 additions and 25 deletions.
diff --git a/config/coreboot-qemu.config b/config/coreboot-qemu.config
@@ -1,5 +1,5 @@
 # CONFIG_INCLUDE_CONFIG_FILE is not set
-CONFIG_CBFS_SIZE=0x750000
+CONFIG_CBFS_SIZE=0x7E7FFF
 # CONFIG_POST_IO is not set
 # CONFIG_POST_DEVICE is not set
 CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y

diff --git a/config/coreboot-t420-hotp-maximized.config b/config/coreboot-t420-hotp-maximized.config
@@ -3,7 +3,7 @@ CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0x750000
+CONFIG_CBFS_SIZE=0x7E7FFF
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx20/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx20/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx20/gbe.bin"

diff --git a/config/coreboot-t420-maximized.config b/config/coreboot-t420-maximized.config
@@ -3,7 +3,7 @@ CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0x750000
+CONFIG_CBFS_SIZE=0x7E7FFF
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx20/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx20/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx20/gbe.bin"

diff --git a/config/coreboot-t420.config b/config/coreboot-t420.config
@@ -1,7 +1,7 @@
 # CONFIG_USE_BLOBS is not set
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0x750000
+CONFIG_CBFS_SIZE=0x7E7FFF
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/t420/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/t420/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/t420/gbe.bin"

diff --git a/config/coreboot-t430-hotp-maximized.config b/config/coreboot-t430-hotp-maximized.config
@@ -3,7 +3,7 @@ CONFIG_STATIC_OPTION_TABLE=y
 # CONFIG_USE_BLOBS is not set
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx30/gbe.bin"

diff --git a/config/coreboot-t430-maximized.config b/config/coreboot-t430-maximized.config
@@ -3,7 +3,7 @@ CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx30/gbe.bin"

diff --git a/config/coreboot-t520-hotp-maximized.config b/config/coreboot-t520-hotp-maximized.config
@@ -3,7 +3,7 @@
 CONFIG_USE_BLOBS=y
 CONFIG_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0x750000
+CONFIG_CBFS_SIZE=0x7E7FFF
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y

diff --git a/config/coreboot-t520-maximized.config b/config/coreboot-t520-maximized.config
@@ -3,7 +3,7 @@
 CONFIG_USE_BLOBS=y
 CONFIG_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0x750000
+CONFIG_CBFS_SIZE=0x7E7FFF
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y

diff --git a/config/coreboot-t530-dgpu-hotp-maximized.config b/config/coreboot-t530-dgpu-hotp-maximized.config
@@ -1,6 +1,6 @@
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y

diff --git a/config/coreboot-t530-dgpu-maximized.config b/config/coreboot-t530-dgpu-maximized.config
@@ -1,6 +1,6 @@
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y

diff --git a/config/coreboot-t530-hotp-maximized.config b/config/coreboot-t530-hotp-maximized.config
@@ -1,6 +1,6 @@
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y

diff --git a/config/coreboot-t530-maximized.config b/config/coreboot-t530-maximized.config
@@ -1,6 +1,6 @@
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y

diff --git a/config/coreboot-w530-dgpu-K1000m-hotp-maximized.config b/config/coreboot-w530-dgpu-K1000m-hotp-maximized.config
@@ -1,6 +1,6 @@
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y

diff --git a/config/coreboot-w530-dgpu-K1000m-maximized.config b/config/coreboot-w530-dgpu-K1000m-maximized.config
@@ -1,6 +1,6 @@
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y

diff --git a/config/coreboot-w530-dgpu-K2000m-hotp-maximized.config b/config/coreboot-w530-dgpu-K2000m-hotp-maximized.config
@@ -1,6 +1,6 @@
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y

diff --git a/config/coreboot-w530-dgpu-K2000m-maximized.config b/config/coreboot-w530-dgpu-K2000m-maximized.config
@@ -1,6 +1,6 @@
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y

diff --git a/config/coreboot-w530-hotp-maximized.config b/config/coreboot-w530-hotp-maximized.config
@@ -1,6 +1,6 @@
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y

diff --git a/config/coreboot-w530-maximized.config b/config/coreboot-w530-maximized.config
@@ -1,6 +1,6 @@
 CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 CONFIG_HAVE_GBE_BIN=y

diff --git a/config/coreboot-x220-hotp-maximized.config b/config/coreboot-x220-hotp-maximized.config
@@ -1,7 +1,7 @@
 # CONFIG_USE_BLOBS is not set
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0x750000
+CONFIG_CBFS_SIZE=0x7E7FFF
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx20/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx20/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx20/gbe.bin"

diff --git a/config/coreboot-x220-maximized.config b/config/coreboot-x220-maximized.config
@@ -1,7 +1,7 @@
 # CONFIG_USE_BLOBS is not set
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0x750000
+CONFIG_CBFS_SIZE=0x7E7FFF
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx20/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx20/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx20/gbe.bin"

diff --git a/config/coreboot-x220.config b/config/coreboot-x220.config
@@ -1,7 +1,7 @@
 # CONFIG_USE_BLOBS is not set
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0x750000
+CONFIG_CBFS_SIZE=0x7E7FFF
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx20/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx20/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx20/gbe.bin"

diff --git a/config/coreboot-x230-hotp-maximized.config b/config/coreboot-x230-hotp-maximized.config
@@ -1,7 +1,7 @@
 # CONFIG_USE_BLOBS is not set
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx30/gbe.bin"

diff --git a/config/coreboot-x230-hotp-maximized_usb-kb.config b/config/coreboot-x230-hotp-maximized_usb-kb.config
@@ -1,7 +1,7 @@
 # CONFIG_USE_BLOBS is not set
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx30/gbe.bin"

diff --git a/config/coreboot-x230-maximized-fhd_edp.config b/config/coreboot-x230-maximized-fhd_edp.config
@@ -2,7 +2,7 @@
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/x230_edp/data.vbt"
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"

diff --git a/config/coreboot-x230-maximized.config b/config/coreboot-x230-maximized.config
@@ -1,7 +1,7 @@
 # CONFIG_USE_BLOBS is not set
 CONFIG_VENDOR_LENOVO=y
 CONFIG_NO_POST=y
-CONFIG_CBFS_SIZE=0xB80000
+CONFIG_CBFS_SIZE=0xBE4FFF
 CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx30/gbe.bin"