Various compilation adjustments for BERI boot2.