Sorry for the noise, but there appears to be a regression with older hardware. Since it broke the direct_nor boot option, it should be reverted until a better solution is available. This reverts commit 51cd1e23.