From 351fccaebc24134746fbeaf6ed4ded5ec899ef82 Mon Sep 17 00:00:00 2001 From: Alban Bedel Date: Wed, 5 Jun 2019 14:27:13 +0200 Subject: [PATCH] u-boot-qoriq-fw-utils: Update to 2018.09 to fix the build The build of the fw-utils is broken for all the machines that switched to TFA as u-boot 2018.03 doesn't have the TFA configs. Upgrade to 2018.09 to fix this issue and have both u-boot and the fw-utils built from the same version, which is probably a good idea anyway. Also added the dependency on bison-native which is needed for the build. Signed-off-by: Alban Bedel --- .../u-boot/u-boot-qoriq-common_2018.03.inc | 19 ------------------- ...03.bb => u-boot-qoriq-fw-utils_2018.09.bb} | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-qoriq-common_2018.03.inc rename recipes-bsp/u-boot/{u-boot-qoriq-fw-utils_2018.03.bb => u-boot-qoriq-fw-utils_2018.09.bb} (97%) diff --git a/recipes-bsp/u-boot/u-boot-qoriq-common_2018.03.inc b/recipes-bsp/u-boot/u-boot-qoriq-common_2018.03.inc deleted file mode 100644 index 5be64e49..00000000 --- a/recipes-bsp/u-boot/u-boot-qoriq-common_2018.03.inc +++ /dev/null @@ -1,19 +0,0 @@ - -inherit fsl-u-boot-localversion - -LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = " \ - file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \ - file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \ - file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ -" - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1 \ -" -SRCREV = "1e96fd8f464dfe23eb692a11018c20d70546783b" - -S = "${WORKDIR}/git" -PV_append = "+fslgit" -LOCALVERSION = "+fsl" \ No newline at end of file diff --git a/recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.03.bb b/recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.09.bb similarity index 97% rename from recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.03.bb rename to recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.09.bb index ae47cb0d..11078124 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.03.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq-fw-utils_2018.09.bb @@ -1,7 +1,7 @@ require u-boot-qoriq-common_${PV}.inc SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" -DEPENDS = "mtd-utils" +DEPENDS = "mtd-utils bison-native" INSANE_SKIP_${PN} = "already-stripped" EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1' -- 2.40.1