From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Holland Date: Sat, 12 Sep 2020 16:35:42 -0500 Subject: [PATCH v4 6/9] sunxi: binman: Use a macro for the BL31 load address In-Reply-To: <20200912213545.64376-1-samuel@sholland.org> References: <20200912213545.64376-1-samuel@sholland.org> Message-ID: <20200912213545.64376-7-samuel@sholland.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de This consolidates the SoC-specific part at the top of the file to avoid cluttering it up with preprocessor conditions. Reviewed-by: Simon Glass 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 = &mmc2; @@ -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