Merge remote-tracking branch 'kraxel/bios.2' into staging * kraxel/bios.2: Add vgabios build rules to roms/Makefile