Skip to contentSkip to conversation

Revert "rockchip: Only call binman when TPL available"

PATCH In review Jagan Teki 7 participants 12 messages Jan 27, 2023 – Feb 5, 2023

Subsystems (2)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/1 Revert "rockchip: Only call binman when TPL available"

This reverts commit f5315dd6290a588434e4f79bfd2886bb7df9210d.

[why]
TPL is not mandatory for not all Rockchip SoCs, some SoCs like RK356x, and RK3588 still use mainline u-boot without TPL as their ddr init programs are accessed via binaries provided by Rockchip instead of ddr source code.

Marking TPL build makes it not able to build u-boot.itb on RK356x targets so revert this so that it can build an SPL build that would support all across Rockchip platforms.

---
 arch/arm/dts/rockchip-u-boot.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/rockchip-u-boot.dtsi +1 -1
index 234fc5df43..6d1fd7769e 100644
@@ -11,7 +11,7 @@
 	};
 };
 
-#ifdef CONFIG_TPL
+#ifdef CONFIG_SPL
 &binman {
 	simple-bin {
 		filename = "u-boot-rockchip.bin";
Signature · 1 line
2.25.1
Tested-by on v1 1/1
#1 lore raw

Hi Jagan,

Quoted 9 lines · Jagan Teki

This reverts commit f5315dd6290a588434e4f79bfd2886bb7df9210d.

[why]
TPL is not mandatory for not all Rockchip SoCs, some SoCs like RK356x, and RK3588 still use mainline u-boot without TPL as their ddr init programs are accessed via binaries provided by Rockchip instead of ddr source code.

Quoted 7 lines

Marking TPL build makes it not able to build u-boot.itb on RK356x targets so revert this so that it can build an SPL build that would support all across Rockchip platforms.

---

Please add my

Thanks

-Anand

author
#2 lore raw
In reply to Jagan Teki
Quoted 9 lines · Jagan Teki

This reverts commit f5315dd6290a588434e4f79bfd2886bb7df9210d.

[why]
TPL is not mandatory for not all Rockchip SoCs, some SoCs like RK356x, and RK3588 still use mainline u-boot without TPL as their ddr init programs are accessed via binaries provided by Rockchip instead of ddr source code.

Quoted 7 lines

Marking TPL build makes it not able to build u-boot.itb on RK356x targets so revert this so that it can build an SPL build that would support all across Rockchip platforms.

---

Can someone apply this before -rc is released?

Thanks,
Jagan.

#3 lore raw
Quoted 14 lines · Jagan Teki
Quoted 13 lines · Jagan Teki

This reverts commit f5315dd6290a588434e4f79bfd2886bb7df9210d.

[why]
TPL is not mandatory for not all Rockchip SoCs, some SoCs like RK356x, and RK3588 still use mainline u-boot without TPL as their ddr init programs are accessed via binaries provided by Rockchip instead of ddr source code.

Marking TPL build makes it not able to build u-boot.itb on RK356x targets so revert this so that it can build an SPL build that would support all across Rockchip platforms.

Quoted 5 lines
Quoted 3 lines

---

Can someone apply this before -rc is released?

Yes, but where's the follow-up series to make both cases work again, I think I missed it?

Signature · 1 line
Tom
author
#4 lore raw
Quoted 16 lines · Tom Rini
Quoted 14 lines · Jagan Teki
Quoted 13 lines · Jagan Teki

This reverts commit f5315dd6290a588434e4f79bfd2886bb7df9210d.

[why]
TPL is not mandatory for not all Rockchip SoCs, some SoCs like RK356x, and RK3588 still use mainline u-boot without TPL as their ddr init programs are accessed via binaries provided by Rockchip instead of ddr source code.

Marking TPL build makes it not able to build u-boot.itb on RK356x targets so revert this so that it can build an SPL build that would support all across Rockchip platforms.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

---

Can someone apply this before -rc is released?

Yes, but where's the follow-up series to make both cases work again, I think I missed it?

No follow-up series from my side, I think this revert will compatible with all rockchip platforms.

Jagan.

#5 lore raw
Quoted 21 lines · Jagan Teki
Quoted 20 lines · Tom Rini
Quoted 18 lines · Jagan Teki
Quoted 16 lines · Jagan Teki

This reverts commit f5315dd6290a588434e4f79bfd2886bb7df9210d.

[why]
TPL is not mandatory for not all Rockchip SoCs, some SoCs like RK356x, and RK3588 still use mainline u-boot without TPL as their ddr init programs are accessed via binaries provided by Rockchip instead of ddr source code.

Marking TPL build makes it not able to build u-boot.itb on RK356x targets so revert this so that it can build an SPL build that would support all across Rockchip platforms.

---

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Can someone apply this before -rc is released?

Yes, but where's the follow-up series to make both cases work again, I think I missed it?

No follow-up series from my side, I think this revert will compatible with all rockchip platforms.

Well, I assumed there was some subset that needed this change or Kever wouldn't have posted and merged his change so close to the release. And I do think we need something with CONFIG_BUILD_TARGET so that this problem would have been caught in CI, in the future.

Signature · 1 line
Tom
#6 lore raw
In reply to Jagan Teki
Quoted 8 lines · Jagan Teki

This reverts commit f5315dd6290a588434e4f79bfd2886bb7df9210d.

[why]
TPL is not mandatory for not all Rockchip SoCs, some SoCs like RK356x, and RK3588 still use mainline u-boot without TPL as their ddr init programs are accessed via binaries provided by Rockchip instead of ddr source code.

Quoted 7 lines

Marking TPL build makes it not able to build u-boot.itb on RK356x targets so revert this so that it can build an SPL build that would support all across Rockchip platforms.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
#7 lore raw
In reply to Jagan Teki

Hi

    I think I do this modify for those soc not have TPL, or else it will cause the CI build error.

TPL/ddr binary is mandatory in all rockchip SoCs now, but the mainline U-Boot may not

able to provide the the available TPL, will need ddr init binary from rockchip rkbin repository

instead.

So the policy is clear, the binary output on mainline U-Boot rockchip platform:

- TPL available: u-boot-rockchip.bin with TPL, SPL, ATF, U-Boot proper;

- TPL not available: u-boot.itb with ATF, U-Boot proper.

                                        idbloader.bin generate by the TPL(ddr init binary instead) and SPL via mkimage cmd;

Thanks,
- Kever

Quoted 31 lines · Jagan Teki

This reverts commit f5315dd6290a588434e4f79bfd2886bb7df9210d.

[why]
TPL is not mandatory for not all Rockchip SoCs, some SoCs like RK356x, and RK3588 still use mainline u-boot without TPL as their ddr init programs are accessed via binaries provided by Rockchip instead of ddr source code.

Marking TPL build makes it not able to build u-boot.itb on RK356x targets so revert this so that it can build an SPL build that would support all across Rockchip platforms.

---
  arch/arm/dts/rockchip-u-boot.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/rockchip-u-boot.dtsi +1 -1
index 234fc5df43..6d1fd7769e 100644
@@ -11,7 +11,7 @@
  	};
  };
 
