| Message ID | 1469040959-29908-3-git-send-email-dannenberg@ti.com |
|---|---|
| State | Accepted |
| Commit | 38d592fc33803892298df2d7c60aaab52a55d8fa |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, Jul 20, 2016 at 01:55:59PM -0500, Andreas Dannenberg wrote: > Commit 17c2987 introduces an undesired dependency on CONFIG_SPL_LOAD_FIT > when building U-Boot for AM57xx and DRA7xx 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>
On Wed, Jul 20, 2016 at 01:55:59PM -0500, Andreas Dannenberg wrote: > Commit 17c2987 introduces an undesired dependency on CONFIG_SPL_LOAD_FIT > when building U-Boot for AM57xx and DRA7xx 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 --git a/arch/arm/cpu/armv7/omap5/config.mk b/arch/arm/cpu/armv7/omap5/config.mk index d245572..286ca86 100644 --- a/arch/arm/cpu/armv7/omap5/config.mk +++ b/arch/arm/cpu/armv7/omap5/config.mk @@ -16,7 +16,7 @@ ALL-y += MLO endif else ifeq ($(CONFIG_TI_SECURE_DEVICE),y) -ALL-y += u-boot_HS.img +ALL-$(CONFIG_SPL_LOAD_FIT) += u-boot_HS.img endif ALL-y += u-boot.img endif
Commit 17c2987 introduces an undesired dependency on CONFIG_SPL_LOAD_FIT when building U-Boot for AM57xx and DRA7xx 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/omap5/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)