defconfig: Fix up the issues with non-boot problem