You have two machine configurations.
Could you have one which uses devicetree and defconfig from Linux repo and the other one that has these files exported in meta-kiss layer. This way you would answer to all the possible examples of Linux management in Yocto.