Raspi4

In preparation for raspi 4 support, modify the Makefile so that the platforms being built are listed in just one place (rather than all over the file). That's in the second commit. There are no functional changes. I'll have some pi4 changes in this branch (or a similar branch) later, but let's get this out of the way first.

The first commit is a bug fix.