| Message ID | 20220502163639.10773-2-pali@kernel.org |
|---|---|
| State | Accepted |
| Commit | b898f6a6db7608785c34a127a2ec714ff4496621 |
| Delegated to: | Priyanka Jain |
| Headers | show |
| Series | powerpc: mpc85xx: Fix NOR booting | expand |
On Mon, May 02, 2022 at 06:36:38PM +0200, Pali Rohár wrote: > 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> Applied to u-boot/master, thanks!
On Monday 23 May 2022 13:57:07 Tom Rini wrote: > On Mon, May 02, 2022 at 06:36:38PM +0200, Pali Rohár wrote: > > > 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> > > Applied to u-boot/master, thanks! Perfect!!!
diff --git a/arch/powerpc/dts/u-boot.dtsi b/arch/powerpc/dts/u-boot.dtsi index 9661f4dc88d3..67de476a45ed 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
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> --- arch/powerpc/dts/u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)