diff options
| author | Leah Rowe <leah@libreboot.org> | 2026-02-20 19:10:03 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2026-02-20 19:33:30 +0000 |
| commit | 712145a91c7814a6113d90736f75528f462c0fea (patch) | |
| tree | 4f019e40729a90cb02355d09967c6148b343060f | |
| parent | 6e991b20af18bff681df6c39a537de4d7593d75f (diff) | |
x270: use full ME (only deguard)x270wip
to test whether this fixes the PCIe enum issue
now only deguard is used
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | config/coreboot/default/patches/0048-me_cleaner-don-t-modify-if-k-is-used.patch | 44 | ||||
| -rw-r--r-- | config/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb | 2 | ||||
| -rw-r--r-- | config/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode | 2 | ||||
| -rw-r--r-- | config/coreboot/x270_vfsp_16mb/target.cfg | 5 | ||||
| -rw-r--r-- | config/vendor/x270/pkg.cfg | 5 | ||||
| -rw-r--r-- | include/vendor.sh | 1 |
6 files changed, 56 insertions, 3 deletions
diff --git a/config/coreboot/default/patches/0048-me_cleaner-don-t-modify-if-k-is-used.patch b/config/coreboot/default/patches/0048-me_cleaner-don-t-modify-if-k-is-used.patch new file mode 100644 index 00000000..7b220b1a --- /dev/null +++ b/config/coreboot/default/patches/0048-me_cleaner-don-t-modify-if-k-is-used.patch @@ -0,0 +1,44 @@ +From 5acf504c5649732bbb6ef70c9a3e5cda78c0d367 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Fri, 20 Feb 2026 19:31:19 +0000 +Subject: [PATCH 1/1] me_cleaner: don't modify if -k is used + +don't remove *anything*. in libreboot, we only +ever use -k when we werely want to extract the +ME, but otherwise not modify it. this is because +we rely on bruteforce, detecting when me.bin is +found based on mecleaner validation. + +this way, we can much more reliable get the ME +images. + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + util/me_cleaner/me_cleaner.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/util/me_cleaner/me_cleaner.py b/util/me_cleaner/me_cleaner.py +index 228bac899f..269aa4ad04 100755 +--- a/util/me_cleaner/me_cleaner.py ++++ b/util/me_cleaner/me_cleaner.py +@@ -677,7 +677,7 @@ if __name__ == "__main__": + # ME 6 Ignition: wipe everything + me6_ignition = False + if not args.check and not args.soft_disable_only and \ +- variant == "ME" and version[0] == 6: ++ variant == "ME" and version[0] == 6 and not args.keep_modules: + mef.seek(ftpr_offset + 0x20) + num_modules = unpack("<I", mef.read(4))[0] + mef.seek(ftpr_offset + 0x290 + (num_modules + 1) * 0x60) +@@ -689,7 +689,7 @@ if __name__ == "__main__": + me6_ignition = True + + if not args.check: +- if not args.soft_disable_only and not me6_ignition: ++ if not args.soft_disable_only and not me6_ignition and not args.keep_modules: + print("Reading partitions list...") + unremovable_part_fpt = b"" + extra_part_end = 0 +-- +2.47.3 + diff --git a/config/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb b/config/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb index f7942401..acd19d16 100644 --- a/config/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb +++ b/config/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb @@ -167,7 +167,7 @@ CONFIG_HAVE_INTEL_FIRMWARE=y CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/x270/ifd_16" -CONFIG_ME_BIN_PATH="../../../vendorfiles/x270/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/x270/mefull.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/x270/gbe" CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 diff --git a/config/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode b/config/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode index 8488c8eb..abac75f7 100644 --- a/config/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode @@ -165,7 +165,7 @@ CONFIG_HAVE_INTEL_FIRMWARE=y CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/x270/ifd_16" -CONFIG_ME_BIN_PATH="../../../vendorfiles/x270/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/x270/mefull.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/x270/gbe" CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 diff --git a/config/coreboot/x270_vfsp_16mb/target.cfg b/config/coreboot/x270_vfsp_16mb/target.cfg index a3323ba7..81662ec3 100644 --- a/config/coreboot/x270_vfsp_16mb/target.cfg +++ b/config/coreboot/x270_vfsp_16mb/target.cfg @@ -10,3 +10,8 @@ grubtree="xhci_nvme" vcfg="x270" build_depend="seabios/default grub/xhci_nvme memtest86plus" IFD_platform="sklkbl" + +# full ME (only deguard) used, so we don't want to do releases yet. +# we only want to do releases of roms with a neutered ME + +release="n" diff --git a/config/vendor/x270/pkg.cfg b/config/vendor/x270/pkg.cfg index 0064c342..24a6d743 100644 --- a/config/vendor/x270/pkg.cfg +++ b/config/vendor/x270/pkg.cfg @@ -2,7 +2,7 @@ # ME firmware (deguard will be used) DL_hash="df735a24242792bf4150f30bf0bd4fdbdc0fb6bf0f897ea533df32567be8e084006d692fb6351677f8cc976878c5018667901dbd407b0a77805754f7c101497c" -ME_bin_hash="433065ad631a22595e12b4171086ca31a54d894f9faccd7edfecf4f1bac340374ec334bb752e69602d5a77a9d427eaa4a066842e347744febbdc386b6551f739" +ME_bin_hash="d8bc1906217654c6f2ecae205a2233f3b0b40105d8996f813c5e58e5125c7ff5b8bb74b648f35ba60aec4f4a3e430b64751b05618aa320899ca9dbaf36f1ad85" DL_url="https://dl.dell.com/FOLDER04573471M/1/Inspiron_5468_1.3.0.exe" DL_url_bkup="https://web.archive.org/web/20241110222323/https://dl.dell.com/FOLDER04573471M/1/Inspiron_5468_1.3.0.exe" @@ -26,3 +26,6 @@ ME11pch="LP" # just neuter, otherwise PCIe enumeration won't work on this board. # with this option, modules are removed but nothing is moved/shrunk: MEshrink="n" + +# TEST: don't clean it. to re-test the PCI-e enum issue +MEclean="n" diff --git a/include/vendor.sh b/include/vendor.sh index 8827d3a6..739df564 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -340,6 +340,7 @@ find_me() if [ "$MEshrink" != "y" ]; then _r="" _trunc="" + mfs="" fi if [ "$MEclean" = "n" ]; then |
