aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIcenowy Zheng <icenowy@sipeed.com>2021-07-22 14:30:03 +0800
committerAndre Przywara <andre.przywara@arm.com>2021-08-01 00:11:34 +0100
commit001ec430be141fd0c6346bca985c70068ad2d52b (patch)
treef83623816805f00063ca4235a1f3ae2a160a2d0d
parent1ebfc0c631e3073d6f7ae97aa001b26b660c08c4 (diff)
downloadu-boot-001ec430be141fd0c6346bca985c70068ad2d52b.zip
u-boot-001ec430be141fd0c6346bca985c70068ad2d52b.tar.gz
u-boot-001ec430be141fd0c6346bca985c70068ad2d52b.tar.bz2
sunxi: decide the inclusion of SCP by SCP_ADDR existence
There are more Allwinner SoCs that do not have a SCP now. When there's no SCP_ADDR macro defined, we can assume there's no SCP available. Drop the scp part of FIT description when SCP_ADDR does not exist. Signed-off-by: Icenowy Zheng <icenowy@sipeed.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
-rw-r--r--arch/arm/dts/sunxi-u-boot.dtsi4
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 06da009..4a6ed3a 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";