This reverts commit 55b350a81a9156bad55da6f6e0799ae3755c5bce.
Latest upstream branch did not boot anymore beyond stage2. Bisection pointed to above commit and reverting it fixes the issue. It is quite possible the above commit uncovered another issue, but for now keep things booting and revert it until the underlying issue has been fixed.
This reverts commit 55b350a81a9156bad55da6f6e0799ae3755c5bce.
Latest upstream branch did not boot anymore beyond stage2. Bisection pointed to above commit and reverting it fixes the issue. It is quite possible the above commit uncovered another issue, but for now keep things booting and revert it until the underlying issue has been fixed.