diff --git a/configs/cnt1g_defconfig b/configs/cnt1g_defconfig
index aecdedc4ef5b451ac8ada4dedf815f9d27e59e0f..2657bd6e0c51373fa14f81883c78311e214e9077 100644
--- a/configs/cnt1g_defconfig
+++ b/configs/cnt1g_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_USB_BOOT_FIRST=y
 CONFIG_TARGET_CNT=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/cnt/cnt1g.cfg,MX6Q,DDR_MB=1024,DEFCONFIG=\"cnt1g\""
diff --git a/configs/cnt2g_defconfig b/configs/cnt2g_defconfig
index cabd57d1f3761f315802f37c6e234fe2e024545d..342a10a251ef633ebb74de91d0f1145743f2d002 100644
--- a/configs/cnt2g_defconfig
+++ b/configs/cnt2g_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_USB_BOOT_FIRST=y
 CONFIG_TARGET_CNT=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/cnt/cnt2g.cfg,MX6Q,DDR_MB=2048,DEFCONFIG=\"cnt2g\""
diff --git a/include/configs/cnt.h b/include/configs/cnt.h
index a3f0c37b08036b27642853b7cbd88c3a1cb36c23..4d4b98d5b9aa79dd6176284a580ac703707ba3fc 100644
--- a/include/configs/cnt.h
+++ b/include/configs/cnt.h
@@ -22,10 +22,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 #define BD_I2C_MASK	7
 
-#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 \