diff --git a/configs/a_defconfig b/configs/a_defconfig
index d2fc042ad3b82450c24748387d07454ff2cda1e1..b6f72a5fecc41851ecb7018fcc50dda268e20faa 100644
--- a/configs/a_defconfig
+++ b/configs/a_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_USB_BOOT_FIRST=y
 CONFIG_TARGET_A=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/a/a_s512m.cfg,MX6S,DDR_MB=512,DEFCONFIG=\"a\""
diff --git a/include/configs/a.h b/include/configs/a.h
index 4167b6706b27a2b32e9c3ea8b817e6f9aa581370..d4e9ce2a2f462c62d197f665bb1ff4ea43f42fbc 100644
--- a/include/configs/a.h
+++ b/include/configs/a.h
@@ -18,9 +18,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	1
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
 #define BD_I2C_MASK	2
-#define BOOT_TARGET_DEVICES(func) \
-	DISTRO_BOOT_DEV_USB(func) \
-	DISTRO_BOOT_DEV_MMC(func)
 #define BD_USB_START 	"setexpr otgstat *0x020c9030 \\\\& 0x08000000;" \
 				"if itest.l ${otgstat} -eq 0 ; then " \
 					"usb start;" \