diff options
author | Denys Dmytriyenko <denys@konsulko.com> | 2023-02-21 01:02:42 +0000 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-02-21 09:09:29 -0600 |
commit | 4338e7204c9f02430f2e82555630e1abfcd34a87 (patch) | |
tree | 612d6a276cae4b517f592fdc60aa10d6995e9be1 /meta-ti-bsp/recipes-bsp | |
parent | 69563462d93fd08b08d2fc70f84e63e58efc998f (diff) | |
download | meta-ti-4338e7204c9f02430f2e82555630e1abfcd34a87.tar.gz |
Revert "meta-ti-bsp: graphics: Resolve dependency chain"
Merged by accident.
This reverts commit 15417ca726f75881a2c51c08d258ea923803cbb9.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/recipes-bsp')
-rw-r--r-- | meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch | 28 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb (renamed from meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb) | 20 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 8 |
3 files changed, 43 insertions, 13 deletions
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch new file mode 100644 index 00000000..f59c00dc --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 80d32fee3d768abbd77cce77ea9a7574651460a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Dmytriyenko <denis@denix.org> | ||
3 | Date: Wed, 7 Jul 2021 13:11:56 -0400 | ||
4 | Subject: [PATCH] compiler: support OpenEmbedded "nodistro" internal aarch64 | ||
5 | toolchain | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Denys Dmytriyenko <denis@denix.org> | ||
10 | --- | ||
11 | build/linux/config/compiler.mk | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/build/linux/config/compiler.mk b/build/linux/config/compiler.mk | ||
15 | index 53a0bef..d788579 100644 | ||
16 | --- a/build/linux/config/compiler.mk | ||
17 | +++ b/build/linux/config/compiler.mk | ||
18 | @@ -65,7 +65,7 @@ define calculate-compiler-preferred-target | ||
19 | ifneq ($$(filter i386-% i486-% i586-% i686-%,$$($(1)_compiler_preferred_target)),) | ||
20 | $(1)_compiler_preferred_target := i386-linux-gnu | ||
21 | endif | ||
22 | - ifneq ($$(filter aarch64-poky-linux,$$($(1)_compiler_preferred_target)),) | ||
23 | + ifneq ($$(filter aarch64-oe-linux aarch64-poky-linux,$$($(1)_compiler_preferred_target)),) | ||
24 | $(1)_compiler_preferred_target := aarch64-linux-gnu | ||
25 | endif | ||
26 | ifneq ($$(filter armv7a-cros-linux-gnueabi armv7l-tizen-linux-gnueabi,$$($(1)_compiler_preferred_target)),) | ||
27 | -- | ||
28 | 2.7.4 | ||
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb index 96fb7484..b4d19195 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb | |||
@@ -3,38 +3,40 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" | |||
3 | LICENSE = "MIT | GPL-2.0-only" | 3 | LICENSE = "MIT | GPL-2.0-only" |
4 | LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" | 4 | LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" |
5 | 5 | ||
6 | inherit module | 6 | inherit module features_check |
7 | 7 | ||
8 | PROVIDES = "virtual/gpudriver" | 8 | REQUIRED_MACHINE_FEATURES = "gpu" |
9 | 9 | ||
10 | MACHINE_KERNEL_PR:append = "b" | 10 | MACHINE_KERNEL_PR:append = "b" |
11 | PR = "${MACHINE_KERNEL_PR}" | 11 | PR = "${MACHINE_KERNEL_PR}" |
12 | 12 | ||
13 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 13 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
14 | |||
15 | COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx" | 14 | COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx" |
16 | 15 | ||
17 | DEPENDS = "virtual/kernel" | 16 | DEPENDS = "virtual/kernel" |
18 | 17 | ||
19 | BRANCH = "linuxws/kirkstone/k5.10/${PV}" | 18 | PROVIDES = "virtual/gpudriver" |
20 | 19 | ||
21 | SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" | 20 | BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize" |
21 | |||
22 | SRC_URI = " \ | ||
23 | git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH} \ | ||
24 | file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ | ||
25 | " | ||
22 | 26 | ||
23 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
24 | 28 | ||
25 | SRCREV = "d575e4f64c95a3534e10e85da15bd303febf133f" | 29 | SRCREV = "c901804e8221d477983a6f7224a9cdc6e832f050" |
26 | 30 | ||
27 | TARGET_PRODUCT:j721e = "j721e_linux" | 31 | TARGET_PRODUCT:j721e = "j721e_linux" |
28 | TARGET_PRODUCT:j721s2 = "j721s2_linux" | 32 | TARGET_PRODUCT:j721s2 = "j721s2_linux" |
29 | TARGET_PRODUCT:j784s4 = "j784s4_linux" | 33 | TARGET_PRODUCT:j784s4 = "j784s4_linux" |
30 | TARGET_PRODUCT:am62xx = "am62_linux" | 34 | TARGET_PRODUCT:am62xx = "am62_linux" |
31 | PVR_BUILD = "release" | 35 | PVR_BUILD = "release" |
32 | PVR_WS = "lws-generic" | 36 | PVR_WS = "wayland" |
33 | 37 | ||
34 | EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' | 38 | EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' |
35 | 39 | ||
36 | do_install() { | 40 | do_install() { |
37 | make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install | 41 | make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install |
38 | } | 42 | } |
39 | |||
40 | RRECOMMENDS:${PN} += "ti-img-rogue-umlibs" | ||
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb index 13b8757c..c22e3096 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | |||
@@ -3,9 +3,9 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-linux" | |||
3 | LICENSE = "MIT | GPL-2.0-only" | 3 | LICENSE = "MIT | GPL-2.0-only" |
4 | LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=74506d9b8e5edbce66c2747c50fcef12" | 4 | LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=74506d9b8e5edbce66c2747c50fcef12" |
5 | 5 | ||
6 | inherit module | 6 | inherit module features_check |
7 | 7 | ||
8 | PROVIDES = "virtual/gpudriver" | 8 | REQUIRED_MACHINE_FEATURES = "gpu" |
9 | 9 | ||
10 | COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" | 10 | COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" |
11 | 11 | ||
@@ -16,6 +16,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
16 | 16 | ||
17 | DEPENDS = "virtual/kernel" | 17 | DEPENDS = "virtual/kernel" |
18 | 18 | ||
19 | PROVIDES = "virtual/gpudriver" | ||
20 | |||
19 | BRANCH = "ti-img-sgx/${PV}/k5.10" | 21 | BRANCH = "ti-img-sgx/${PV}/k5.10" |
20 | 22 | ||
21 | SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;branch=${BRANCH}" | 23 | SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;branch=${BRANCH}" |
@@ -42,5 +44,3 @@ do_install() { | |||
42 | do_install:k3() { | 44 | do_install:k3() { |
43 | make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install | 45 | make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install |
44 | } | 46 | } |
45 | |||
46 | RRECOMMENDS:${PN} += "ti-sgx-ddk-um" | ||