diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-14 15:43:33 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-14 15:43:33 +0300 |
| commit | fe16786149c8f1b2db95ed614a760bc443da6472 (patch) | |
| tree | f752f84e6e532497b167cb51b65e132993618c9b /arch/arm | |
| parent | cae802924e423900df24dc58f382896ceb42a54b (diff) | |
| parent | 82aef6c6f8a74a0595501bfbb2f6f763c786324f (diff) | |
| download | u-boot-fe16786149c8f1b2db95ed614a760bc443da6472.tar.xz | |
Merge tag 'rpi-next-2020.07' of https://gitlab.denx.de/u-boot/custodians/u-boot-raspberrypi
- fix phy configuration for RPi4's bcmgenet
- sync RPi4's env size with other RPi configs
- add kconfig option to reserver more pages in the EFI mem map
- add support for SDMA which is used by RPi4
- fix corner case boot bug for RPi3 32-bit
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/bcm283x-u-boot.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/mach-bcm283x/Kconfig | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/dts/bcm283x-u-boot.dtsi b/arch/arm/dts/bcm283x-u-boot.dtsi index 36548dad62..68d03627f4 100644 --- a/arch/arm/dts/bcm283x-u-boot.dtsi +++ b/arch/arm/dts/bcm283x-u-boot.dtsi @@ -19,3 +19,11 @@ &gpio { u-boot,dm-pre-reloc; }; + +&uart0_gpio14 { + u-boot,dm-pre-reloc; +}; + +&uart1_gpio14 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index 00419bf254..e6eb904e7f 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -209,4 +209,6 @@ config SYS_SOC config SYS_CONFIG_NAME default "rpi" +source "board/raspberrypi/rpi/Kconfig" + endmenu |