diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-15 12:10:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-15 12:10:51 -0400 |
| commit | 66b8669d7709cecedf2e0403bb17b48bab86f644 (patch) | |
| tree | af87667da9a26f1ab9a4ff80ee5be459636e51c6 /include | |
| parent | 9cb3ce2558ba1fc058dfb26a07fc02603773a211 (diff) | |
| parent | 71ba2cb0d678d2c29dadd5fcca61ce3942876ee6 (diff) | |
| download | u-boot-66b8669d7709cecedf2e0403bb17b48bab86f644.zip u-boot-66b8669d7709cecedf2e0403bb17b48bab86f644.tar.gz u-boot-66b8669d7709cecedf2e0403bb17b48bab86f644.tar.bz2 | |
Merge tag 'u-boot-stm32-20200415' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- Replace STM32MP1_TRUSTED by TFABOOT flag
- Enable bootd, iminfo, imxtract on ST defconfig
- Rename LEDs to match silkscreen on AV96
- Add KS8851-16MLL ethernet on FMC2
- Define FMC2 base address
- net: dwc_eth_qos: implement reset-gpios for stm32
- net: dwc_eth_qos: implement phy reg and max-speed for stm32
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/stm32mp1.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 42717c1..2ba4fb1 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -10,7 +10,7 @@ #include <linux/sizes.h> #include <asm/arch/stm32.h> -#ifndef CONFIG_STM32MP1_TRUSTED +#ifndef CONFIG_TFABOOT /* PSCI support */ #define CONFIG_ARMV7_PSCI_1_0 #define CONFIG_ARMV7_SECURE_BASE STM32_SYSRAM_BASE |