pulled changes back into defconfig from nxc2620config