[coreboot] macbook21: broken by 10385 (Make DSDT a file in CBFS rather than embedding it into ramstage.)

[Mono]

Ahoi Vladimir (and all),

nice to see you again!

my macbook21 lately has two issues: xserver cannot start and poweroff does not poweroff but stops after halt.
startx throws the following error:
modprobe: ERROR: could not insert 'i915': No such device
intel: waited 2020 ms for i915.ko driver to load

bisect says:
# good: [1cac2c9713a864fe90f40040cd1ede130983544c] Hide PLATFORM_USES_FSP1_1.
git bisect good 1cac2c9713a864fe90f40040cd1ede130983544c
# bad: [a4cf83df7a3ef3401e12ca3732cbe07294684d02] cbfs: Fix mismerge.
git bisect bad a4cf83df7a3ef3401e12ca3732cbe07294684d02
# only skipped commits left to test
# possible first bad commit: [a4cf83df7a3ef3401e12ca3732cbe07294684d02] cbfs: Fix mismerge.
# possible first bad commit: [1aeea7fbdf252c95e1e3cdf45339a1430125f85d] tpm: Add dummy _DSM to make Bitlocker happy.
# possible first bad commit: [36f8d27ea9f741e184b76b5f42d7f777f207edc0] Make DSDT a file in CBFS rather than embedding it into ramstage.

36f8d27 and 1aeea7f had been skipped because of a build error.
however, cherry picking a4cf83d on top of 36f8d27 is bad already. So I guess 36f8d27 might be the first bad.

Unfortunately I have no idea how to fix the problem or what the problem really is. Can you please point me to the right direction?

best regards
Mono