trivial: Remove testing check that snuck in
Use a different PID for the bootloader
Use a known ID token in the firmware file

This will allow us to prevent loading the wrong type of firmware on a given
device type.