Browse Source

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 <stefan.agner@toradex.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Stefan Agner 7 years ago
parent
commit
624da53ca8
1 changed files with 2 additions and 0 deletions
  1. 2 0
      arch/arm/mach-imx/spl.c

+ 2 - 0
arch/arm/mach-imx/spl.c

@@ -45,8 +45,10 @@ u32 spl_boot_device(void)
 	case IMX6_BMODE_RESERVED:
 	case IMX6_BMODE_RESERVED:
 		return BOOT_DEVICE_BOARD;
 		return BOOT_DEVICE_BOARD;
 	/* SATA: See 8.5.4, Table 8-20 */
 	/* SATA: See 8.5.4, Table 8-20 */
+#if !defined(CONFIG_MX6UL) && !defined(CONFIG_MX6ULL)
 	case IMX6_BMODE_SATA:
 	case IMX6_BMODE_SATA:
 		return BOOT_DEVICE_SATA;
 		return BOOT_DEVICE_SATA;
+#endif
 	/* Serial ROM: See 8.5.5.1, Table 8-22 */
 	/* Serial ROM: See 8.5.5.1, Table 8-22 */
 	case IMX6_BMODE_SERIAL_ROM:
 	case IMX6_BMODE_SERIAL_ROM:
 		/* BOOT_CFG4[2:0] */
 		/* BOOT_CFG4[2:0] */