diff --git a/configs/lshore_dl_defconfig b/configs/lshore_dl_defconfig
index d427fd5ea804707553eaf8f990df74048bf9860b..bae5d71fd3e26faa57f1f75224de983409de11d9 100644
--- a/configs/lshore_dl_defconfig
+++ b/configs/lshore_dl_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_USB_BOOT_FIRST=y
 CONFIG_TARGET_LSHORE=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/lshore/lshore_dl.cfg,MX6DL,DDR_MB=1024,DEFCONFIG=\"lshore_dl\""
diff --git a/configs/lshore_solo_defconfig b/configs/lshore_solo_defconfig
index 412c9365415ba6d86254fe135552ac4d5893b76b..002cdfa7a41750c984250cf7112197e3fdf64c2d 100644
--- a/configs/lshore_solo_defconfig
+++ b/configs/lshore_solo_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_USB_BOOT_FIRST=y
 CONFIG_TARGET_LSHORE=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/lshore/lshore_solo.cfg,MX6S,DDR_MB=512,DEFCONFIG=\"lshore_solo\""
diff --git a/include/configs/lshore.h b/include/configs/lshore.h
index e9a9d7bf08b51675ea510e16cfb0c973c05a963f..9f75e6abaf92f91a393003db8be6f88bf4e89652 100644
--- a/include/configs/lshore.h
+++ b/include/configs/lshore.h
@@ -28,9 +28,6 @@
 #define BD_MMC_UMS_DISKS "0"
 
 #undef CONFIG_SYS_BOARD
-#define BOOT_TARGET_DEVICES(func) \
-	DISTRO_BOOT_DEV_USB(func) \
-	DISTRO_BOOT_DEV_MMC(func)
 
 #include "boundary.h"
 #define CONFIG_EXTRA_ENV_SETTINGS BD_BOUNDARY_ENV_SETTINGS \