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

mvebu: consolidate SPL boot device config symbols

Browse Source 
Use MVEBU_SPL_BOOT_DEVICE_* to select between SPI and MMC, instead of
board specific symbols. This commit enables the boot device selection
menu to all mvebu platforms, but it is only effective on Turris Omnia
and gdsys Controlcenter DC platforms. A following commit will enable
boot selection for other platforms.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Baruch Siach 2018-06-18 21:56:24 +03:00 committed by Stefan Roese
parent d38f04f7c2
commit ad105f5f86
5 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -1480,7 +1480,6 @@ source "board/freescale/ls1012ardb/Kconfig"
source "board/freescale/ls1012afrdm/Kconfig"
source "board/freescale/mx35pdk/Kconfig"
source "board/freescale/s32v234evb/Kconfig"
source "board/gdsys/a38x/Kconfig"
source "board/grinn/chiliboard/Kconfig"
source "board/gumstix/pepper/Kconfig"
source "board/h2200/Kconfig"

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

@ -183,21 +183,18 @@ config SYS_VENDOR
config SYS_SOC
default "mvebu"
if TARGET_TURRIS_OMNIA
choice
prompt "Turris Omnia boot method"
prompt "Boot method"
config TURRIS_OMNIA_SPL_BOOT_DEVICE_SPI
config MVEBU_SPL_BOOT_DEVICE_SPI
bool "SPI NOR flash"
config TURRIS_OMNIA_SPL_BOOT_DEVICE_MMC
config MVEBU_SPL_BOOT_DEVICE_MMC
bool "SDIO/MMC card"
select SPL_LIBDISK_SUPPORT
endchoice
endif
config MVEBU_EFUSE
bool "Enable eFuse support"
default n

24
board/gdsys/a38x/Kconfig
View File

@ -1,24 +0,0 @@
if TARGET_CONTROLCENTERDC
menu "Controlcenter DC board options"
choice
prompt "Select boot method"
config SPL_BOOT_DEVICE_SPI
bool "SPI"
config SPL_BOOT_DEVICE_MMC
bool "MMC"
select SPL_LIBDISK_SUPPORT
endchoice
#config SPL_BOOT_DEVICE
# int
# default 1 if SPL_BOOT_DEVICE_SPI
# default 2 if SPL_BOOT_DEVICE_MMC
endmenu
endif

4
board/gdsys/a38x/Makefile
View File

@ -13,10 +13,10 @@ obj-$(CONFIG_TARGET_CONTROLCENTERDC) += hydra.o ihs_phys.o
extra-$(CONFIG_TARGET_CONTROLCENTERDC) += kwbimage.cfg
KWB_REPLACE += BOOT_FROM
ifneq ($(CONFIG_SPL_BOOT_DEVICE_SPI),)
ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI),)
KWB_CFG_BOOT_FROM=spi
endif
ifneq ($(CONFIG_SPL_BOOT_DEVICE_MMC),)
ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),)
KWB_CFG_BOOT_FROM=sdio
endif

4
include/configs/turris_omnia.h
View File

@ -93,13 +93,13 @@
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
#define CONFIG_SPL_DRIVERS_MISC_SUPPORT
#ifdef CONFIG_TURRIS_OMNIA_SPL_BOOT_DEVICE_SPI
#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
/* SPL related SPI defines */
# define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000
# define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS
#endif
#ifdef CONFIG_TURRIS_OMNIA_SPL_BOOT_DEVICE_MMC
#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
/* SPL related MMC defines */
# define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10)
# define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS