Sorry I didn't get a chance to follow up on this. Closing as support was committed by @manu in r320315.
Fixed the ordering in sys/arm/conf/GENERIC and sys/conf/options.arm; removed the DTS updates.