Skip to contentSkip to conversation

powerpc: dts: keymile: Deduplicate binman code

PATCH In review Pali Rohár 4 participants 15 messages Aug 3, 2022 – Jan 3, 2023 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
arch/powerpc/dts/kmcent2-u-boot.dtsi +2 -20
index ab76a9f1226c..d0277627644b 100644
@@ -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"
Signature · 1 line
2.20.1
#1 lore raw

PING?

Quoted 42 lines · 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.

---
 arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
arch/powerpc/dts/kmcent2-u-boot.dtsi +2 -20
index ab76a9f1226c..d0277627644b 100644
@@ -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"
Signature · 1 line
2.20.1
#2 lore raw

PING?

Quoted 45 lines · On Sunday 09 October 2022 14:28:19 Pali Rohár wrote:

PING?

Quoted 42 lines · 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.

---
 arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
arch/powerpc/dts/kmcent2-u-boot.dtsi +2 -20
index ab76a9f1226c..d0277627644b 100644
@@ -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"
Signature · 1 line
2.20.1
#3 lore raw

+ Tom

Quoted 48 lines · On Tuesday 01 November 2022 23:57:08 Pali Rohár wrote:

PING?

Quoted 45 lines · On Sunday 09 October 2022 14:28:19 Pali Rohár wrote:

PING?

Quoted 42 lines · 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.

---
 arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
arch/powerpc/dts/kmcent2-u-boot.dtsi +2 -20
index ab76a9f1226c..d0277627644b 100644
@@ -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"
Signature · 1 line
2.20.1
#4 lore raw

PING?

Quoted 51 lines · On Monday 21 November 2022 18:40:41 Pali Rohár wrote:

+ Tom

Quoted 48 lines · On Tuesday 01 November 2022 23:57:08 Pali Rohár wrote:

PING?

Quoted 45 lines · On Sunday 09 October 2022 14:28:19 Pali Rohár wrote:

PING?

Quoted 42 lines · 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.

---
 arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
arch/powerpc/dts/kmcent2-u-boot.dtsi +2 -20
index ab76a9f1226c..d0277627644b 100644
@@ -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"
Signature · 1 line
2.20.1
#5 lore raw

Hi,

Quoted 2 lines · Pali Rohár

PING?

Shouldn't these be dealt with by the PPC maintainer?

Regards,
Simon

Quoted 53 lines · On Monday 21 November 2022 18:40:41 Pali Rohár wrote:
Quoted 51 lines

+ Tom

Quoted 48 lines · On Tuesday 01 November 2022 23:57:08 Pali Rohár wrote:

PING?

Quoted 45 lines · On Sunday 09 October 2022 14:28:19 Pali Rohár wrote:

PING?

Quoted 42 lines · 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.

---
 arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
arch/powerpc/dts/kmcent2-u-boot.dtsi +2 -21
index ab76a9f1226c..d0277627644b 100644
@@ -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

#6 lore raw
Quoted 8 lines · On Friday 16 December 2022 11:35:53 Simon Glass wrote:

Hi,

Quoted 2 lines · Pali Rohár

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.

Quoted 56 lines

Regards,
Simon

Quoted 53 lines · On Monday 21 November 2022 18:40:41 Pali Rohár wrote:
Quoted 51 lines

+ Tom

Quoted 48 lines · On Tuesday 01 November 2022 23:57:08 Pali Rohár wrote:

PING?

Quoted 45 lines · On Sunday 09 October 2022 14:28:19 Pali Rohár wrote:

PING?

Quoted 42 lines · 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.

---
 arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
arch/powerpc/dts/kmcent2-u-boot.dtsi +2 -21
index ab76a9f1226c..d0277627644b 100644
@@ -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

#7 lore raw

Hi Pali,

Quoted 62 lines · Pali Rohár
Quoted 8 lines · On Friday 16 December 2022 11:35:53 Simon Glass wrote:

Hi,

Quoted 2 lines · Pali Rohár

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.

Quoted 48 lines

Regards,
Simon

Quoted 45 lines · On Monday 21 November 2022 18:40:41 Pali Rohár wrote:
Quoted 43 lines

+ Tom

Quoted 40 lines · On Tuesday 01 November 2022 23:57:08 Pali Rohár wrote:

PING?

Quoted 37 lines · On Sunday 09 October 2022 14:28:19 Pali Rohár wrote:

PING?

Quoted 34 lines · 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.

---
 arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
arch/powerpc/dts/kmcent2-u-boot.dtsi +0 -18
index ab76a9f1226c..d0277627644b 100644
@@ -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)>;
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/powerpc/dts/kmcent2-u-boot.dtsi +2 -3
-               };
-       };
 };
+
+#include "u-boot.dtsi"
--

2.20.1

From the MAINTAINERS file:

POWERPC MPC8XX
M: Christophe Leroy <[email protected]>
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 <[email protected]>
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 <[email protected]>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git
F: arch/powerpc/cpu/mpc85xx/

Regards,
Simon

#8 lore raw
In reply to Pali Rohár

+ Christophe and Mario: Could you please take this u-boot ppc patch?

Quoted 54 lines · On Friday 16 December 2022 19:16:38 Pali Rohár wrote:

PING?

