From 624da53ca8a8196985a48bc32d788b434ae0f788 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 29 Aug 2017 09:10:11 -0700 Subject: imx: remove SATA boot mode for i.MX 6UL and 6ULL The NXP i.MX 6UL and 6ULL do not support SATA and have no SATA boot mode, hence remove it from the boot device detecion. This fixes a build error introduced with 3bd1642d4d50 ("imx: fix USB boot mode detection for i.MX 6UL and 6ULL") Fixes: 3bd1642d4d50 ("imx: fix USB boot mode detection for i.MX 6UL and 6ULL") Signed-off-by: Stefan Agner Reviewed-by: Stefano Babic Reviewed-by: Jagan Teki diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index bcd1033..3853e77 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -45,8 +45,10 @@ u32 spl_boot_device(void) case IMX6_BMODE_RESERVED: return BOOT_DEVICE_BOARD; /* SATA: See 8.5.4, Table 8-20 */ +#if !defined(CONFIG_MX6UL) && !defined(CONFIG_MX6ULL) case IMX6_BMODE_SATA: return BOOT_DEVICE_SATA; +#endif /* Serial ROM: See 8.5.5.1, Table 8-22 */ case IMX6_BMODE_SERIAL_ROM: /* BOOT_CFG4[2:0] */ -- cgit v0.10.2