move most of the x86 image generation options to the main file