From a938309d35b01dfc88e8b126b28df0fec9046058 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 22 Feb 2026 17:12:32 +0000 Subject: vendor.sh: handle me_cleaner -p separately this is a special mode that skips FPTR checks, which is needed on the topton x2e_n150 we currently set this, when MEclean="n", but we may want to skip cleaning while still checking FPTR on some boards (in a future lbmk revision) Signed-off-by: Leah Rowe --- config/vendor/x2e_n150/pkg.cfg | 2 ++ include/vendor.sh | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config/vendor/x2e_n150/pkg.cfg b/config/vendor/x2e_n150/pkg.cfg index 94286cc2..3825f7e9 100644 --- a/config/vendor/x2e_n150/pkg.cfg +++ b/config/vendor/x2e_n150/pkg.cfg @@ -17,6 +17,8 @@ XBMKmecleaner="y" # me_cleaner currently has to way to validate # the result when neutering. simply setting # the HAP bit has the same result for users + +MEcheck="n" # FPTR checks fail on this board, so skip them MEclean="n" # - however: # we still use me_cleaner, merely to extract, in diff --git a/include/vendor.sh b/include/vendor.sh index 8ffeeb22..3c5b5d65 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -79,9 +79,10 @@ ME11delta="" ME11pch="" ME11sku="" ME11version="" -MEshrink="" ME_bin_hash="" +MEcheck="" MEclean="" +MEshrink="" MRC_bin_hash="" MRC_refcode_cbtree="" MRC_refcode_gbe="" @@ -337,16 +338,20 @@ find_me() MEshrink="n" _keep="-k" # keep ME modules, don't delete anything - _pass="-p" # skip fptr check mfs="" # no MFS whitelist needed, due to -r: fi if [ "$MEclean" = "n" ] || [ "$MEshrink" != "y" ]; then # MEclean can still be y, this just means don't shrink, - # so deleted modules would become padded space + # so deleted modules would become padded space. this + # could also be used alongside --whitelist, if + # MEclean is otherwise enabled. _r="" # don't re-locate ME modules _trunc="" # don't shrink the me.bin file size fi + if [ "$MEcheck" = "n" ]; then + _pass="-p" # skip fptr check + fi if [ -n "$mfs" ]; then _r="" # cannot re-locate modules if using --whitelist MFS fi -- cgit v1.2.1