Move non-AMD specific options out of AMD hash