diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-05 07:19:52 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-05 07:19:52 -0500 |
| commit | f5cc89a82a9990ba9805ff5800c0872b891533ce (patch) | |
| tree | e5e5ab0ea18616c364b03f96ec98778fec824281 /arch/arm/include | |
| parent | c95215a6ca1cc7bb53cc634159e222abc06fddff (diff) | |
| parent | d9618e980430f3f7b84dfd5bb3004285ed47e5ba (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Bug fixes on ls1012a, ls1021a, ls1028ardb platforms Integrate fspi for
ls1028a, add DM-I2C support, update secure boot header offset
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/gpio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index acb7ea9a3e..39ffc18e29 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -4,6 +4,7 @@ !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) #include <asm/arch/gpio.h> #endif |