-#ifdef CONFIG_TPL
+#ifdef CONFIG_SPL
  &binman {
  	simple-bin {
  		filename = "u-boot-rockchip.bin";
#8 lore raw
Quoted 17 lines · Kever Yang

Hi

    I think I do this modify for those soc not have TPL, or else it will cause the CI build error.

TPL/ddr binary is mandatory in all rockchip SoCs now, but the mainline U-Boot may not

able to provide the the available TPL, will need ddr init binary from rockchip rkbin repository

instead.

So the policy is clear, the binary output on mainline U-Boot rockchip platform:

Quoted 6 lines

- TPL available: u-boot-rockchip.bin with TPL, SPL, ATF, U-Boot proper;

- TPL not available: u-boot.itb with ATF, U-Boot proper.

                                        idbloader.bin generate by the TPL(ddr init binary instead) and SPL via mkimage cmd;

The thing is, this sounds an awful lot like the challenges that are presented by imx8*, and sunxi and others now. We need to have binman know what binaries need to be there for a functional output, build the functional image by default, and then only CI will also pass the flag to say "fake the missing binaries", so CI will pass, with bad binaries no one would try and use, and real users will have the build fail due to missing binaries.

Quoted 35 lines

Thanks,
- Kever

Quoted 30 lines · Jagan Teki

This reverts commit f5315dd6290a588434e4f79bfd2886bb7df9210d.

[why]
TPL is not mandatory for not all Rockchip SoCs, some SoCs like RK356x, and RK3588 still use mainline u-boot without TPL as their ddr init programs are accessed via binaries provided by Rockchip instead of ddr source code.

Marking TPL build makes it not able to build u-boot.itb on RK356x targets so revert this so that it can build an SPL build that would support all across Rockchip platforms.

---
  arch/arm/dts/rockchip-u-boot.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/rockchip-u-boot.dtsi +1 -1
index 234fc5df43..6d1fd7769e 100644
@@ -11,7 +11,7 @@
  	};
  };
