Defconfig changes

Conflicts:
	arch/arm/configs/jf_defconfig