defconfig: Adapt latest changes