RPi4 no longer boots after BPi-R3 merge

[troglobit]

Current Behavior

The BPi merge seems to have accidentally broken the RPi. I've traced the error to the package/board/banana-pi-r3/banana-pi-r3.mk if I disable that package in menuconfig and rebuild the kernel, then the RPi boots fine.

Expected Behavior

Full harmony in Aarch64 land.

Steps To Reproduce

No response

Additional information

No response