diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-30 07:14:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-30 07:14:05 -0400 |
| commit | b25f8e2112b1582ce6386e846800a31bab688e50 (patch) | |
| tree | 7fe8146a99851ce9256b8de3de2c86f1b276b92b /arch/arm/include | |
| parent | abeb9d7897510533ce3a0a9515cac16db5bed834 (diff) | |
| parent | 07a8f79ee850b1e59371519f179d32fea171bbec (diff) | |
Merge git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/opos6ul.h | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mxs/sys_proto.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach-imx/iomux-v3.h | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/include/asm/arch-mx6/opos6ul.h b/arch/arm/include/asm/arch-mx6/opos6ul.h index b5363850d2..8adff67cea 100644 --- a/arch/arm/include/asm/arch-mx6/opos6ul.h +++ b/arch/arm/include/asm/arch-mx6/opos6ul.h @@ -9,8 +9,4 @@ int opos6ul_board_late_init(void); -#ifdef CONFIG_SPL_BUILD -void opos6ul_setup_uart_debug(void); -#endif - #endif diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h index 609676375b..b23ee6d887 100644 --- a/arch/arm/include/asm/arch-mxs/sys_proto.h +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h @@ -85,6 +85,8 @@ static const struct mxs_pair mxs_boot_modes[] = { #define MXS_BM_SDMMC1_3V3 0x0a #define MXS_BM_SDMMC1_1V8 0x1a +#define MXS_SPL_DATA ((struct mxs_spl_data *)(CONFIG_SYS_TEXT_BASE - 0x200)) + struct mxs_spl_data { uint8_t boot_mode_idx; uint32_t mem_dram_size; diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h index 0c0ccf4403..09094c9af6 100644 --- a/arch/arm/include/asm/mach-imx/iomux-v3.h +++ b/arch/arm/include/asm/mach-imx/iomux-v3.h @@ -147,10 +147,10 @@ typedef u64 iomux_v3_cfg_t; #define PAD_CTL_ODE (1 << 11) -#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) -#define PAD_CTL_SPEED_LOW (0 << 6) -#else +#if defined(CONFIG_MX6SL) #define PAD_CTL_SPEED_LOW (1 << 6) +#else +#define PAD_CTL_SPEED_LOW (0 << 6) #endif #define PAD_CTL_SPEED_MED (2 << 6) #define PAD_CTL_SPEED_HIGH (3 << 6) |