diff --git a/bsp/include/buildroot.mk b/bsp/include/buildroot.mk
index 7383bdea..f094edc1 100644
--- a/bsp/include/buildroot.mk
+++ b/bsp/include/buildroot.mk
@@ -2,14 +2,15 @@
 
 BR2_EXTERNAL ?= $(BR_PROJECT)/../../bsp/buildroot_external/
 
-BR_ENV = BR2_EXTERNAL=$(BR2_EXTERNAL) O=$(BR_STAGING)/buildroot/ WORKSPACE_DIR=$(BR_STAGING) BUILDS_ROOT=$(BR_LOCAL_BUILDS_ROOT) BOARD=$(BR_BOARD) PROJECT=$(BR_PROJECT)
+BR_ENV = BR2_EXTERNAL=$(BR2_EXTERNAL) O=$(BR_STAGING)/buildroot/ WORKSPACE_DIR=$(BR_STAGING)
+BR_ENV += BUILDS_ROOT=$(BR_LOCAL_BUILDS_ROOT) BOARD=$(BR_BOARD) PROJECT=$(BR_PROJECT)
+BR_ENV += BR2_DEFCONFIG=$(BR_PROJECT)/configs/buildroot_defconfig BR2_DEFCONFIG_FROM_ENV=1
 
 buildroot.menuconfig: buildroot.config
 	$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ menuconfig
-	cmp -s $(BR_STAGING)/buildroot/.config $(BR_PROJECT)/configs/buildroot.config; \
-	if test $$? -ne 0; then echo "Config Files has changed......"; \
-		cp $(BR_STAGING)/buildroot/.config $(BR_PROJECT)/configs/buildroot.config; \
-	fi
+	@echo "Saving defconfig (Waiting) ...."
+	$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../../tools/buildroot/ savedefconfig
+	@echo "Saving defconfig done."
 
 buildroot: buildroot.config
 	$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ $(BR_TARGET)
@@ -22,12 +23,8 @@ buildroot.shell: buildroot.config
 buildroot.config:
 	@mkdir -p $(BR_STAGING)/buildroot/
 ifeq ("$(wildcard $(BR_STAGING)/buildroot/.config)","")
-	@cp $(BR_PROJECT)/configs/buildroot.config $(BR_STAGING)/buildroot/.config
-else
-	cmp -s $(BR_PROJECT)/configs/buildroot.config $(BR_STAGING)/buildroot/.config; \
-	if test $$? -ne 0; then echo "Config Files has changed......"; \
-		cp $(BR_PROJECT)/configs/buildroot.config $(BR_STAGING)/buildroot/.config; \
-	fi
+	@cp $(BR_PROJECT)/configs/buildroot_defconfig $(BR_STAGING)/buildroot/.config
+	$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../../tools/buildroot/ defconfig
 endif
 
 install.sd: