d2: add defconfigs back in