reorganise defconfig

Change-Id: Id2f099f3952b1c3ccaf783c2df43444c333cdcff