diff --git a/configs/chip_defconfig b/configs/chip_defconfig
index c6d063f..d2fccd6 100644
--- a/configs/chip_defconfig
+++ b/configs/chip_defconfig
@@ -81,12 +81,8 @@ BR2_TARGET_ROOTFS_UBI=y
 BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x200000
 BR2_TARGET_ROOTFS_UBI_SUBSIZE=16384
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="CHIP"
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/NextThingCo/CHIP-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="production-mlc"
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-dtb.bin"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="CHIP"
+BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin spl/sunxi-spl-with-ecc.bin"
 BR2_TARGET_UBOOT_ENVIMAGE=y