leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: mvebu: add support for boot from SATA

Browse Source 
Add the required Kconfig and macro definitions to allow boot from SATA
on Armada 38x systems.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Baruch Siach 2019-05-16 13:03:58 +03:00 committed by Stefan Roese
parent f0aa125477
commit 22c654557f
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-mvebu/Kconfig
View File

@ -239,6 +239,11 @@ config MVEBU_SPL_BOOT_DEVICE_MMC
bool "SDIO/MMC card" bool "SDIO/MMC card"
select SPL_LIBDISK_SUPPORT 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 config MVEBU_SPL_BOOT_DEVICE_UART
bool "UART" bool "UART"

3
arch/arm/mach-mvebu/Makefile
View File

@ -37,6 +37,9 @@ endif
ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),) ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),)
KWB_CFG_BOOT_FROM=sdio KWB_CFG_BOOT_FROM=sdio
endif endif
ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA),)
KWB_CFG_BOOT_FROM=sata
endif
ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_UART),) ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_UART),)
KWB_CFG_BOOT_FROM=uart KWB_CFG_BOOT_FROM=uart
endif endif

2
arch/arm/mach-mvebu/include/mach/soc.h
View File

@ -159,7 +159,9 @@
#define BOOT_DEV_SEL_MASK (0x3f << BOOT_DEV_SEL_OFFS) #define BOOT_DEV_SEL_MASK (0x3f << BOOT_DEV_SEL_OFFS)
#define BOOT_FROM_NAND 0x0A #define BOOT_FROM_NAND 0x0A
#define BOOT_FROM_SATA 0x22
#define BOOT_FROM_UART 0x28 #define BOOT_FROM_UART 0x28
#define BOOT_FROM_SATA_ALT 0x2A
#define BOOT_FROM_UART_ALT 0x3f #define BOOT_FROM_UART_ALT 0x3f
#define BOOT_FROM_SPI 0x32 #define BOOT_FROM_SPI 0x32
#define BOOT_FROM_MMC 0x30 #define BOOT_FROM_MMC 0x30

5
arch/arm/mach-mvebu/spl.c
View File

@ -59,6 +59,11 @@ static u32 get_boot_device(void)
case BOOT_FROM_UART_ALT: case BOOT_FROM_UART_ALT:
#endif #endif
return BOOT_DEVICE_UART; 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: case BOOT_FROM_SPI:
default: default:
return BOOT_DEVICE_SPI; return BOOT_DEVICE_SPI;