Makefile adjustment
Update defconfigs