diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-17 14:13:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-17 14:13:58 -0400 |
| commit | fa8967cfbaed5582ba987756fa9f0470a9affbf4 (patch) | |
| tree | 258ab44757e1c78825f087310577f1df05ccdcca /arch/arm/mach-uniphier/boot-device/boot-device.c | |
| parent | ae1b939930b0fffc062bb99196ec22e19afcc7e8 (diff) | |
| parent | 81afa9c9a3a9c006a6555e4abf7a75875eb3e926 (diff) | |
Merge git://git.denx.de/u-boot-uniphier
- Add workaround code to make LD20 SoC boot from ARM Trusted Firmware
- Sync DT with Linux to fix DTC warnings
- Add new SoC support code
- Misc fix, updates
Diffstat (limited to 'arch/arm/mach-uniphier/boot-device/boot-device.c')
| -rw-r--r-- | arch/arm/mach-uniphier/boot-device/boot-device.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c index 00809777b24..094f77b4d10 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device.c @@ -115,6 +115,16 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = { .have_internal_stm = 1, }, #endif +#if defined(CONFIG_ARCH_UNIPHIER_PXS3) + { + .soc_id = UNIPHIER_PXS3_ID, + .boot_device_sel_shift = 1, + .boot_device_table = uniphier_pxs3_boot_device_table, + .boot_device_count = &uniphier_pxs3_boot_device_count, + .boot_device_is_usb = uniphier_pxs3_boot_device_is_usb, + .have_internal_stm = 0, + }, +#endif }; UNIPHIER_DEFINE_SOCDATA_FUNC(uniphier_get_boot_device_info, uniphier_boot_device_info) |