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>

diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index 06da009fa28b6a6f368b065ec9d28ef80d143b89..4a6ed3a7dd5c2fba251feda8d0e7a37ea8eabf0d 100644 (file)
--- 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";