Re: [PATCH v3 6/9] sunxi: binman: Use a macro for the BL31 load address

[Simon Glass]

On Sat, 5 Sep 2020 at 21:26, Samuel Holland  wrote:
>
> This consolidates the SoC-specific part at the top of the file to avoid
> cluttering it up with preprocessor conditions.
>
> Signed-off-by: Samuel Holland 
> ---
>  arch/arm/dts/sunxi-u-boot.dtsi | 16 
>  1 file changed, 8 insertions(+), 8 deletions(-)

Reviewed-by: Simon Glass 

[PATCH v3 6/9] sunxi: binman: Use a macro for the BL31 load address

[Samuel Holland]

This consolidates the SoC-specific part at the top of the file to avoid
cluttering it up with preprocessor conditions.

Signed-off-by: Samuel Holland 
---
 arch/arm/dts/sunxi-u-boot.dtsi | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index 6ab0c783ba5..4d599720382 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -1,5 +1,11 @@
 #include 
 
+#ifdef CONFIG_MACH_SUN50I_H6
+#define BL31_ADDR 0x104000
+#else
+#define BL31_ADDR  0x44000
+#endif
+
 / {
aliases {
mmc1 = 
@@ -42,14 +48,8 @@
type = "firmware";
arch = "arm64";
compression = "none";
-/* TODO: Do this with an overwrite in this board's dtb? */
-#ifdef CONFIG_MACH_SUN50I_H6
-   load = <0x104000>;
-   entry = <0x104000>;
-#else
-   load = <0x44000>;
-   entry = <0x44000>;
-#endif
+   load = ;
+   entry = ;
 
atf-bl31 {
filename = "bl31.bin";
-- 
2.26.2