[U-Boot] [PATCH 6/9] arm: mvebu: add support for boot from SATA

[Chris Packham]

On Thu, May 16, 2019 at 10:09 PM Baruch Siach <baruch at tkos.co.il> wrote:
>
> Add the required Kconfig and macro definitions to allow boot from SATA
> on Armada 38x systems.
>
> Signed-off-by: Baruch Siach <baruch at tkos.co.il>

Reviewed-by: Chris Packham <judge.packham at gmail.com>

> ---
>  arch/arm/mach-mvebu/Kconfig            | 5 +++++
>  arch/arm/mach-mvebu/Makefile           | 3 +++
>  arch/arm/mach-mvebu/include/mach/soc.h | 2 ++
>  arch/arm/mach-mvebu/spl.c              | 5 +++++
>  4 files changed, 15 insertions(+)
>
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 495c48e6c749..fdd39685b75d 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -239,6 +239,11 @@ config MVEBU_SPL_BOOT_DEVICE_MMC
>         bool "SDIO/MMC card"
>         select SPL_LIBDISK_SUPPORT
>
> +config MVEBU_SPL_BOOT_DEVICE_SATA
> +       bool "SATA"
> +       select SPL_SATA_SUPPORT
> +       select SPL_LIBDISK_SUPPORT
> +
>  config MVEBU_SPL_BOOT_DEVICE_UART
>         bool "UART"
>
> diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
> index 02d3ce27ee74..8228a17972f9 100644
> --- a/arch/arm/mach-mvebu/Makefile
> +++ b/arch/arm/mach-mvebu/Makefile
> @@ -37,6 +37,9 @@ endif
>  ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),)
>         KWB_CFG_BOOT_FROM=sdio
>  endif
> +ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA),)
> +       KWB_CFG_BOOT_FROM=sata
> +endif
>  ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_UART),)
>         KWB_CFG_BOOT_FROM=uart
>  endif
> diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
> index f666ee24243b..acb9257c90fe 100644
> --- a/arch/arm/mach-mvebu/include/mach/soc.h
> +++ b/arch/arm/mach-mvebu/include/mach/soc.h
> @@ -159,7 +159,9 @@
>  #define BOOT_DEV_SEL_MASK      (0x3f << BOOT_DEV_SEL_OFFS)
>
>  #define BOOT_FROM_NAND         0x0A
> +#define BOOT_FROM_SATA         0x22
>  #define BOOT_FROM_UART         0x28
> +#define BOOT_FROM_SATA_ALT     0x2A
>  #define BOOT_FROM_UART_ALT     0x3f
>  #define BOOT_FROM_SPI          0x32
>  #define BOOT_FROM_MMC          0x30
> diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
> index 530b98c1aa31..d54de5195624 100644
> --- a/arch/arm/mach-mvebu/spl.c
> +++ b/arch/arm/mach-mvebu/spl.c
> @@ -59,6 +59,11 @@ static u32 get_boot_device(void)
>         case BOOT_FROM_UART_ALT:
>  #endif
>                 return BOOT_DEVICE_UART;
> +#ifdef BOOT_FROM_SATA
> +       case BOOT_FROM_SATA:
> +       case BOOT_FROM_SATA_ALT:
> +               return BOOT_DEVICE_SATA;
> +#endif
>         case BOOT_FROM_SPI:
>         default:
>                 return BOOT_DEVICE_SPI;
> --
> 2.20.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot