diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-01 10:40:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-01 10:40:59 -0400 |
| commit | 6aee2ab68c362ace5a59f89a63abed82e0bf19e5 (patch) | |
| tree | 0b76045a178e9c0ed61e141bd8dfb3e34e4e86a9 /arch/arm/include/asm/mach-imx/sys_proto.h | |
| parent | 4109d702934c361b2ae2a5ad34f4dfee708cc214 (diff) | |
| parent | 63af4b0ad0666e0797306593813b6272e1995bde (diff) | |
Merge git://git.denx.de/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/imx6qdl_icore_mmc_defconfig
configs/imx6qdl_icore_rqs_defconfig
Diffstat (limited to 'arch/arm/include/asm/mach-imx/sys_proto.h')
| -rw-r--r-- | arch/arm/include/asm/mach-imx/sys_proto.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 046df6291a8..970c4ca7602 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -69,8 +69,13 @@ enum imx6_bmode_emi { enum imx6_bmode { IMX6_BMODE_EMI, - IMX6_BMODE_UART, +#if defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) + IMX6_BMODE_QSPI, + IMX6_BMODE_RESERVED, +#else + IMX6_BMODE_RESERVED, IMX6_BMODE_SATA, +#endif IMX6_BMODE_SERIAL_ROM, IMX6_BMODE_SD, IMX6_BMODE_ESD, @@ -85,6 +90,8 @@ static inline u8 imx6_is_bmode_from_gpr9(void) } u32 imx6_src_get_boot_mode(void); +void gpr_init(void); + #endif /* CONFIG_MX6 */ u32 get_nr_cpus(void); |