diff options
| author | Tom Rini | 2021-10-21 07:52:15 -0400 |
|---|---|---|
| committer | Tom Rini | 2021-10-21 07:52:15 -0400 |
| commit | f200a4bcecf1be6d8b546f0eb6af6403c93d80dd (patch) | |
| tree | 5c5dfde8a916fd40ce0455ed1a7ead151719ecbb /arch | |
| parent | 79b8849d4c1e73df2a79a1d5a5f6166d0dd67a12 (diff) | |
| parent | bd4064ff8a82460d6a497faf66ac5830ffe452b1 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- Turris MOX and Omnia changes, mostly moving to Kconfig (Marek)
- a37xx: pci: Misc smaller fixes (Pali)
- cmd: tlv_eeprom: Fix building with DEBUG enabled (Sven)
- termios_linux.h: Fix tcsendbreak() implementation (Pali)
- mvebu: Add missing "if SPL" (Tom)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 54dff9986b4..d23cc0c760f 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -11,7 +11,7 @@ config ARMADA_32BIT select SPL_DM if SPL select SPL_DM_SEQ_ALIAS if SPL select SPL_OF_CONTROL if SPL - select SPL_SKIP_LOWLEVEL_INIT + select SPL_SKIP_LOWLEVEL_INIT if SPL select SPL_SIMPLE_BUS if SPL select SUPPORT_SPL select TRANSLATION_OFFSET @@ -127,7 +127,9 @@ config TARGET_TURRIS_OMNIA select DM_I2C select I2C_MUX select I2C_MUX_PCA954x + select SPL_DRIVERS_MISC select SPL_I2C_MUX + select SPL_SYS_MALLOC_SIMPLE select SYS_I2C_MVTWSI select ATSHA204A |