mesa-pvr: adjust PR to be RPM-safe

RPM does not accept '-' as a character in the PR/version and fails with: | error: line 4: Illegal char '-' (0x2d) in: Release: sgxrgx-54fd9d7dea098b6f11c2a244b0c6763dc8c5690c.1 The correct approach is to reference SRCPV and not SRCREV and also add it to PV and not PR. But PV is used in the branch to fetch the sources and cannot be modified, so use SRCPV in PR w/o any illegal characters. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
k3r5: make the separate TMPDIR optional
2026-04-20 19:53:43 +00:00 · 2023-12-13 12:27:39 -06:00 · 2023-12-13 12:22:29 -06:00 · 2023-12-11 15:05:27 -06:00 · 2023-12-11 13:28:42 -06:00
19 changed files with 115 additions and 2 deletions
--- a/meta-ti-bsp/conf/multiconfig/k3r5.conf
+++ b/meta-ti-bsp/conf/multiconfig/k3r5.conf
@@ -4,6 +4,7 @@ DEPLOY_DIR_IMAGE:k3r5 = "${TI_COMMON_DEPLOY}/images/${MAINMACHINE}"

 MACHINE:append = "-k3r5"
 TCLIBC = "baremetal"
-TMPDIR:append = "-k3r5"
+TI_TMPDIR_APPEND ?= "-k3r5"
+TMPDIR:append = "${TI_TMPDIR_APPEND}"

 SDKPKGSUFFIX = "k3r5-nativesdk"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.01.bb
@@ -0,0 +1,21 @@
+require u-boot-ti.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
+
+PR = "r0"
+
+BRANCH = "ti-u-boot-2024.01"
+
+SRCREV = "2f0282922b2c458eea7f85c500a948a587437b63"
+
+do_install:append:am62xx() {
+	install -d ${D}/boot
+	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot
+}
+
+do_deploy:append:am62xx() {
+	install -d ${DEPLOYDIR}
+	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
+}
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb
@@ -32,7 +32,7 @@ PACKAGECONFIG:append = " \
 # Idea is these two should be the same, but currently a segfault is happening
 # on certain platforms if the sgx commit is used.
 SRCREV = "${@bb.utils.contains('PACKAGECONFIG', 'sgx', '7c9522a4147836064f582278e4f7115735c16868', '54fd9d7dea098b6f11c2a244b0c6763dc8c5690c', d)}"
-PR = "sgxrgx-${SRCREV}"
+PR = "sgxrgx${SRCPV}"

 PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
 PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/k3/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=defconfig
+config-fragment=kernel/configs/ti_arm64_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/omapl138/defconfig
@@ -0,0 +1 @@
+use-kernel-config=davinci_all_defconfig
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti33x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti33x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti43x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti43x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/k3/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=defconfig
+config-fragment=kernel/configs/ti_arm64_prune.config kernel/configs/ti_rt.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/omapl138/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=davinci_all_defconfig
+config-fragment=kernel/configs/ti_rt.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti33x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti33x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti43x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti43x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
@@ -0,0 +1,16 @@
+require linux-ti-staging_6.6.bb
+
+DEFAULT_PREFERENCE = "-1"
+
+# Look in the generic major.minor directory for files
+# This will have priority over generic non-rt path
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
+
+#BRANCH = "ti-rt-linux-6.6.y"
+BRANCH = "ti-linux-6.6.y"
+
+SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa"
+
+include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
+
+PV = "6.6.0+git${SRCPV}"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=defconfig
+config-fragment=kernel/configs/ti_arm64_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig
@@ -0,0 +1 @@
+use-kernel-config=davinci_all_defconfig
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb
@@ -0,0 +1,7 @@
+require linux-ti-staging_6.6.bb
+
+DEFAULT_PREFERENCE = "-1"
+
+# Look in the generic major.minor directory for files
+# This will have priority over generic non-rt path
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
@@ -0,0 +1,44 @@
+SECTION = "kernel"
+SUMMARY = "Linux kernel for TI devices"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+inherit ti-secdev
+inherit kernel
+
+DEFAULT_PREFERENCE = "-1"
+
+require recipes-kernel/linux/setup-defconfig.inc
+require recipes-kernel/linux/ti-kernel.inc
+include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
+include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
+
+DEPENDS += "gmp-native libmpc-native"
+
+# Look in the generic major.minor directory for files
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
+
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
+		      ${EXTRA_DTC_ARGS}"
+
+S = "${WORKDIR}/git"
+
+BRANCH ?= "ti-linux-6.6.y"
+
+SRCREV ?= "ffc253263a1375a65fa6c9f62a893e9767fbebfa"
+PV = "6.6.0+git${SRCPV}"
+
+# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
+MACHINE_KERNEL_PR:append = "b"
+PR = "${MACHINE_KERNEL_PR}"
+
+KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
+KERNEL_GIT_PROTOCOL = "https"
+SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
+            file://defconfig"
+
+# Special configuration for remoteproc/rpmsg IPC modules
+module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
+module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"
+module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
+KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
Author	SHA1	Message	Date
Denys Dmytriyenko	328bc9227f	mesa-pvr: adjust PR to be RPM-safe RPM does not accept '-' as a character in the PR/version and fails with: \| error: line 4: Illegal char '-' (0x2d) in: Release: sgxrgx-54fd9d7dea098b6f11c2a244b0c6763dc8c5690c.1 The correct approach is to reference SRCPV and not SRCREV and also add it to PV and not PR. But PV is used in the branch to fetch the sources and cannot be modified, so use SRCPV in PR w/o any illegal characters. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-12-13 12:27:39 -06:00
Jose Quaresma	5dd8e7f62b	k3r5: make the separate TMPDIR optional With the current implemetation is not possible to remove the '-k3r5' customization using overrides like below and the '-k3r5' always stay there. \| TMPDIR:remove:k3r5 = "-k3r5" \| or \| TMPDIR:k3r5 = "${TOPDIR}/tmp" This patch allows to build the core-image-minimal in oe-core master/nanbield without any issue on a common TMPDIR folder just using the following: \| TI_COMMON_DEPLOY = "${DEPLOY_DIR}" \| TI_TMPDIR_APPEND = "" Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-12-13 12:22:29 -06:00
Ryan Eatmon	5b5b8b9325	u-boot-ti-staging: Add 2024.01 uboot in prep for LTS migration We are preparing to migrate our uboot version to 2024.01. As we are still working on the migration, mark the default preference low for this version. We will enable building with this uboot in a meta-arago brand in the near future. Once the migration is complete, we will remove the 2023.04 uboot and make this the default. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-12-11 15:05:27 -06:00
Ryan Eatmon	e4d10138db	linux-ti-staging: Add 6.6 kernel in prep for LTS migration We are preparing to migrate our kernel version to 6.6. As we are still working on the migration, mark the default preference low for this version. We will enable building with this kernel in a meta-arago brand in the near future. Once the migration is complete, we will remove the 6.1 kernel and make this the default. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-12-11 13:28:42 -06:00