diff options
| author | Tom Rini <[email protected]> | 2020-03-30 07:46:05 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-03-30 14:14:07 -0400 |
| commit | 8e4af8f6d83e6d08b10939a9ce994897c6c837aa (patch) | |
| tree | a495aab48cff96a57655541e2bc96580c8f4b0af /arch/arm/include | |
| parent | 3c4fb0e91e25c0a1c9b4a30e66fc87219eb0d827 (diff) | |
| parent | 3ec7900b230aed8c35209eeb162fa75f759db69c (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Fixes env variable for layerscape platforms, disable hs200.
- Fixes board fixup, mux setting, enable gic, fspi on lx2160a, Fixes I2C
DM Warning on ls1043a, ls1046a
- Fixes RGMII port on ls1046ardb, ls1046ardb and DM_USB Warning on
ls1012afrdm, ls1021aiot
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/gpio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 84e5cb46e5a..333e407b666 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -4,7 +4,8 @@ !defined(CONFIG_ARCH_ROCKCHIP) && !defined(CONFIG_ARCH_LX2160A) && \ !defined(CONFIG_ARCH_LS1028A) && !defined(CONFIG_ARCH_LS2080A) && \ !defined(CONFIG_ARCH_LS1088A) && !defined(CONFIG_ARCH_ASPEED) && \ - !defined(CONFIG_ARCH_LS1012A) && !defined(CONFIG_ARCH_U8500) && \ + !defined(CONFIG_ARCH_LS1012A) && !defined(CONFIG_ARCH_LS1043A) && \ + !defined(CONFIG_ARCH_LS1046A) && !defined(CONFIG_ARCH_U8500) && \ !defined(CONFIG_CORTINA_PLATFORM) #include <asm/arch/gpio.h> #endif |