These commits (mostly) merge the classic and core gadget snaps, to the point that classic and core will use the same source for bootloader firmware and u-boot. Still to be done: merging the actual bootscripts (core should be pulling from flash-kernel, but this will require changes to snapd for the way it handles A/B boot state), and creating a (trivial) classic branch to call the alternate "classic" target in the Makefile.
These commits (mostly) merge the classic and core gadget snaps, to the point that classic and core will use the same source for bootloader firmware and u-boot. Still to be done: merging the actual bootscripts (core should be pulling from flash-kernel, but this will require changes to snapd for the way it handles A/B boot state), and creating a (trivial) classic branch to call the alternate "classic" target in the Makefile.
Oh ... and psplash ...