Quoted 51 lines · On Monday 21 November 2022 18:40:41 Pali Rohár wrote:

+ Tom

Quoted 48 lines · On Tuesday 01 November 2022 23:57:08 Pali Rohár wrote:

PING?

Quoted 45 lines · On Sunday 09 October 2022 14:28:19 Pali Rohár wrote:

PING?

Quoted 42 lines · 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.

---
 arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
arch/powerpc/dts/kmcent2-u-boot.dtsi +2 -20
index ab76a9f1226c..d0277627644b 100644
@@ -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"
Signature · 1 line
2.20.1
#9 lore raw

Le 17/12/2022 à 23:15, Pali Rohár a écrit :

Quoted 38 lines

+ Christophe and Mario: Could you please take this u-boot ppc patch?

Quoted 35 lines · On Friday 16 December 2022 19:16:38 Pali Rohár wrote:

PING?

Quoted 32 lines · On Monday 21 November 2022 18:40:41 Pali Rohár wrote:

+ Tom

Quoted 29 lines · On Tuesday 01 November 2022 23:57:08 Pali Rohár wrote:

PING?

Quoted 26 lines · On Sunday 09 October 2022 14:28:19 Pali Rohár wrote:

PING?

Quoted 23 lines · 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.

---
  arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++--------------------
  1 file changed, 2 insertions(+), 20 deletions(-)
arch/powerpc/dts/kmcent2-u-boot.dtsi +0 -7
index ab76a9f1226c..d0277627644b 100644
@@ -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>;
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

arch/powerpc/dts/kmcent2-u-boot.dtsi line 91

Quoted 8 lines
arch/powerpc/dts/kmcent2-u-boot.dtsi +0 -8
-
-		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 ?

Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
arch/powerpc/dts/kmcent2-u-boot.dtsi +2 -5
-		};
-		powerpc-mpc85xx-bootpg-resetvec {
-			offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;
-		};
-	};
  };
+
+#include "u-boot.dtsi"
Signature · 1 line
2.20.1
#10 lore raw
Quoted 41 lines · On Sunday 18 December 2022 09:29:23 Christophe Leroy wrote:

Le 17/12/2022 à 23:15, Pali Rohár a écrit :

Quoted 40 lines

+ Christophe and Mario: Could you please take this u-boot ppc patch?

Quoted 37 lines · On Friday 16 December 2022 19:16:38 Pali Rohár wrote:

PING?

Quoted 34 lines · On Monday 21 November 2022 18:40:41 Pali Rohár wrote:

+ Tom

Quoted 31 lines · On Tuesday 01 November 2022 23:57:08 Pali Rohár wrote:

PING?

Quoted 28 lines · On Sunday 09 October 2022 14:28:19 Pali Rohár wrote:

PING?

Quoted 25 lines · 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.

---
  arch/powerpc/dts/kmcent2-u-boot.dtsi | 22 ++--------------------
  1 file changed, 2 insertions(+), 20 deletions(-)
arch/powerpc/dts/kmcent2-u-boot.dtsi +0 -9
index ab76a9f1226c..d0277627644b 100644
@@ -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 {
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

arch/powerpc/dts/kmcent2-u-boot.dtsi line 91

Quoted 6 lines
arch/powerpc/dts/kmcent2-u-boot.dtsi +0 -6
-			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/

Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
arch/powerpc/dts/kmcent2-u-boot.dtsi +2 -5
-		};
-		powerpc-mpc85xx-bootpg-resetvec {
-			offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;
-		};
-	};
  };
+
+#include "u-boot.dtsi"
Signature · 1 line
2.20.1
Reviewed-by
#11 lore raw

Le 18/12/2022 à 11:59, Pali Rohár a écrit :

Quoted 22 lines · On Sunday 18 December 2022 09:29:23 Christophe Leroy wrote:
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
(quoted diff) +0 -8
-	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 {
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

Review

Quoted 6 lines
(quoted diff) +0 -6
-			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

Quoted 8 lines

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

#12 lore raw
Quoted 29 lines · On Sunday 18 December 2022 11:04:11 Christophe Leroy wrote:

Le 18/12/2022 à 11:59, Pali Rohár a écrit :

Quoted 28 lines · On Sunday 18 December 2022 09:29:23 Christophe Leroy wrote:
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
(quoted diff) +0 -8
-	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 {
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

Review

Quoted 6 lines
(quoted diff) +0 -6
-			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

Quoted 6 lines
Quoted 2 lines

In separate thread is discussion about this issue:
https://lore.kernel.org/u-boot/20221217235913.w7ihsktbplbp2j7z@pali/

Ok

Ok, what else is needed for this patch?

#13 lore raw
Quoted 30 lines · Pali Rohár
Quoted 29 lines · On Sunday 18 December 2022 11:04:11 Christophe Leroy wrote:

Le 18/12/2022 à 11:59, Pali Rohár a écrit :

Quoted 28 lines · On Sunday 18 December 2022 09:29:23 Christophe Leroy wrote:
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
(quoted diff) +0 -8
-	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 {
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

Review

Quoted 6 lines
(quoted diff) +0 -6
-			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

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

In separate thread is discussion about this issue:
https://lore.kernel.org/u-boot/20221217235913.w7ihsktbplbp2j7z@pali/

Ok

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.

Signature · 1 line
Tom