diff mbox series

[U-Boot,V5,09/31] imx: spl: implement spl_boot_device for i.MX8M

Message ID 20180110052048.4425-10-peng.fan@nxp.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show
Series imx: add i.MX8M support and i.MX8MQ EVK | expand

Commit Message

Peng Fan Jan. 10, 2018, 5:20 a.m. UTC 
Implement spl_boot_device for i.MX8M.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 arch/arm/mach-imx/spl.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Comments

Stefano Babic Jan. 21, 2018, 4:29 p.m. UTC | #1 
On 10/01/2018 06:20, Peng Fan wrote:
> Implement spl_boot_device for i.MX8M.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>  arch/arm/mach-imx/spl.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
> index 723f51fad3..7c4ee82cd1 100644
> --- a/arch/arm/mach-imx/spl.c
> +++ b/arch/arm/mach-imx/spl.c
> @@ -97,8 +97,8 @@ u32 spl_boot_device(void)
>  	return BOOT_DEVICE_NONE;
>  }
>  
> -#elif defined(CONFIG_MX7)
> -/* Translate iMX7 boot device to the SPL boot device enumeration */
> +#elif defined(CONFIG_MX7) || defined(CONFIG_MX8M)
> +/* Translate iMX7/MX8M boot device to the SPL boot device enumeration */
>  u32 spl_boot_device(void)
>  {
>  	enum boot_device boot_device_spl = get_boot_device();
> @@ -112,11 +112,15 @@ u32 spl_boot_device(void)
>  		return BOOT_DEVICE_MMC2;
>  	case SPI_NOR_BOOT:
>  		return BOOT_DEVICE_SPI;
> +	case NAND_BOOT:
> +		return BOOT_DEVICE_NAND;
> +	case USB_BOOT:
> +		return BOOT_DEVICE_USB;
>  	default:
>  		return BOOT_DEVICE_NONE;
>  	}
>  }
> -#endif /* CONFIG_MX6 || CONFIG_MX7 */
> +#endif /* CONFIG_MX6 || CONFIG_MX7 || CONFIG_MX8M */
>  
>  #ifdef CONFIG_SPL_USB_GADGET_SUPPORT
>  int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
> 

Reviewed-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 723f51fad3..7c4ee82cd1 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -97,8 +97,8 @@  u32 spl_boot_device(void)
 	return BOOT_DEVICE_NONE;
 }
 
-#elif defined(CONFIG_MX7)
-/* Translate iMX7 boot device to the SPL boot device enumeration */
+#elif defined(CONFIG_MX7) || defined(CONFIG_MX8M)
+/* Translate iMX7/MX8M boot device to the SPL boot device enumeration */
 u32 spl_boot_device(void)
 {
 	enum boot_device boot_device_spl = get_boot_device();
@@ -112,11 +112,15 @@  u32 spl_boot_device(void)
 		return BOOT_DEVICE_MMC2;
 	case SPI_NOR_BOOT:
 		return BOOT_DEVICE_SPI;
+	case NAND_BOOT:
+		return BOOT_DEVICE_NAND;
+	case USB_BOOT:
+		return BOOT_DEVICE_USB;
 	default:
 		return BOOT_DEVICE_NONE;
 	}
 }
-#endif /* CONFIG_MX6 || CONFIG_MX7 */
+#endif /* CONFIG_MX6 || CONFIG_MX7 || CONFIG_MX8M */
 
 #ifdef CONFIG_SPL_USB_GADGET_SUPPORT
 int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)