From 4496d1bf1e78edae338aac478f7cedc97ed78483 Mon Sep 17 00:00:00 2001
From: Thierry Laurion <insurgo@riseup.net>
Date: Mon, 7 Oct 2024 20:37:06 -0400
Subject: [PATCH] Optiplex 7010/9010 SFF: add ifd.bin from libreboot's t16650
 in tree, change optiplex_blobs.mk target and point coreboot config to this
 IFD

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
---
 blobs/optiplex_9010/README.md                    |   6 ++++++
 blobs/optiplex_9010/ifd.bin                      | Bin 0 -> 4096 bytes
 blobs/xx30/.gitignore                            |   3 +++
 .../optiplex-7010_9010-maximized.config          |   3 +++
 .../optiplex-7010_9010_TXT-maximized.config      |   6 +++---
 .../coreboot-optiplex-7019_9010-maximized.config |   2 +-
 ...eboot-optiplex-7019_9010_TXT-maximized.config |   2 +-
 .../{optiplex_acm_blobs.mk => optiplex_blobs.mk} |   5 ++---
 8 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 blobs/optiplex_9010/README.md
 create mode 100644 blobs/optiplex_9010/ifd.bin
 rename targets/{optiplex_acm_blobs.mk => optiplex_blobs.mk} (63%)

diff --git a/blobs/optiplex_9010/README.md b/blobs/optiplex_9010/README.md
new file mode 100644
index 00000000..9f244acb
--- /dev/null
+++ b/blobs/optiplex_9010/README.md
@@ -0,0 +1,6 @@
+This ifd.bin is a configuration blob, and comes from https://codeberg.org/libreboot/lbmk/src/branch/master/config/ifd/t1650/12_ifd
+Libreboot uses xx30 ME (downloaded from Lenovo, extracted+ neutered) as well, and reuses the dell t1650 IFD for their build, which we borrowed here with:
+
+wget https://codeberg.org/libreboot/lbmk/raw/branch/master/config/ifd/t1650/12_ifd -O ifd.bin
+
+Doc: https://libreboot.org/docs/install/dell7010.html
diff --git a/blobs/optiplex_9010/ifd.bin b/blobs/optiplex_9010/ifd.bin
new file mode 100644
index 0000000000000000000000000000000000000000..623470e94c106880ebce024687f8c65aa474a1a1
GIT binary patch
literal 4096
zcmezW9~DF`{lL%6$imFVBp{@~sK}toz`%g4LWW_23Q&lFfde8AVoEdo=VoS*Vqj!o
zV))OGsvg7xVF^YK4rFr%3%lvM00%!K$QR)tf`RGb2{4UJ^l&p69AP-fFrDG{RAliw
zX9$l8NDUVMkm?SQ4@lKBs(v&CMnhmU1V%$(Gz3ONU^E0qLtr!nMnhm|gur_PQ3h58
zR)zNlVo+KfOe+*Z#1#r5;)fI<{6h*bK17|o8xw=5f~bPLJ0pblU;xuHP;+IV=E@jA
n&D{kxcNfGQg<TNw_YP2ZI6&Ru0CNXSAB3i5sNUBZ?fU=#2Q}Wr

literal 0
HcmV?d00001

diff --git a/blobs/xx30/.gitignore b/blobs/xx30/.gitignore
index 24d49395..b925978a 100644
--- a/blobs/xx30/.gitignore
+++ b/blobs/xx30/.gitignore
@@ -1 +1,4 @@
 me.bin
+IVB_BIOSAC_PRODUCTION.bin
+SNB_IVB_SINIT_20190708_PW.bin
+sch5545_ecfw.bin
diff --git a/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config b/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config
index 22d789fb..f2ddca8f 100644
--- a/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config
+++ b/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config
@@ -74,5 +74,8 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
 
+#Include bits related to Optiplex blobs (not enabling TXT in coreboot config)
+BOARD_TARGETS += optiplex_blobs
+
 # Generate split 4MB top / 8MB bottom ROMs
 BOARD_TARGETS += split_8mb4mb
diff --git a/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config b/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config
index 228fee02..b2de24b4 100644
--- a/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config
+++ b/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config
@@ -68,14 +68,14 @@ 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/sda1"
-export CONFIG_BOARD_NAME="Dell Optiplex 7010/9010 TXT maximized"
+export CONFIG_BOARD_NAME="Dell Optiplex 7010/9010 maximized (TXT enabled)"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
 
-#Include bits related to Optiplex ACM blobs for TXT
-BOARD_TARGETS += optiplex_acm_blobs
+#Include bits related to Optiplex blobs (enabling TXT in coreboot config)
+BOARD_TARGETS += optiplex_blobs
 
 # Generate split 4MB top / 8MB bottom ROMs
 BOARD_TARGETS += split_8mb4mb
diff --git a/config/coreboot-optiplex-7019_9010-maximized.config b/config/coreboot-optiplex-7019_9010-maximized.config
index 24d7d11c..4c7b7a88 100644
--- a/config/coreboot-optiplex-7019_9010-maximized.config
+++ b/config/coreboot-optiplex-7019_9010-maximized.config
@@ -158,7 +158,7 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="@BLOB_DIR@/optiplex_9010/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx30/gbe.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
diff --git a/config/coreboot-optiplex-7019_9010_TXT-maximized.config b/config/coreboot-optiplex-7019_9010_TXT-maximized.config
index 2dc49426..b63f25e9 100644
--- a/config/coreboot-optiplex-7019_9010_TXT-maximized.config
+++ b/config/coreboot-optiplex-7019_9010_TXT-maximized.config
@@ -158,7 +158,7 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="@BLOB_DIR@/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="@BLOB_DIR@/optiplex_9010/ifd.bin"
 CONFIG_ME_BIN_PATH="@BLOB_DIR@/xx30/me.bin"
 CONFIG_GBE_BIN_PATH="@BLOB_DIR@/xx30/gbe.bin"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
diff --git a/targets/optiplex_acm_blobs.mk b/targets/optiplex_blobs.mk
similarity index 63%
rename from targets/optiplex_acm_blobs.mk
rename to targets/optiplex_blobs.mk
index 1ea4f5ad..cadaad61 100644
--- a/targets/optiplex_acm_blobs.mk
+++ b/targets/optiplex_blobs.mk
@@ -1,9 +1,8 @@
-# Targets for downloading optiplex 7010/9010 ACM blobs
+# Targets for downloading optiplex 7010/9010 blobs: including ACM, SINIT and EC blobs
 
 # Make the Coreboot build depend on the following 3rd party blobs:
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx30/IVB_BIOSAC_PRODUCTION.bin
-
+    $(pwd)/blobs/xx30/IVB_BIOSAC_PRODUCTION.bin \
 
 $(pwd)/blobs/xx30/IVB_BIOSAC_PRODUCTION.bin:
 	$(pwd)/blobs/xx30/optiplex_7010_9010.sh $(pwd)/blobs/xx30