Swap bootmain.c and bootother.S.  This puts the whole boot process on one spread, though it separates the two asm files.