merge swconfig (+drivers) improvements from trunk