Update defconfig and Makefile