On Sunday 18 December 2022 09:29:23 Christophe Leroy wrote:
Le 17/12/2022 à 23:15, Pali Rohár a écrit :
- Christophe and Mario: Could you please take this u-boot ppc patch?
On Friday 16 December 2022 19:16:38 Pali Rohár wrote:
PING?
On Monday 21 November 2022 18:40:41 Pali Rohár wrote:
- Tom
On Tuesday 01 November 2022 23:57:08 Pali Rohár wrote:
PING?
On Sunday 09 October 2022 14:28:19 Pali Rohár wrote:
PING?
On Wednesday 03 August 2022 13:20:49 Pali Rohár wrote: > kmcent2-u-boot.dtsi file contains copy of powerpc u-boot.dtsi binman file. > So remove code duplication and replace it by including u-boot.dtsi file. > > Signed-off-by: Pali Rohár pali@kernel.org > --- > arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++-------------------- > 1 file changed, 2 insertions(+), 20 deletions(-) > > diff --git a/arch/powerpc/dts/kmcent2-u-boot.dtsi b/arch/powerpc/dts/kmcent2-u-boot.dtsi > index ab76a9f1226c..d0277627644b 100644 > --- a/arch/powerpc/dts/kmcent2-u-boot.dtsi > +++ b/arch/powerpc/dts/kmcent2-u-boot.dtsi > @@ -74,24 +74,6 @@ > compatible = "fsl,pcie-t104x"; > law_trgt_if = <0>; > }; > - > - binman { > - filename = "u-boot-with-dtb.bin"; > - skip-at-start = <CONFIG_SYS_TEXT_BASE>; > - sort-by-offset; > - pad-byte = <0xff>; > - size = <CONFIG_SYS_MONITOR_LEN>; > - > - u-boot-with-ucode-ptr { > - offset = <CONFIG_SYS_TEXT_BASE>; > - optional-ucode; > - }; > - > - u-boot-dtb-with-ucode { > - align = <256>;
u-boot.dtsi has 'align = <4>' . Will it still work ?
Yes, it must be <4> otherwise mpc85xx code does not boot. Other boards use global u-boot.dtsi so they are already fixed. Just this one board has copy of older (not fixed) content of u-boot.dtsi
See commits where it was fixed for other boards:
7696b80ec5e9 powerpc: mpc85xx: Fix loading U-Boot proper from SD card in SPL b898f6a6db76 powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support for NOR booting e8c0e0064c8a powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support
In separate thread is discussion about this issue: https://lore.kernel.org/u-boot/20221217235913.w7ihsktbplbp2j7z@pali/
> - }; > - powerpc-mpc85xx-bootpg-resetvec { > - offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>; > - }; > - }; > }; > + > +#include "u-boot.dtsi" > -- > 2.20.1 >