| Message ID | 20240304153253.732708-16-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On March 4, 2024 thus sayeth Dario Binacchi: > Recent versions of U-Boot are capable of building tiboot3.bin using > Binman. In this case, let's copy it to the binaries directory. > > The use of `find' command is justified by the need to use a regex > expression to select the correct file. This is not possible with a > simple `cp' command. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > > --- > > Changes in v8: > - Use the `find' command in pipe with the `cp' command. > > Changes in v6: > - Replace `find' command with `cp' one. > > Changes in v5: > - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with > tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > > Added in v4 > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index fdb058f3b72a..9a05d005067a 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > endef > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > + > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > + cd $(@D); find ./ -type f -regex "\.\/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-[^-]*..bin" -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > endef Some devices like the j721e and am65x family will need the sysfw-*.itb copied over to boot. Thankfully binman will generate these automatically depending on the defconfig we gave to U-Boot. ~Bryan
Hi Bryan, On Tue, Mar 19, 2024 at 10:11:24AM -0500, Bryan Brattlof wrote: > On March 4, 2024 thus sayeth Dario Binacchi: > > Recent versions of U-Boot are capable of building tiboot3.bin using > > Binman. In this case, let's copy it to the binaries directory. > > > > The use of `find' command is justified by the need to use a regex > > expression to select the correct file. This is not possible with a > > simple `cp' command. > > > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > > > > --- > > > > Changes in v8: > > - Use the `find' command in pipe with the `cp' command. > > > > Changes in v6: > > - Replace `find' command with `cp' one. > > > > Changes in v5: > > - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with > > tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > > > > Added in v4 > > > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index fdb058f3b72a..9a05d005067a 100644 > > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS > > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > > endef > > > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > > +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > > + > > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > > + cd $(@D); find ./ -type f -regex "\.\/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-[^-]*..bin" -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > > endef > > Some devices like the j721e and am65x family will need the sysfw-*.itb > copied over to boot. Thankfully binman will generate these automatically > depending on the defconfig we gave to U-Boot. This was discussed before, actually I signed myself up to add AM65x support once we have base support in with this series fully merged. At that time I'd take care of the copy step. Dario doesn't have a way to test on hardware, and at some point we need to limit the scope if this series here. -- Andreas Dannenberg Texas Instruments Inc > > ~Bryan
diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index fdb058f3b72a..9a05d005067a 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) + define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + cd $(@D); find ./ -type f -regex "\.\/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-[^-]*..bin" -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; endef $(eval $(kconfig-package))
Recent versions of U-Boot are capable of building tiboot3.bin using Binman. In this case, let's copy it to the binaries directory. The use of `find' command is justified by the need to use a regex expression to select the correct file. This is not possible with a simple `cp' command. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- Changes in v8: - Use the `find' command in pipe with the `cp' command. Changes in v6: - Replace `find' command with `cp' one. Changes in v5: - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin Added in v4 boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ 1 file changed, 4 insertions(+)