-#ifdef CONFIG_TPL
+#ifdef CONFIG_SPL
  &binman {
  	simple-bin {
  		filename = "u-boot-rockchip.bin";
Signature · 1 line
Tom
#9 lore raw
In reply to Kever Yang

Hi Kever,

Quoted 12 lines · Kever Yang

Hi

    I think I do this modify for those soc not have TPL, or else it
will cause the CI build error.

TPL/ddr binary is mandatory in all rockchip SoCs now, but the mainline U-Boot may not

able to provide the the available TPL, will need ddr init binary from rockchip rkbin repository

instead.

Quoted 9 lines

So the policy is clear, the binary output on mainline U-Boot rockchip platform:

- TPL available: u-boot-rockchip.bin with TPL, SPL, ATF, U-Boot proper;

- TPL not available: u-boot.itb with ATF, U-Boot proper.

                                        idbloader.bin generate by the
TPL(ddr init binary instead) and SPL via mkimage cmd;

If I understand correctly, the TPL might not be generated by U-Boot but externally provided by Rockchip in binary form? For those cases, the defconfig is expected to only request an SPL build I assume. However, idbloader.bin (from rockchip, U-Boot TPL replacement) shall still be passed with U-Boot SPL to mkimage?

In that case, I guess we could have a Kconfig option like CONFIG_EXTERNAL_TPL dependent on !TPL and have the user pass a TPL external path environment variable (EXTERNAL_TPL) the same way we do for BL31 or TEE in cmd_binman.

Then we should be able to adapt rockchip-u-boot.dtsi to manage this and still build a valid u-boot-rockchip.bin, e.g. replace
https://source.denx.de/u-boot/u-boot/-/blob/master/arch/arm/dts/rockchip-u-boot.dtsi#L23

#ifdef CONFIG_TPL
			multiple-data-files;

			u-boot-tpl {
			};
#endif
with
#if defined(CONFIG_TPL) || defined(CONFIG_EXTERNAL_TPL)
			multiple-data-files;
# ifdef CONFIG_TPL
			u-boot-tpl {
			};
# else
                        blob-ext {
                            filename = "${EXTERNAL_TPL}"
                        };
# endif
#endif

or something more appropriate for binman, like adapting u-boot-tpl to handle external blobs for example.

Cheers,
Quentin

#10 lore raw

Hi Quentin,

Quoted 62 lines · Quentin Schulz

Hi Kever,

Quoted 17 lines · Kever Yang

Hi

I think I do this modify for those soc not have TPL, or else it
will cause the CI build error.

TPL/ddr binary is mandatory in all rockchip SoCs now, but the mainline U-Boot may not

able to provide the the available TPL, will need ddr init binary from rockchip rkbin repository

instead.

So the policy is clear, the binary output on mainline U-Boot rockchip platform:

Quoted 7 lines

- TPL available: u-boot-rockchip.bin with TPL, SPL, ATF, U-Boot proper;

- TPL not available: u-boot.itb with ATF, U-Boot proper.

idbloader.bin generate by the
TPL(ddr init binary instead) and SPL via mkimage cmd;

If I understand correctly, the TPL might not be generated by U-Boot but externally provided by Rockchip in binary form? For those cases, the defconfig is expected to only request an SPL build I assume. However, idbloader.bin (from rockchip, U-Boot TPL replacement) shall still be passed with U-Boot SPL to mkimage?

In that case, I guess we could have a Kconfig option like CONFIG_EXTERNAL_TPL dependent on !TPL and have the user pass a TPL external path environment variable (EXTERNAL_TPL) the same way we do for BL31 or TEE in cmd_binman.

Then we should be able to adapt rockchip-u-boot.dtsi to manage this and still build a valid u-boot-rockchip.bin, e.g. replace
https://source.denx.de/u-boot/u-boot/-/blob/master/arch/arm/dts/rockchip-u-boot.dtsi#L23

#ifdef CONFIG_TPL
                        multiple-data-files;

                        u-boot-tpl {
                        };
#endif
with
#if defined(CONFIG_TPL) || defined(CONFIG_EXTERNAL_TPL)
                        multiple-data-files;
# ifdef CONFIG_TPL
                        u-boot-tpl {
                        };
# else
                         blob-ext {
                             filename = "${EXTERNAL_TPL}"
                         };
# endif
#endif
Quoted 2 lines

or something more appropriate for binman, like adapting u-boot-tpl to handle external blobs for example.

That sounds right to me. But I would like a new entry type for this (rockchip-tpl ?), as we do with BL31, etc.

Also, avoid the #idef around multiple-data-files - it is just easier to always enable that.

Regards,
Simon

#11 lore raw

Hi Simon and Quentin,

Quoted 65 lines · Simon Glass

Hi Quentin,

Quoted 61 lines · Quentin Schulz

Hi Kever,

Quoted 17 lines · Kever Yang

Hi

I think I do this modify for those soc not have TPL, or else it
will cause the CI build error.

TPL/ddr binary is mandatory in all rockchip SoCs now, but the mainline U-Boot may not

able to provide the the available TPL, will need ddr init binary from rockchip rkbin repository

instead.

So the policy is clear, the binary output on mainline U-Boot rockchip platform:

Quoted 7 lines

- TPL available: u-boot-rockchip.bin with TPL, SPL, ATF, U-Boot proper;

- TPL not available: u-boot.itb with ATF, U-Boot proper.

idbloader.bin generate by the
TPL(ddr init binary instead) and SPL via mkimage cmd;

If I understand correctly, the TPL might not be generated by U-Boot but externally provided by Rockchip in binary form? For those cases, the defconfig is expected to only request an SPL build I assume. However, idbloader.bin (from rockchip, U-Boot TPL replacement) shall still be passed with U-Boot SPL to mkimage?

In that case, I guess we could have a Kconfig option like CONFIG_EXTERNAL_TPL dependent on !TPL and have the user pass a TPL external path environment variable (EXTERNAL_TPL) the same way we do for BL31 or TEE in cmd_binman.

Then we should be able to adapt rockchip-u-boot.dtsi to manage this and
still build a valid u-boot-rockchip.bin, e.g. replace
https://source.denx.de/u-boot/u-boot/-/blob/master/arch/arm/dts/rockchip-u-boot.dtsi#L23>>> #ifdef CONFIG_TPL

                        multiple-data-files;

                        u-boot-tpl {
                        };
#endif
with
#if defined(CONFIG_TPL) || defined(CONFIG_EXTERNAL_TPL)
                        multiple-data-files;
# ifdef CONFIG_TPL
                        u-boot-tpl {
                        };
# else
                         blob-ext {
                             filename = "${EXTERNAL_TPL}"
                         };
# endif
#endif
Quoted 8 lines
Quoted 2 lines

or something more appropriate for binman, like adapting u-boot-tpl to handle external blobs for example.

That sounds right to me. But I would like a new entry type for this (rockchip-tpl ?), as we do with BL31, etc.

Also, avoid the #idef around multiple-data-files - it is just easier to always enable that.

I just sent out a series [1] based on a local patch I was already using, added a more generic external-tpl entry to binman instead of a rockchip specific one.

[1] https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/

Regards,
Jonas

Quoted 3 lines

Regards,
Simon