jailhouse: ensure INITRAMFS_IMAGE is initialized, pass full CC var
PATCH 1/4 jailhouse: ensure INITRAMFS_IMAGE is initialized, pass full CC var
* If both INITRAMFS_IMAGE and JH_RAMFS_IMAGE are unset, variables fail to expand, which leads to dependency errors.
* Passing full CC variable ensure all options are specified, especially --sysroot one for internal toolchains.
--- recipes-kernel/jailhouse/jailhouse_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
recipes-kernel/jailhouse/jailhouse_git.bb +2 -3
@@ -58,6 +58,7 @@ JH_SYSCONFIG_CELL ?= "" JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell" JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell" +INITRAMFS_IMAGE ?= "" JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}" JH_CMDLINE ?= ""
@@ -78,10 +79,8 @@ USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ -I../driver' TOOLS_SRC_DIR = "${S}/tools" -TOOLS_OBJ_DIR = "${S}/tools" - -EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}" +EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" KDIR=${STAGING_KERNEL_BUILDDIR}" do_compile() { oe_runmake V=1
Signature · 1 line
2.7.4
PATCH 2/4 ti-img-rogue-driver: port generic toolchain support from SGX
--- .../0001-km-support-general-toolchain.patch | 56 ++++++++++++++++++++++ .../ti-img-rogue-driver_1.10.5371573.bb | 4 +- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-km-support-general-toolchain.patch
recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-km-support-general-toolchain.patch new file +56 -0
@@ -0,0 +1,56 @@ +From dbdbd9309a58ee723fc827ef5fd45c28347cf61f Mon Sep 17 00:00:00 2001 +From: Eric Ruei <[email protected]> +Date: Tue, 7 May 2019 17:06:09 -0400 +Subject: [PATCH] km: support general toolchain + +This is a patch from IMG to support general toolchains such as +aarch64-oe-linux-gnu, aarch64-poky-linux-gnu, arm-none-linux-gnueabi +per IMG ticket 122059 + +Signed-off-by: Eric Ruei <[email protected]> +Signed-off-by: Denys Dmytriyenko <[email protected]> +--- + build/linux/config/compiler.mk | 12 +++++++++++- + .../build/linux/config/compilers/arm-linux-gnueabi.mk | 6 ++++++ + 2 files changed, 17 insertions(+), 1 deletion(-) + create mode 100644 build/linux/config/compilers/arm-linux-gnueabi.mk + +diff --git a/build/linux/config/compiler.mk b/build/linux/config/compiler.mk +index 82c9d44..dead2f9 100644 +--- a/build/linux/config/compiler.mk ++++ b/build/linux/config/compiler.mk +@@ -48,13 +48,14 @@ define calculate-compiler-preferred-target + ifeq ($(2),qcc) + $(1)_compiler_preferred_target := qcc + else +- $(1)_compiler_preferred_target := $$(subst --,-,$$(shell $(2) -dumpmachine)) ++ $(1)_compiler_preferred_target := $$(subst --,-,$$(subst unknown,,$$(shell $(2) -dumpmachine))) + ifeq ($$($(1)_compiler_preferred_target),) + $$(warning No output from '$(2) -dumpmachine') + $$(warning Check that the compiler is in your PATH and CROSS_COMPILE is) + $$(warning set correctly.) + $$(error Unable to run compiler '$(2)') + endif ++ $$(warning $(1) $(2)) + ifneq ($$(filter %-w64-mingw32,$$($(1)_compiler_preferred_target)),) + # Use the compiler target name. + else +@@ -64,6 +65,15 @@ define calculate-compiler-preferred-target + ifneq ($$(filter arm-linux-android,$$($(1)_compiler_preferred_target)),) + $(1)_compiler_preferred_target := arm-linux-androideabi + endif ++ ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),) ++ $(1)_compiler_preferred_target := aarch64-linux-gnu ++ endif ++ ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),) ++ $(1)_compiler_preferred_target := arm-linux-gnueabi ++ endif ++ ifneq ($$(filter arm-%-gnueabihf,$$($(1)_compiler_preferred_target)),) ++ $(1)_compiler_preferred_target := arm-linux-gnueabihf ++ endif + ifneq ($$(filter clang%,$(2)),) + ifeq ($(1),target) + ifeq (arm-linux-gnueabihf,$$(CROSS_TRIPLE)) +-- +2.7.4 +
recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.10.5371573.bb +3 -1
@@ -17,7 +17,9 @@ PROVIDES = "virtual/gpudriver" BRANCH = "linuxws/thud/k4.19/${PV}" -SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ + file://0001-km-support-general-toolchain.patch \ +" S = "${WORKDIR}/git" SRCREV = "1531b98ba602911359bfded2d683e49b3c731313"
Signature · 1 line
2.7.4
PATCH 3/4 ti-sgx-ddk-km: also support arm-oe-linux-gnueabi as a hardfp compiler
In reply to Denys DmytriyenkoOE-built internal toolchain doesn't use "-gnueabihf" suffix and instead uses "-gnueabi" for both softfp and hardfp.
For now we only support hardfp (user-space binaries are only available in hardfp), but would be nice to check for "callconvention-hard" before applying the patch.
--- ...OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch | 34 ++++++++++++++++++++++ .../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 4 ++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 755632b4f3a40996a12bc7816a9839af7112040a Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <[email protected]> +Date: Mon, 9 Sep 2019 17:05:48 -0400 +Subject: [PATCH] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf + suffix + +Signed-off-by: Denys Dmytriyenko <[email protected]> +--- + eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk +index dead2f9..2ba3e5e 100644 +--- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk ++++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk +@@ -68,12 +68,12 @@ define calculate-compiler-preferred-target + ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),) + $(1)_compiler_preferred_target := aarch64-linux-gnu + endif ++ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi,$$($(1)_compiler_preferred_target)),) ++ $(1)_compiler_preferred_target := arm-linux-gnueabihf ++ endif + ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),) + $(1)_compiler_preferred_target := arm-linux-gnueabi + endif +- ifneq ($$(filter arm-%-gnueabihf,$$($(1)_compiler_preferred_target)),) +- $(1)_compiler_preferred_target := arm-linux-gnueabihf +- endif + endif + endef + +-- +2.7.4 +
recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +3 -1
@@ -18,7 +18,9 @@ PROVIDES = "virtual/gpudriver" BRANCH = "ti-img-sgx/${PV}/k4.19" -SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH} \ + file://0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch \ +" S = "${WORKDIR}/git"
Signature · 1 line
2.7.4
PATCH 4/4 ti-gc320-libs: only compatible with DRA7xx platform
In reply to Denys Dmytriyenko--- recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb +3 -6
@@ -3,7 +3,7 @@ HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-libs" LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://Manifest.html;md5=a9121e8936ace09820d23f7626daaca5" -PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "dra7xx" CLEANBROKEN = "1"
@@ -24,9 +24,9 @@ python __anonymous() { raise bb.parse.SkipPackage("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv)) } -TARGET_PRODUCT_omap-a15 = "jacinto6evm" +TARGET_PRODUCT = "jacinto6evm" -PR = "r2" +PR = "r3" S = "${WORKDIR}/git"
@@ -38,6 +38,3 @@ do_install() { } INSANE_SKIP_${PN} += "ldflags" - -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST_ti-soc = "(.*)"
Signature · 1 line
2.7.4