diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-19 20:35:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-19 20:35:27 -0400 |
| commit | 9dc8d155d4e88563f572ee79aab758eb4272f3fd (patch) | |
| tree | ee5559a3b68aea9e6476005be736015f496c4ddf /arch/arm | |
| parent | 333279af23ac08ebc8d8056c677c98964dd013b6 (diff) | |
| parent | f7df8932ccaec97c8c422de8adadb3a0491543ed (diff) | |
Merge git://git.denx.de/u-boot-imx
- changes in pico-* boards
- fix imx6ull pinmux
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/mx6ull_pins.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mx6/Kconfig | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-mx6/mx6ull_pins.h b/arch/arm/include/asm/arch-mx6/mx6ull_pins.h index 64cbb0e247..de4a1abc27 100644 --- a/arch/arm/include/asm/arch-mx6/mx6ull_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6ull_pins.h @@ -332,7 +332,7 @@ enum { MX6_PAD_UART5_TX_DATA__CSI_DATA14 = IOMUX_PAD(0x0348, 0x00BC, 3, 0x04FC, 0, 0), MX6_PAD_UART5_TX_DATA__CSU_CSU_ALARM_AUT00 = IOMUX_PAD(0x0348, 0x00BC, 4, 0x0000, 0, 0), - MX6_PAD_UART5_RX_DATA__UART5_DCE_RX = IOMUX_PAD(0x034C, 0x00C0, 0, 0x0644, 5, 0), + MX6_PAD_UART5_RX_DATA__UART5_DCE_RX = IOMUX_PAD(0x034C, 0x00C0, 0, 0x0644, 7, 0), MX6_PAD_UART5_RX_DATA__UART5_DTE_TX = IOMUX_PAD(0x034C, 0x00C0, 0, 0x0000, 0, 0), MX6_PAD_UART5_RX_DATA__ENET2_COL = IOMUX_PAD(0x034C, 0x00C0, 1, 0x0000, 0, 0), diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index a2799c436e..06c25bae36 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -402,6 +402,7 @@ config TARGET_OT1200 config TARGET_PICO_IMX6UL bool "PICO-IMX6UL-EMMC" select MX6UL + select SUPPORT_SPL config TARGET_LITEBOARD bool "Grinn liteBoard (i.MX6UL)" |