diff mbox

[U-Boot,1/2] arm: am4x: fix build dependency for secure devices

Message ID 1469040959-29908-2-git-send-email-dannenberg@ti.com
State Accepted
Commit 8b76d23ebdc915faf155aafcb2a221b4923ba18a
Delegated to: Tom Rini
Headers show

Commit Message

Andreas Dannenberg July 20, 2016, 6:55 p.m. UTC 
Commit e29878f introduces an undesired dependency on CONFIG_SPL_LOAD_FIT
when building U-Boot for AM43xx high-security (HS) devices that causes the
build to break when that option is not active. Fix this issue by only
building the u-boot_HS.img target when building U-Boot into an actual
FIT image.

Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
---
 arch/arm/cpu/armv7/am33xx/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Rini July 21, 2016, 2:47 p.m. UTC | #1 
On Wed, Jul 20, 2016 at 01:55:58PM -0500, Andreas Dannenberg wrote:

> Commit e29878f introduces an undesired dependency on CONFIG_SPL_LOAD_FIT
> when building U-Boot for AM43xx high-security (HS) devices that causes the
> build to break when that option is not active. Fix this issue by only
> building the u-boot_HS.img target when building U-Boot into an actual
> FIT image.
> 
> Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>

Reviewed-by: Tom Rini <trini@konsulko.com>
Tom Rini July 23, 2016, 12:13 a.m. UTC | #2 
On Wed, Jul 20, 2016 at 01:55:58PM -0500, Andreas Dannenberg wrote:

> Commit e29878f introduces an undesired dependency on CONFIG_SPL_LOAD_FIT
> when building U-Boot for AM43xx high-security (HS) devices that causes the
> build to break when that option is not active. Fix this issue by only
> building the u-boot_HS.img target when building U-Boot into an actual
> FIT image.
> 
> Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/am33xx/config.mk b/arch/arm/cpu/armv7/am33xx/config.mk
index ab94708..d4eb21c 100644
--- a/arch/arm/cpu/armv7/am33xx/config.mk
+++ b/arch/arm/cpu/armv7/am33xx/config.mk
@@ -26,7 +26,7 @@  endif
 else
 ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
 ALL-$(CONFIG_QSPI_BOOT) += u-boot_HS_XIP_X-LOADER
-ALL-y	+= u-boot_HS.img
+ALL-$(CONFIG_SPL_LOAD_FIT) += u-boot_HS.img
 endif
 ALL-y	+= u-boot.img
 endif