aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPali Rohár2022-05-02 18:36:38 +0200
committerTom Rini2022-05-23 09:33:10 -0400
commitb898f6a6db7608785c34a127a2ec714ff4496621 (patch)
tree7fd27979bdb82094b300888bbf09d2effff8720b /arch/powerpc
parent92080c6ef6c753ca69c53f191a6baef53f98bd6b (diff)
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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/dts/u-boot.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/dts/u-boot.dtsi b/arch/powerpc/dts/u-boot.dtsi
index 9661f4dc88d..67de476a45e 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