As of commit 3c4e20303b272541c5529abb123a5017261bb067 raspberrypi.conf includes files from conf/distro; this is not right, the machine conf describes the hardware, nothing else (btw, I don't know if being Yocto compliant is of any concern, but having distro stuff in a BSP layer makes it non-compliant).
As for the new includes, I don't think the splitting of the fallback preferred providers and versions into include files serves any useful purpose, it just makes the machine configuration hard to navigate, but at least these should be in conf/machine/include.
As of commit 3c4e20303b272541c5529abb123a5017261bb067 raspberrypi.conf includes files from conf/distro; this is not right, the machine conf describes the hardware, nothing else (btw, I don't know if being Yocto compliant is of any concern, but having distro stuff in a BSP layer makes it non-compliant).
As for the new includes, I don't think the splitting of the fallback preferred providers and versions into include files serves any useful purpose, it just makes the machine configuration hard to navigate, but at least these should be in conf/machine/include.