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

ARM64: zynqmp: List secondary software boot modes

Browse Source 
Using alternative bootmode field to support automatic secondary boot
modes. It is purely software setting where SW modes are using free
bootmode combinations.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2016-10-26 09:24:32 +02:00
parent fde6cacde2
commit 2661081c30
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/cpu/armv8/zynqmp/Kconfig
View File

@ -71,6 +71,8 @@ config SPL_ZYNQMP_ALT_BOOTMODE
default 0x5 if SD_MODE1 default 0x5 if SD_MODE1
default 0x6 if EMMC_MODE default 0x6 if EMMC_MODE
default 0x7 if USB_MODE default 0x7 if USB_MODE
default 0xa if SW_USBHOST_MODE
default 0xb if SW_SATA_MODE
choice choice
prompt "Boot mode" prompt "Boot mode"
@ -101,6 +103,12 @@ config EMMC_MODE
config USB_MODE config USB_MODE
bool "USB" bool "USB"
config SW_USBHOST_MODE
bool "SW USBHOST_MODE"
config SW_SATA_MODE
bool "SW SATA_MODE"
endchoice endchoice
endif endif

4
arch/arm/cpu/armv8/zynqmp/spl.c
View File

@ -91,6 +91,10 @@ u32 spl_boot_device(void)
#ifdef CONFIG_SPL_DFU_SUPPORT #ifdef CONFIG_SPL_DFU_SUPPORT
case USB_MODE: case USB_MODE:
return BOOT_DEVICE_DFU; return BOOT_DEVICE_DFU;
#endif
#ifdef CONFIG_SPL_SATA_SUPPORT
case SW_SATA_MODE:
return BOOT_DEVICE_SATA;
#endif #endif
default: default:
printf("Invalid Boot Mode:0x%x\n", bootmode); printf("Invalid Boot Mode:0x%x\n", bootmode);

3
arch/arm/include/asm/arch-zynqmp/hardware.h
View File

@ -83,6 +83,9 @@ struct iou_scntr_secure {
#define JTAG_MODE 0x00000000 #define JTAG_MODE 0x00000000
#define BOOT_MODE_USE_ALT 0x100 #define BOOT_MODE_USE_ALT 0x100
#define BOOT_MODE_ALT_SHIFT 12 #define BOOT_MODE_ALT_SHIFT 12
/* SW secondary boot modes 0xa - 0xd */
#define SW_USBHOST_MODE 0x0000000A
#define SW_SATA_MODE 0x0000000B
#define ZYNQMP_IOU_SLCR_BASEADDR 0xFF180000 #define ZYNQMP_IOU_SLCR_BASEADDR 0xFF180000