| Message ID | 20171217085553.27212-1-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | a957d9a90ade4194dffe3eb2fc0136bc5d077c28 |
| Headers | show |
| Series | boot/arm-trusted-firmware: build fiptool separately with dependency on host-openssl | expand |
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > ATF >= 1.3 builds a host program called fiptool, which creates s/creates/uses/ > OpenSSL, so we need to build host-openssl. We could have made it an > optional dependency like U-Boot does, but since most ATF versions are > going to be >= 1.3 in the near future, we simply make host-openssl a > mandatory dependency. > However, the ATF build system is not very good, and you can't easily > pass flags that will affect the build of host programs. Therefore, we > take the approach of building fiptool separately before triggering the > real build process. > It would obviously be better to fix ATF itself, but as usual with > those bootloader packages, we fetch different versions depending on > the platform/configuration, making it difficult to use patches. > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/44868961 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > boot/arm-trusted-firmware/arm-trusted-firmware.mk | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > index e8d1c6205b..5085e6176b 100644 > --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > @@ -55,6 +55,18 @@ ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all > ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y) > ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += fip > +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-openssl > +# fiptool only exists in newer (>= 1.3) versions of ATF, so we build > +# it conditionally. We need to explicitly build it as it requires > +# OpenSSL, and therefore proper variables to find the host OpenSSL. s/proper/needs to be passed proper/ Committed with that fixed, thanks.
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index e8d1c6205b..5085e6176b 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -55,6 +55,18 @@ ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y) ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += fip +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-openssl +# fiptool only exists in newer (>= 1.3) versions of ATF, so we build +# it conditionally. We need to explicitly build it as it requires +# OpenSSL, and therefore proper variables to find the host OpenSSL. +define ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL + if test -d $(@D)/tools/fiptool; then \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/fiptool \ + $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ + CPPFLAGS="$(HOST_CPPFLAGS)" \ + LDLIBS="$(HOST_LDFLAGS) -lcrypto" ; \ + fi +endef endif ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31),y) @@ -62,6 +74,7 @@ ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += bl31 endif define ARM_TRUSTED_FIRMWARE_BUILD_CMDS + $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) $(TARGET_CONFIGURE_OPTS) \ $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ $(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
ATF >= 1.3 builds a host program called fiptool, which creates OpenSSL, so we need to build host-openssl. We could have made it an optional dependency like U-Boot does, but since most ATF versions are going to be >= 1.3 in the near future, we simply make host-openssl a mandatory dependency. However, the ATF build system is not very good, and you can't easily pass flags that will affect the build of host programs. Therefore, we take the approach of building fiptool separately before triggering the real build process. It would obviously be better to fix ATF itself, but as usual with those bootloader packages, we fetch different versions depending on the platform/configuration, making it difficult to use patches. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/44868961 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+)