From e3b0490be313ca34758e8f76ef56fd8b2001e2b8 Mon Sep 17 00:00:00 2001 From: Troy Kisky <troy.kisky@boundarydevices.com> Date: Thu, 1 Aug 2019 14:06:00 -0700 Subject: [PATCH] cnt: use CONFIG_USB_BOOT_FIRST Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> --- configs/cnt1g_defconfig | 1 + configs/cnt2g_defconfig | 1 + include/configs/cnt.h | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/cnt1g_defconfig b/configs/cnt1g_defconfig index aecdedc4ef5..2657bd6e0c5 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 cabd57d1f37..342a10a251e 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 a3f0c37b080..4d4b98d5b9a 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 \ -- GitLab