| Message ID | 20160830190629.13956-3-afd@ti.com |
|---|---|
| State | Accepted |
| Commit | 9eda25181dd102ffe68a65e7b8de62f9c6369208 |
| Delegated to: | Tom Rini |
| Headers | show |
On Wednesday 31 August 2016 12:36 AM, Andrew F. Davis wrote: > Depending on the boot media, different images are needed > for secure devices. The build generates u-boot*_HS_* files > as appropriate for the different boot modes. > > For AM33xx devices additional image types are needed for > various SPL boot modes as the ROM checks for the name of > the boot mode in the file it loads. > > Signed-off-by: Andrew F. Davis <afd@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Lokesh Vutla <lokeshvutla@ti.com> Thanks and regards, Lokesh > --- > arch/arm/cpu/armv7/am33xx/config.mk | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/cpu/armv7/am33xx/config.mk b/arch/arm/cpu/armv7/am33xx/config.mk > index d4eb21c..431cf62 100644 > --- a/arch/arm/cpu/armv7/am33xx/config.mk > +++ b/arch/arm/cpu/armv7/am33xx/config.mk > @@ -12,13 +12,29 @@ ifeq ($(CONFIG_TI_SECURE_DEVICE),y) > # For booting from SPI use > # u-boot-spl_HS_SPI_X-LOADER to program flash > # > -# For booting spl from all other media > -# use u-boot-spl_HS_ISSW > +# On AM43XX: > +# > +# For booting spl from all other media use > +# u-boot-spl_HS_ISSW > +# > +# On AM33XX: > +# > +# For booting spl from NAND flash use > +# u-boot-spl_HS_X-LOADER > +# > +# For booting spl from SD/MMC/eMMC media use > +# u-boot-spl_HS_MLO > +# > +# For booting spl over UART, USB, or Ethernet use > +# u-boot-spl_HS_2ND > # > # Refer to README.ti-secure for more info > # > ALL-y += u-boot-spl_HS_ISSW > ALL-$(CONFIG_SPL_SPI_SUPPORT) += u-boot-spl_HS_SPI_X-LOADER > +ALL-y += u-boot-spl_HS_X-LOADER > +ALL-y += u-boot-spl_HS_MLO > +ALL-y += u-boot-spl_HS_2ND > else > ALL-y += MLO > ALL-$(CONFIG_SPL_SPI_SUPPORT) += MLO.byteswap >
On Tue, Aug 30, 2016 at 02:06:21PM -0500, Andrew F. Davis wrote: > Depending on the boot media, different images are needed > for secure devices. The build generates u-boot*_HS_* files > as appropriate for the different boot modes. > > For AM33xx devices additional image types are needed for > various SPL boot modes as the ROM checks for the name of > the boot mode in the file it loads. > > Signed-off-by: Andrew F. Davis <afd@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Tom Rini <trini@konsulko.com>
On Tue, Aug 30, 2016 at 02:06:21PM -0500, Andrew F. Davis wrote: > Depending on the boot media, different images are needed > for secure devices. The build generates u-boot*_HS_* files > as appropriate for the different boot modes. > > For AM33xx devices additional image types are needed for > various SPL boot modes as the ROM checks for the name of > the boot mode in the file it loads. > > Signed-off-by: Andrew F. Davis <afd@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> > Acked-by: Lokesh Vutla <lokeshvutla@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/armv7/am33xx/config.mk b/arch/arm/cpu/armv7/am33xx/config.mk index d4eb21c..431cf62 100644 --- a/arch/arm/cpu/armv7/am33xx/config.mk +++ b/arch/arm/cpu/armv7/am33xx/config.mk @@ -12,13 +12,29 @@ ifeq ($(CONFIG_TI_SECURE_DEVICE),y) # For booting from SPI use # u-boot-spl_HS_SPI_X-LOADER to program flash # -# For booting spl from all other media -# use u-boot-spl_HS_ISSW +# On AM43XX: +# +# For booting spl from all other media use +# u-boot-spl_HS_ISSW +# +# On AM33XX: +# +# For booting spl from NAND flash use +# u-boot-spl_HS_X-LOADER +# +# For booting spl from SD/MMC/eMMC media use +# u-boot-spl_HS_MLO +# +# For booting spl over UART, USB, or Ethernet use +# u-boot-spl_HS_2ND # # Refer to README.ti-secure for more info # ALL-y += u-boot-spl_HS_ISSW ALL-$(CONFIG_SPL_SPI_SUPPORT) += u-boot-spl_HS_SPI_X-LOADER +ALL-y += u-boot-spl_HS_X-LOADER +ALL-y += u-boot-spl_HS_MLO +ALL-y += u-boot-spl_HS_2ND else ALL-y += MLO ALL-$(CONFIG_SPL_SPI_SUPPORT) += MLO.byteswap