[PATCH] powerpc: dts: keymile: Deduplicate binman code
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>; - }; - powerpc-mpc85xx-bootpg-resetvec { - offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>; - }; - }; }; + +#include "u-boot.dtsi"
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>;};powerpc-mpc85xx-bootpg-resetvec {offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;};- };
};
+#include "u-boot.dtsi"
2.20.1
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>;};powerpc-mpc85xx-bootpg-resetvec {offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;};- };
};
+#include "u-boot.dtsi"
2.20.1
+ 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>;};powerpc-mpc85xx-bootpg-resetvec {offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;};- };
};
+#include "u-boot.dtsi"
2.20.1
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>;};powerpc-mpc85xx-bootpg-resetvec {offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;};- };
};
+#include "u-boot.dtsi"
2.20.1
Hi,
On Fri, 16 Dec 2022 at 11:16, Pali Rohár pali@kernel.org wrote:
PING?
Shouldn't these be dealt with by the PPC maintainer?
Regards, Simon
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>;};powerpc-mpc85xx-bootpg-resetvec {offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;};};};
+#include "u-boot.dtsi"
2.20.1
On Friday 16 December 2022 11:35:53 Simon Glass wrote:
Hi,
On Fri, 16 Dec 2022 at 11:16, Pali Rohár pali@kernel.org wrote:
PING?
Shouldn't these be dealt with by the PPC maintainer?
I'm reminding patch for 4 months on the list and nobody is replying... So who can take and apply this patch? Who to contact? I do not know.
Regards, Simon
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>;};powerpc-mpc85xx-bootpg-resetvec {offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;};};};
+#include "u-boot.dtsi"
2.20.1
Hi Pali,
On Fri, 16 Dec 2022 at 15:00, Pali Rohár pali@kernel.org wrote:
On Friday 16 December 2022 11:35:53 Simon Glass wrote:
Hi,
On Fri, 16 Dec 2022 at 11:16, Pali Rohár pali@kernel.org wrote:
PING?
Shouldn't these be dealt with by the PPC maintainer?
I'm reminding patch for 4 months on the list and nobody is replying... So who can take and apply this patch? Who to contact? I do not know.
Regards, Simon
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>; > - }; > - powerpc-mpc85xx-bootpg-resetvec { > - offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>; > - }; > - }; > }; > + > +#include "u-boot.dtsi" > -- > 2.20.1 >
From the MAINTAINERS file:
POWERPC MPC8XX M: Christophe Leroy christophe.leroy@csgroup.eu S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-mpc8xx.git F: arch/powerpc/cpu/mpc8xx/
POWERPC MPC83XX M: Mario Six mario.six@gdsys.cc S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-mpc83xx.git F: drivers/ram/mpc83xx_sdram.c F: include/dt-bindings/memory/mpc83xx-sdram.h F: drivers/sysreset/sysreset_mpc83xx.c F: drivers/sysreset/sysreset_mpc83xx.h F: drivers/clk/mpc83xx_clk.c F: drivers/clk/mpc83xx_clk.h F: include/dt-bindings/clk/mpc83xx-clk.h F: drivers/timer/mpc83xx_timer.c F: drivers/cpu/mpc83xx_cpu.c F: drivers/cpu/mpc83xx_cpu.h F: drivers/misc/mpc83xx_serdes.c F: arch/powerpc/cpu/mpc83xx/ F: arch/powerpc/include/asm/arch-mpc83xx/
POWERPC MPC85XX M: Marek Behún kabel@kernel.org S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git F: arch/powerpc/cpu/mpc85xx/
Regards, Simon
+ 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>;};powerpc-mpc85xx-bootpg-resetvec {offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;};- };
};
+#include "u-boot.dtsi"
2.20.1
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 ?
};powerpc-mpc85xx-bootpg-resetvec {offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;};- }; };
+#include "u-boot.dtsi"
2.20.1
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 >
Le 18/12/2022 à 11:59, Pali Rohár a écrit :
On Sunday 18 December 2022 09:29:23 Christophe Leroy wrote:
>> - 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/
Ok
Reviewed-by: Christophe Leroy christophe.leroy@csgroup.eu
On Sunday 18 December 2022 11:04:11 Christophe Leroy wrote:
Le 18/12/2022 à 11:59, Pali Rohár a écrit :
On Sunday 18 December 2022 09:29:23 Christophe Leroy wrote:
>>> - 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/
Ok
Reviewed-by: Christophe Leroy christophe.leroy@csgroup.eu
Ok, what else is needed for this patch?
On Sat, Dec 24, 2022 at 07:37:17PM +0100, Pali Rohár wrote:
On Sunday 18 December 2022 11:04:11 Christophe Leroy wrote:
Le 18/12/2022 à 11:59, Pali Rohár a écrit :
On Sunday 18 December 2022 09:29:23 Christophe Leroy wrote:
>>>> - 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/
Ok
Reviewed-by: Christophe Leroy christophe.leroy@csgroup.eu
Ok, what else is needed for this patch?
Well, I had assigned it to Marek, but since it'll be a while before he puts a PR together again, I'll take this at some point to next, or just post v2023.01 release.
On Wed, Aug 03, 2022 at 01:20:49PM +0200, 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 Reviewed-by: Christophe Leroy christophe.leroy@csgroup.eu
Applied to u-boot/next, thanks!
participants (4)
-
Christophe Leroy -
Pali Rohár -
Simon Glass -
Tom Rini