diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 00fbf53538..4488588cbf 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -30,9 +30,10 @@ case "$LINUX" in
 esac
 
 PKG_KERNEL_CFG_FILE=$(kernel_config_path) || die
-
-if [ -n "$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config)" ]; then
+if [ -n "$UBOOT_SYSTEM" ]; then
+  if [ -n "$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config)" ]; then
     PKG_PATCH_DIRS="$PKG_PATCH_DIRS crust"
+  fi
 fi
 
 if [ -n "$KERNEL_TOOLCHAIN" ]; then
diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index 54c791a951..62b05c38dc 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -18,7 +18,8 @@ if [ -n "$UBOOT_FIRMWARE" ]; then
   PKG_DEPENDS_UNPACK+=" $UBOOT_FIRMWARE"
 fi
 
-CRUST_CONFIG=$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config)
+CRUST_CONFIG=""
+[ -n "$UBOOT_SYSTEM" ] && CRUST_CONFIG=$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config)
 [ -n "$CRUST_CONFIG" ] && PKG_DEPENDS_TARGET+=" crust"
 
 PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader"