[U-Boot] [PATCH v1] imx: remove SATA boot mode for i.MX 6UL and 6ULL
From: Stefan Agner stefan.agner@toradex.com
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 ---
arch/arm/mach-imx/spl.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index bcd1033fdb..3853e7739d 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] */
Hi Stefan,
On 29/08/2017 18:10, Stefan Agner wrote:
From: Stefan Agner stefan.agner@toradex.com
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
arch/arm/mach-imx/spl.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index bcd1033fdb..3853e7739d 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] */
Reviewed-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
On Tue, Aug 29, 2017 at 10:16 PM, Stefano Babic sbabic@denx.de wrote:
Hi Stefan,
On 29/08/2017 18:10, Stefan Agner wrote:
From: Stefan Agner stefan.agner@toradex.com
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
arch/arm/mach-imx/spl.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index bcd1033fdb..3853e7739d 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] */
Reviewed-by: Stefano Babic sbabic@denx.de
Reviewed-by: Jagan Teki jagan@openedev.com
thanks!
participants (3)
-
Jagan Teki -
Stefan Agner -
Stefano Babic