diff options
| author | Tom Rini | 2021-07-31 20:51:24 -0400 |
|---|---|---|
| committer | Tom Rini | 2021-07-31 20:51:24 -0400 |
| commit | 5371593aed56ee11cbb6cc6ac8d058fcd9b8f58c (patch) | |
| tree | d36cea4bd3ddb0657ed0139f52572c1f9f11a529 /arch/arm/dts | |
| parent | 85769006fce951d0ebf61585ae0ab6b7d880735d (diff) | |
| parent | 001ec430be141fd0c6346bca985c70068ad2d52b (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi
- Move the PSCI runtime code for H3/A23/A33 into SRAM
- Pick the environment from the actual MMC boot device (SD card vs.
eMMC)
- Plus a small improvement from Icenowy, just for good measure.
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/sunxi-u-boot.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 06da009fa28..4a6ed3a7dd5 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -64,7 +64,7 @@ }; }; -#ifndef CONFIG_MACH_SUN50I_H616 +#ifdef SCP_ADDR scp { description = "SCP firmware"; type = "firmware"; @@ -92,7 +92,7 @@ @config-SEQ { description = "NAME"; firmware = "atf"; -#ifdef CONFIG_MACH_SUN50I_H616 +#ifndef SCP_ADDR loadables = "uboot"; #else loadables = "scp", "uboot"; |