From e7f1e3e7a7075b0d6490b4b00fcc8b25b3e928c6 Mon Sep 17 00:00:00 2001
From: Thierry Laurion <insurgo@riseup.net>
Date: Sat, 28 Jan 2023 16:17:59 -0500
Subject: [PATCH] xx20/xx30 maximized coreboot configs: Fix CONFIG_CBFS_SIZE to
 reflect ifd.bin's BIOS regions.

The calculations outlined at https://github.com/osresearch/heads/pull/1282#discussion_r1072473677
Sums to having 'ifdtool -f layout.txt ifd_shrinked.bin && cat layout.txt'
The example for T440p:
00000000:00000fff fd
00021000:00bfffff bios
00003000:00020fff me
00001000:00002fff gbe

Here: 00bfffff-00021000=BDEFFF
Which is exact result of @rbeslow's calculations.

There is an issue on haswell, maybe because of car, maybe because of non native memory init blob.
But this is not the case for xx20/xx30 boards.
---
 config/coreboot-qemu.config                            | 2 +-
 config/coreboot-t420-hotp-maximized.config             | 2 +-
 config/coreboot-t420-maximized.config                  | 2 +-
 config/coreboot-t420.config                            | 2 +-
 config/coreboot-t430-hotp-maximized.config             | 2 +-
 config/coreboot-t430-maximized.config                  | 2 +-
 config/coreboot-t520-hotp-maximized.config             | 2 +-
 config/coreboot-t520-maximized.config                  | 2 +-
 config/coreboot-t530-dgpu-hotp-maximized.config        | 2 +-
 config/coreboot-t530-dgpu-maximized.config             | 2 +-
 config/coreboot-t530-hotp-maximized.config             | 2 +-
 config/coreboot-t530-maximized.config                  | 2 +-
 config/coreboot-w530-dgpu-K1000m-hotp-maximized.config | 2 +-
 config/coreboot-w530-dgpu-K1000m-maximized.config      | 2 +-
 config/coreboot-w530-dgpu-K2000m-hotp-maximized.config | 2 +-
 config/coreboot-w530-dgpu-K2000m-maximized.config      | 2 +-
 config/coreboot-w530-hotp-maximized.config             | 2 +-
 config/coreboot-w530-maximized.config                  | 2 +-
 config/coreboot-x220-hotp-maximized.config             | 2 +-
 config/coreboot-x220-maximized.config                  | 2 +-
 config/coreboot-x220.config                            | 2 +-
 config/coreboot-x230-hotp-maximized.config             | 2 +-
 config/coreboot-x230-hotp-maximized_usb-kb.config      | 2 +-
 config/coreboot-x230-maximized-fhd_edp.config          | 2 +-
 config/coreboot-x230-maximized.config                  | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/config/coreboot-qemu.config b/config/coreboot-qemu.config
index 9f1e614d..982b9e13 100644
--- 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
index cb455264..455aa803 100644
--- 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
index cb455264..455aa803 100644
--- 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
index d7ddb802..1056e8f9 100644
--- 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
index e4030691..e46c9c70 100644
--- 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
index a4925975..190ac0fb 100644
--- 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
index 981f1080..0665a395 100644
--- 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
index 981f1080..0665a395 100644
--- 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
index 25d821b9..b1f84b7a 100644
--- 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
index a09b3c01..fd236eea 100644
--- 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
index 967f2d01..cac333e6 100644
--- 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
index 6256a157..41569924 100644
--- 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
index a639890a..64a2f3ec 100644
--- 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
index a639890a..64a2f3ec 100644
--- 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
index 6d9ceb1b..ab1ea461 100644
--- 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
index 6d9ceb1b..ab1ea461 100644
--- 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
index 79aaa977..daf91635 100644
--- 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
index 79aaa977..daf91635 100644
--- 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
index 2af653e7..934ff13f 100644
--- 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
index 2af653e7..934ff13f 100644
--- 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
index 2af653e7..934ff13f 100644
--- 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
index 80724c9a..dedeed36 100644
--- 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
index 80724c9a..dedeed36 100644
--- 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
index 20cfe9d3..231c24a4 100644
--- 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
index 80724c9a..dedeed36 100644
--- 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"