From patchwork Mon Jun 8 19:20:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 241941 List-Id: U-Boot discussion From: sjg at chromium.org (Simon Glass) Date: Mon, 8 Jun 2020 13:20:22 -0600 Subject: [PATCH 13/15] rockchip: Allow including rockchip dtsi on 32-bit machines In-Reply-To: <20200608192024.21484-1-sjg@chromium.org> References: <20200608192024.21484-1-sjg@chromium.org> Message-ID: <20200608192024.21484-10-sjg@chromium.org> At present this file supports only 64-bit machines. Add an #ifdef so that it can be included without problems on 32-bit machines also. Signed-off-by: Simon Glass --- arch/arm/dts/rockchip-u-boot.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi index a2559e2db0..d2542f2230 100644 --- a/arch/arm/dts/rockchip-u-boot.dtsi +++ b/arch/arm/dts/rockchip-u-boot.dtsi @@ -6,6 +6,7 @@ #include / { +#ifdef CONFIG_ARM64 binman { filename = "u-boot-rockchip.bin"; pad-byte = <0xff>; @@ -18,4 +19,5 @@ offset = ; }; }; +#endif };