| Message ID | 20250627193003.575911-1-afd@ti.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,scarthgap/master,1/2] meta-ti-bsp: conf: machine: Deploy all versions of tiboot3.bin | expand |
On 6/27/2025 2:30 PM, Andrew Davis wrote: > For some version of U-Boot some versions of tiboot3.bin were not > available. This has since been fixed and now all versions of U-Boot > that are supported here have all versions of tiboot3.bin. Deploy > these all here. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- > meta-ti-bsp/conf/machine/include/j7200.inc | 8 ++------ > meta-ti-bsp/conf/machine/include/j721e.inc | 19 +++++++++---------- > meta-ti-bsp/conf/machine/include/j722s.inc | 5 +---- > 3 files changed, 12 insertions(+), 20 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc > index 3cba71b6..e7ab409f 100644 > --- a/meta-ti-bsp/conf/machine/include/j7200.inc > +++ b/meta-ti-bsp/conf/machine/include/j7200.inc > @@ -7,14 +7,10 @@ SOC_FAMILY:append = ":j7200" > IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" > > # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS > -IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin" > -IMAGE_SR1_HS_FS_FILES:bsp-mainline = "" > -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" Are these files now supported in the current version of the u-boot-ti-mainline_git.bb recipe (2025.04)? Just checking before I try and test it out. > # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE > -IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin" > -IMAGE_SR1_HS_SE_FILES:bsp-mainline = "" > -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" > > # Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS > IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" > diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc > index 30aa2a69..3a5a9af6 100644 > --- a/meta-ti-bsp/conf/machine/include/j721e.inc > +++ b/meta-ti-bsp/conf/machine/include/j721e.inc > @@ -15,22 +15,21 @@ IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" > IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" > > # Since default on J721e is for GP, add a version for SR1.1 HS-FS > -IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb" > -IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = "" > -IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" > +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" > > # Since default on J721e is for GP, add a version for SR1.1 HS-SE > -IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb" > -IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}" > +IMAGE_SR1_1_HS_SE_FILES = " " > +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" > +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" > > # Since default on J721e is for GP, add a version for SR2.0 HS-FS > -IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb" > -IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" > +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" > > # Since default on J721e is for GP, add a version for SR2.0 HS-SE > -IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb" > -IMAGE_SR2_HS_SE_FILES:bsp-mainline = "" > -IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" > +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" > > TFA_BOARD = "generic" > > diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc > index e0b77d96..d49da340 100644 > --- a/meta-ti-bsp/conf/machine/include/j722s.inc > +++ b/meta-ti-bsp/conf/machine/include/j722s.inc > @@ -12,10 +12,7 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" > IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" > > # Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE > -IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin" > -IMAGE_SR1_HS_SE_FILES:bsp-mainline = "" > -IMAGE_SR1_HS_SE_FILES:bsp-next = "" > -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" > > TFA_BOARD = "lite" > TFA_K3_SYSTEM_SUSPEND = "1"
On 6/27/25 2:45 PM, Ryan Eatmon wrote: > > > On 6/27/2025 2:30 PM, Andrew Davis wrote: >> For some version of U-Boot some versions of tiboot3.bin were not >> available. This has since been fixed and now all versions of U-Boot >> that are supported here have all versions of tiboot3.bin. Deploy >> these all here. >> >> Signed-off-by: Andrew Davis <afd@ti.com> >> --- >> meta-ti-bsp/conf/machine/include/j7200.inc | 8 ++------ >> meta-ti-bsp/conf/machine/include/j721e.inc | 19 +++++++++---------- >> meta-ti-bsp/conf/machine/include/j722s.inc | 5 +---- >> 3 files changed, 12 insertions(+), 20 deletions(-) >> >> diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc >> index 3cba71b6..e7ab409f 100644 >> --- a/meta-ti-bsp/conf/machine/include/j7200.inc >> +++ b/meta-ti-bsp/conf/machine/include/j7200.inc >> @@ -7,14 +7,10 @@ SOC_FAMILY:append = ":j7200" >> IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" >> # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS >> -IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin" >> -IMAGE_SR1_HS_FS_FILES:bsp-mainline = "" >> -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}" >> +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" > > Are these files now supported in the current version of the u-boot-ti-mainline_git.bb recipe (2025.04)? Just checking before I try and test it out. > Yes, most of these missing files landed upstream around v2024.07, u-boot-ti-mainline should be safe. Andrew > >> # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE >> -IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin" >> -IMAGE_SR1_HS_SE_FILES:bsp-mainline = "" >> -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}" >> +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" >> # Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS >> IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" >> diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc >> index 30aa2a69..3a5a9af6 100644 >> --- a/meta-ti-bsp/conf/machine/include/j721e.inc >> +++ b/meta-ti-bsp/conf/machine/include/j721e.inc >> @@ -15,22 +15,21 @@ IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" >> IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" >> # Since default on J721e is for GP, add a version for SR1.1 HS-FS >> -IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb" >> -IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = "" >> -IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}" >> +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" >> +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" >> # Since default on J721e is for GP, add a version for SR1.1 HS-SE >> -IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb" >> -IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}" >> +IMAGE_SR1_1_HS_SE_FILES = " " >> +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" >> +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" >> # Since default on J721e is for GP, add a version for SR2.0 HS-FS >> -IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb" >> -IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}" >> +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" >> +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" >> # Since default on J721e is for GP, add a version for SR2.0 HS-SE >> -IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb" >> -IMAGE_SR2_HS_SE_FILES:bsp-mainline = "" >> -IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}" >> +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" >> +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" >> TFA_BOARD = "generic" >> diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc >> index e0b77d96..d49da340 100644 >> --- a/meta-ti-bsp/conf/machine/include/j722s.inc >> +++ b/meta-ti-bsp/conf/machine/include/j722s.inc >> @@ -12,10 +12,7 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" >> IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" >> # Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE >> -IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin" >> -IMAGE_SR1_HS_SE_FILES:bsp-mainline = "" >> -IMAGE_SR1_HS_SE_FILES:bsp-next = "" >> -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}" >> +IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" >> TFA_BOARD = "lite" >> TFA_K3_SYSTEM_SUSPEND = "1" >
On 6/27/2025 2:30 PM, Andrew Davis wrote: > For some version of U-Boot some versions of tiboot3.bin were not > available. This has since been fixed and now all versions of U-Boot > that are supported here have all versions of tiboot3.bin. Deploy > these all here. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- > meta-ti-bsp/conf/machine/include/j7200.inc | 8 ++------ > meta-ti-bsp/conf/machine/include/j721e.inc | 19 +++++++++---------- > meta-ti-bsp/conf/machine/include/j722s.inc | 5 +---- > 3 files changed, 12 insertions(+), 20 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc > index 3cba71b6..e7ab409f 100644 > --- a/meta-ti-bsp/conf/machine/include/j7200.inc > +++ b/meta-ti-bsp/conf/machine/include/j7200.inc > @@ -7,14 +7,10 @@ SOC_FAMILY:append = ":j7200" > IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" > > # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS > -IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin" > -IMAGE_SR1_HS_FS_FILES:bsp-mainline = "" > -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" > > # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE > -IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin" > -IMAGE_SR1_HS_SE_FILES:bsp-mainline = "" > -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" > > # Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS > IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" > diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc > index 30aa2a69..3a5a9af6 100644 > --- a/meta-ti-bsp/conf/machine/include/j721e.inc > +++ b/meta-ti-bsp/conf/machine/include/j721e.inc > @@ -15,22 +15,21 @@ IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" > IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" > > # Since default on J721e is for GP, add a version for SR1.1 HS-FS > -IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb" > -IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = "" > -IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" > +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" > > # Since default on J721e is for GP, add a version for SR1.1 HS-SE > -IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb" > -IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}" > +IMAGE_SR1_1_HS_SE_FILES = " " > +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" > +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" Andrew, NAK. This breaks the beaglebone-ai64 build. The meta-beagle/conf/machine/beaglebone-ai64.conf clears the various IMAGE_* variables because the sysfw-j721e_sr1_1-hs-evm.itb file is not created in that flow. So making this change does not jive with the beaglebone setup. It looks like you need to also clean up those files so that they do not rely on the IMAGE_BOOT_FILES variable... Not sure. You wanted to do this, so you can negotiate with Denys on the best way to resolve this with your patch. > # Since default on J721e is for GP, add a version for SR2.0 HS-FS > -IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb" > -IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" > +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" > > # Since default on J721e is for GP, add a version for SR2.0 HS-SE > -IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb" > -IMAGE_SR2_HS_SE_FILES:bsp-mainline = "" > -IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" > +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" > > TFA_BOARD = "generic" > > diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc > index e0b77d96..d49da340 100644 > --- a/meta-ti-bsp/conf/machine/include/j722s.inc > +++ b/meta-ti-bsp/conf/machine/include/j722s.inc > @@ -12,10 +12,7 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" > IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" > > # Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE > -IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin" > -IMAGE_SR1_HS_SE_FILES:bsp-mainline = "" > -IMAGE_SR1_HS_SE_FILES:bsp-next = "" > -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}" > +IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" > > TFA_BOARD = "lite" > TFA_K3_SYSTEM_SUSPEND = "1"
diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index 3cba71b6..e7ab409f 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc @@ -7,14 +7,10 @@ SOC_FAMILY:append = ":j7200" IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS -IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin" -IMAGE_SR1_HS_FS_FILES:bsp-mainline = "" -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE -IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin" -IMAGE_SR1_HS_SE_FILES:bsp-mainline = "" -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" # Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 30aa2a69..3a5a9af6 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -15,22 +15,21 @@ IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" # Since default on J721e is for GP, add a version for SR1.1 HS-FS -IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb" -IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = "" -IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" # Since default on J721e is for GP, add a version for SR1.1 HS-SE -IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb" -IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}" +IMAGE_SR1_1_HS_SE_FILES = " " +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" # Since default on J721e is for GP, add a version for SR2.0 HS-FS -IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb" -IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" # Since default on J721e is for GP, add a version for SR2.0 HS-SE -IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb" -IMAGE_SR2_HS_SE_FILES:bsp-mainline = "" -IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc index e0b77d96..d49da340 100644 --- a/meta-ti-bsp/conf/machine/include/j722s.inc +++ b/meta-ti-bsp/conf/machine/include/j722s.inc @@ -12,10 +12,7 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" # Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE -IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin" -IMAGE_SR1_HS_SE_FILES:bsp-mainline = "" -IMAGE_SR1_HS_SE_FILES:bsp-next = "" -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1"
For some version of U-Boot some versions of tiboot3.bin were not available. This has since been fixed and now all versions of U-Boot that are supported here have all versions of tiboot3.bin. Deploy these all here. Signed-off-by: Andrew Davis <afd@ti.com> --- meta-ti-bsp/conf/machine/include/j7200.inc | 8 ++------ meta-ti-bsp/conf/machine/include/j721e.inc | 19 +++++++++---------- meta-ti-bsp/conf/machine/include/j722s.inc | 5 +---- 3 files changed, 12 insertions(+), 20 deletions(-)