From: Pali Rohár <pali@kernel.org>
Date: Mon, 2 May 2022 16:36:38 +0000 (+0200)
Subject: powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support for NOR booting
X-Git-Tag: v2022.07~47^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b898f6a6db7608785c34a127a2ec714ff4496621;p=platform%2Fkernel%2Fu-boot.git

powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support for NOR booting

Commit e8c0e0064c8a ("powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support")
fixed SD card booting on mpc85xx boards but broke NOR booting on these
boards. Reason is that U-Boot build system for NOR images uses binman and
this binman ignores alignment defined in linker script. Instead it has own
config file where is alignment defined.

Fix binman alignment for mpc85xx boards to match what is _now_ defined in
linker script.

This change fixes building of U-Boot for NOR booting on P2020 board.

Fixes: e8c0e0064c8a ("powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support")
Signed-off-by: Pali Rohár <pali@kernel.org>
---

diff --git a/arch/powerpc/dts/u-boot.dtsi b/arch/powerpc/dts/u-boot.dtsi
index 9661f4d..67de476 100644
--- a/arch/powerpc/dts/u-boot.dtsi
+++ b/arch/powerpc/dts/u-boot.dtsi
@@ -20,7 +20,7 @@
 
 		u-boot-dtb-with-ucode {
 #ifdef CONFIG_MPC85xx
-			align = <256>;
+			align = <4>;
 #endif
 		};
 #ifdef CONFIG_MPC85XX_HAVE_RESET_VECTOR