Remove m7 defconfig
Update defconfig