From 6ee01e20a9ec337b21405607d1edad2635740b02 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 23 Jun 2022 00:12:27 +0200 Subject: [PATCH 1/6] u-boot-timesys: remove 2011.12 recipe The last machine using this u-boot was removed with commit c604238 ("Remove boards using the linux-timesys kernel recipe") in 2015. Remove the recipe. Signed-off-by: Max Krummenacher --- recipes-bsp/u-boot/u-boot-timesys_2011.12.bb | 24 -------------------- 1 file changed, 24 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-timesys_2011.12.bb diff --git a/recipes-bsp/u-boot/u-boot-timesys_2011.12.bb b/recipes-bsp/u-boot/u-boot-timesys_2011.12.bb deleted file mode 100644 index 4005af3..0000000 --- a/recipes-bsp/u-boot/u-boot-timesys_2011.12.bb +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2013-2014 Timesys Corporation -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "bootloader for Vybrid platforms" -require recipes-bsp/u-boot/u-boot.inc - -PROVIDES += "u-boot" - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" - -SRCBRANCH = "2011.12-pcl052" -SRC_URI = "git://github.com/Timesys/u-boot-timesys.git;protocol=https;branch=${SRCBRANCH}" -SRCREV = "dca5026484c69628be9b9618e5795c635cefe110" - -SRCBRANCH_quartz = "2011.12-quartz" -SRCREV_quartz = "2dc3859b8274b45fb6336d9713b4b07e42dfb4cb" - -S = "${WORKDIR}/git" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(vf60)" - -PV = "v2011.12" From e59062bd6854de97c0f7b34cca5b08a28e37cd98 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 23 Jun 2022 09:21:16 +0200 Subject: [PATCH 2/6] vf: follow SoC override changes also for vybrid - Drop the sub SoC family vf50 and vf60 in favour of using only vf - Use the now generated vf-*-bsp overrides Signed-off-by: Max Krummenacher --- conf/machine/colibri-vf.conf | 2 +- recipes-bsp/libmcc/libmcc_1.05.1.bb | 2 +- recipes-bsp/mqxboot/mqxboot_1.0.1.bb | 2 +- .../u-boot/u-boot-toradex/{vf => vf-generic-bsp}/fw_env.config | 0 .../kernel-module-mcc-toradex_1.06+toradex2.bb | 2 +- recipes-kernel/linux/linux-toradex_4.4.bb | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename recipes-bsp/u-boot/u-boot-toradex/{vf => vf-generic-bsp}/fw_env.config (100%) diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf index 435c105..6900a1b 100644 --- a/conf/machine/colibri-vf.conf +++ b/conf/machine/colibri-vf.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for Toradex Colibri VF50/VF61 powered by Freescale Vybrid SoC #@MAINTAINER: Max Krummenacher -MACHINEOVERRIDES =. "vf:vf50:vf60:" +MACHINEOVERRIDES =. "vf:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa5.inc diff --git a/recipes-bsp/libmcc/libmcc_1.05.1.bb b/recipes-bsp/libmcc/libmcc_1.05.1.bb index 8f7fd2c..2b26f4f 100644 --- a/recipes-bsp/libmcc/libmcc_1.05.1.bb +++ b/recipes-bsp/libmcc/libmcc_1.05.1.bb @@ -19,7 +19,7 @@ CFLAGS += "-I${STAGING_KERNEL_DIR}/include" RDEPENDS:${PN} = "virtual/kernel-module-mcc" -COMPATIBLE_MACHINE = "(vf60)" +COMPATIBLE_MACHINE = "(vf-generic-bsp)" do_install() { oe_runmake 'DESTDIR=${D}' install diff --git a/recipes-bsp/mqxboot/mqxboot_1.0.1.bb b/recipes-bsp/mqxboot/mqxboot_1.0.1.bb index f69cbcf..cf6954e 100644 --- a/recipes-bsp/mqxboot/mqxboot_1.0.1.bb +++ b/recipes-bsp/mqxboot/mqxboot_1.0.1.bb @@ -17,7 +17,7 @@ CFLAGS += "-I${STAGING_KERNEL_DIR}/include" RDEPENDS:${PN} = "virtual/kernel-module-mcc" -COMPATIBLE_MACHINE = "(vf60)" +COMPATIBLE_MACHINE = "(vf-generic-bsp)" do_install() { oe_runmake 'DESTDIR=${D}' install diff --git a/recipes-bsp/u-boot/u-boot-toradex/vf/fw_env.config b/recipes-bsp/u-boot/u-boot-toradex/vf-generic-bsp/fw_env.config similarity index 100% rename from recipes-bsp/u-boot/u-boot-toradex/vf/fw_env.config rename to recipes-bsp/u-boot/u-boot-toradex/vf-generic-bsp/fw_env.config diff --git a/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb b/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb index b43f1c9..6138fbf 100644 --- a/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb +++ b/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb @@ -17,4 +17,4 @@ SRCREV = "083388fa5cce79c239988d61543322d91996aa8d" S = "${WORKDIR}/git" -COMPATIBLE_MACHINE = "(vf60)" +COMPATIBLE_MACHINE = "(vf-generic-bsp)" diff --git a/recipes-kernel/linux/linux-toradex_4.4.bb b/recipes-kernel/linux/linux-toradex_4.4.bb index c027d7f..0f19da0 100644 --- a/recipes-kernel/linux/linux-toradex_4.4.bb +++ b/recipes-kernel/linux/linux-toradex_4.4.bb @@ -17,4 +17,4 @@ SRCBRANCH = "toradex_vf_4.4" SRCREV = "4a0abd7dd466276ee3fdf79b54f05f845f7d8844" DEPENDS += "lzop-native bc-native" -COMPATIBLE_MACHINE = "(vf)" +COMPATIBLE_MACHINE = "(vf-generic-bsp)" From 936a385715ffc032e06f4def889cbd972c506cf4 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 23 Jun 2022 10:57:41 +0200 Subject: [PATCH 3/6] colibri-vf: use linux-toradex independent of the bsp Signed-off-by: Max Krummenacher --- conf/machine/colibri-vf.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf index 6900a1b..8707690 100644 --- a/conf/machine/colibri-vf.conf +++ b/conf/machine/colibri-vf.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "vf:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa5.inc -PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ??= "linux-toradex" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex" KERNEL_IMAGETYPE = "zImage" From 7a86916296dfc9d3635e83b899dcf84a41d18bd9 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 23 Jun 2022 10:51:10 +0200 Subject: [PATCH 4/6] kernel-module-mcc-toradex: cope with changes to kernel module build oe-core changed to install modules in nonarch_base_libdir which dropped the setting of INSTALL_MOD_PATH. However the Makefile makes use of INSTALL_MOD_PATH to set DESTDIR for other files. Set DESTDIR in the build env. Signed-off-by: Max Krummenacher --- .../kernel-module-mcc-toradex_1.06+toradex2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb b/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb index 6138fbf..f1df335 100644 --- a/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb +++ b/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb @@ -10,6 +10,8 @@ RPROVIDES:${PN}-dev = "virtual/kernel-module-mcc-dev" inherit module +export DESTDIR = "${D}" + SRC_URI = "git://github.com/toradex/mcc-kmod.git;protocol=https;branch=${SRCBRANCH}" SRCBRANCH = "master" From 7e2e2d8fa449abde809c1afca8674c14916259d0 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 23 Jun 2022 10:49:56 +0200 Subject: [PATCH 5/6] libmcc: prevent oe qa error, gnu_hash Signed-off-by: Max Krummenacher --- .../libmcc/0001-Makefile-use-oe-ldflags.patch | 29 +++++++++++++++++++ recipes-bsp/libmcc/libmcc_1.05.1.bb | 4 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/libmcc/libmcc/0001-Makefile-use-oe-ldflags.patch diff --git a/recipes-bsp/libmcc/libmcc/0001-Makefile-use-oe-ldflags.patch b/recipes-bsp/libmcc/libmcc/0001-Makefile-use-oe-ldflags.patch new file mode 100644 index 0000000..5291d55 --- /dev/null +++ b/recipes-bsp/libmcc/libmcc/0001-Makefile-use-oe-ldflags.patch @@ -0,0 +1,29 @@ +From ba86203da14d21c9c48dcf02595d71901875a263 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Thu, 23 Jun 2022 08:31:46 +0000 +Subject: [PATCH] Makefile: use oe ldflags + +Prevents QA error about missing GNU_HASH in the binary. + +Upstream-Status: Pending +Signed-off-by: Max Krummenacher +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 4482baf..34afbd4 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,7 +8,7 @@ build/libmcc.a: build/libmcc.o + $(AR) rcs $@ $< + + build/libmcc.so.1.0: build/libmcc.o +- $(CC) -shared -Wl,-soname,libmcc.so.1 -o $@ $< -lc ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libmcc.so.1 -o $@ $< -lc + + install: + mkdir -p $(DESTDIR)/usr/include $(DESTDIR)/usr/lib +-- +2.20.1 + diff --git a/recipes-bsp/libmcc/libmcc_1.05.1.bb b/recipes-bsp/libmcc/libmcc_1.05.1.bb index 2b26f4f..da38fb0 100644 --- a/recipes-bsp/libmcc/libmcc_1.05.1.bb +++ b/recipes-bsp/libmcc/libmcc_1.05.1.bb @@ -8,7 +8,9 @@ DEPENDS = "virtual/kernel-module-mcc" SRC_URI = "http://repository.timesys.com/buildsources/l/libmcc/libmcc-${PV}/libmcc-${PV}.tar.bz2 \ file://build-Fix-symlink-generation.patch \ - file://build-with-versioned-soname.patch" + file://build-with-versioned-soname.patch \ + file://0001-Makefile-use-oe-ldflags.patch \ +" SRC_URI[md5sum] = "7a35d9804bdcebdfcd7a3b717de50d31" SRC_URI[sha256sum] = "5d6d85f2f17ba1016c24e3a1c1c934a9267021edaed67b63879112151f48562c" From 28aac376f9aae1c44e9f9032a57be5a8c079762e Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 23 Jun 2022 10:50:37 +0200 Subject: [PATCH 6/6] mqxboot: prevent oe qa error, gnu_hash Signed-off-by: Max Krummenacher --- .../0001-Makefile-use-OE-ldflags.patch | 29 +++++++++++++++++++ recipes-bsp/mqxboot/mqxboot_1.0.1.bb | 5 +++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/mqxboot/mqxboot/0001-Makefile-use-OE-ldflags.patch diff --git a/recipes-bsp/mqxboot/mqxboot/0001-Makefile-use-OE-ldflags.patch b/recipes-bsp/mqxboot/mqxboot/0001-Makefile-use-OE-ldflags.patch new file mode 100644 index 0000000..58bd372 --- /dev/null +++ b/recipes-bsp/mqxboot/mqxboot/0001-Makefile-use-OE-ldflags.patch @@ -0,0 +1,29 @@ +From 368ee177806f15194acf352c83f64ba697a613ac Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Thu, 23 Jun 2022 08:46:14 +0000 +Subject: [PATCH] Makefile: use OE ldflags + +Prevents QA error about missing GNU_HASH in the binary. + +Upstream-Status: Pending +Signed-off-by: Max Krummenacher +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 37da46f..74cf280 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ all: build/mqxboot + + build/mqxboot: src/mqxboot.c + mkdir -p build/ +- $(CC) $< -o $@ $(CFLAGS) ++ $(CC) $< -o $@ $(CFLAGS) $(LDFLAGS) + + install: + mkdir -p $(INSTALL_PATH) +-- +2.20.1 + diff --git a/recipes-bsp/mqxboot/mqxboot_1.0.1.bb b/recipes-bsp/mqxboot/mqxboot_1.0.1.bb index cf6954e..0303bcc 100644 --- a/recipes-bsp/mqxboot/mqxboot_1.0.1.bb +++ b/recipes-bsp/mqxboot/mqxboot_1.0.1.bb @@ -6,7 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c49712341497d0b5f2e40c30dff2af9d \ DEPENDS = "virtual/kernel-module-mcc" -SRC_URI = "http://repository.timesys.com/buildsources/m/mqxboot/mqxboot-${PV}/mqxboot-${PV}.tar.bz2" +SRC_URI = " \ + http://repository.timesys.com/buildsources/m/mqxboot/mqxboot-${PV}/mqxboot-${PV}.tar.bz2 \ + file://0001-Makefile-use-OE-ldflags.patch \ +" SRC_URI[md5sum] = "f74755548041d50ca178448ee3e478d4" SRC_URI[sha256sum] = "32444409de5e809b9347e275a3bf78623a89e9ecce3188ebac79318b2b7c39b3"