summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@konsulko.com>2024-06-14 15:36:27 -0400
committerRyan Eatmon <reatmon@ti.com>2024-06-15 08:05:34 -0500
commitf3ad203a8acc10972f4089dcc724c0adece53415 (patch)
tree2886a19ac6c31878488aac8fafad716744d4e809
parent8090ce9a4b1108fe51b40b3d8997314a59bf89f1 (diff)
downloadmeta-ti-f3ad203a8acc10972f4089dcc724c0adece53415.tar.gz
meta-ti: remove MACHINE_KERNEL_PR globally
MACHINE_KERNEL_PR is a remnant of the early OE days and hasn't been needed for quite some time. Let's finally remove it completely. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/conf/machine/include/k3.inc3
-rw-r--r--meta-ti-bsp/conf/machine/include/omap-a15.inc3
-rw-r--r--meta-ti-bsp/conf/machine/include/ti33x.inc3
-rw-r--r--meta-ti-bsp/conf/machine/include/ti43x.inc3
-rw-r--r--meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb3
-rw-r--r--meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb3
-rw-r--r--meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb3
-rw-r--r--meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb3
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb4
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb4
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb4
-rw-r--r--meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb3
-rw-r--r--meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb3
13 files changed, 0 insertions, 42 deletions
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 2b82cb82..34991ec9 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -7,9 +7,6 @@ require conf/machine/include/arm/arch-arm64.inc
7 7
8BBMULTICONFIG += "k3r5" 8BBMULTICONFIG += "k3r5"
9 9
10# Increase this everytime you change something in the kernel
11MACHINE_KERNEL_PR = "r0"
12
13require conf/machine/include/ti-bsp.inc 10require conf/machine/include/ti-bsp.inc
14 11
15KERNEL_IMAGETYPE = "Image" 12KERNEL_IMAGETYPE = "Image"
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index 3637ad0a..be086936 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -4,9 +4,6 @@ SOC_FAMILY:append = ":omap-a15"
4DEFAULTTUNE ?= "armv7athf-neon" 4DEFAULTTUNE ?= "armv7athf-neon"
5require conf/machine/include/arm/armv7a/tune-cortexa15.inc 5require conf/machine/include/arm/armv7a/tune-cortexa15.inc
6 6
7# Increase this everytime you change something in the kernel
8MACHINE_KERNEL_PR = "r7"
9
10require conf/machine/include/ti-bsp.inc 7require conf/machine/include/ti-bsp.inc
11 8
12# Graphics providers and variables 9# Graphics providers and variables
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index 45934aa0..a8dc2174 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -4,9 +4,6 @@ SOC_FAMILY:append = ":ti33x"
4DEFAULTTUNE ?= "armv7athf-neon" 4DEFAULTTUNE ?= "armv7athf-neon"
5require conf/machine/include/arm/armv7a/tune-cortexa8.inc 5require conf/machine/include/arm/armv7a/tune-cortexa8.inc
6 6
7# Increase this everytime you change something in the kernel
8MACHINE_KERNEL_PR = "r22"
9
10require conf/machine/include/ti-bsp.inc 7require conf/machine/include/ti-bsp.inc
11 8
12# Graphics providers and variables 9# Graphics providers and variables
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index c6a3c510..6fb87f16 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -4,9 +4,6 @@ SOC_FAMILY:append = ":ti43x"
4DEFAULTTUNE ?= "armv7athf-neon" 4DEFAULTTUNE ?= "armv7athf-neon"
5require conf/machine/include/arm/armv7a/tune-cortexa9.inc 5require conf/machine/include/arm/armv7a/tune-cortexa9.inc
6 6
7# Increase this everytime you change something in the kernel
8MACHINE_KERNEL_PR = "r3"
9
10require conf/machine/include/ti-bsp.inc 7require conf/machine/include/ti-bsp.inc
11 8
12# Graphics providers and variables 9# Graphics providers and variables
diff --git a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
index a56810d4..818ed683 100644
--- a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
+++ b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
@@ -7,9 +7,6 @@ inherit module features_check
7 7
8REQUIRED_MACHINE_FEATURES = "gc320" 8REQUIRED_MACHINE_FEATURES = "gc320"
9 9
10MACHINE_KERNEL_PR:append = "i"
11PR = "${MACHINE_KERNEL_PR}"
12
13# Need to branch out with ${PV} var 10# Need to branch out with ${PV} var
14BRANCH = "ti-${PV}-k5.10" 11BRANCH = "ti-${PV}-k5.10"
15 12
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
index 02ec9fe9..34c22cb2 100644
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
@@ -7,9 +7,6 @@ inherit module
7 7
8PROVIDES = "virtual/gpudriver" 8PROVIDES = "virtual/gpudriver"
9 9
10MACHINE_KERNEL_PR:append = "b"
11PR = "${MACHINE_KERNEL_PR}"
12
13PACKAGE_ARCH = "${MACHINE_ARCH}" 10PACKAGE_ARCH = "${MACHINE_ARCH}"
14 11
15COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" 12COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb
index fdb8b51d..6f374f69 100644
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb
@@ -7,9 +7,6 @@ inherit module
7 7
8PROVIDES = "virtual/gpudriver" 8PROVIDES = "virtual/gpudriver"
9 9
10MACHINE_KERNEL_PR:append = "b"
11PR = "${MACHINE_KERNEL_PR}"
12
13PACKAGE_ARCH = "${MACHINE_ARCH}" 10PACKAGE_ARCH = "${MACHINE_ARCH}"
14 11
15COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" 12COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"
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 ca28ae76..f112c662 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
@@ -9,9 +9,6 @@ PROVIDES = "virtual/gpudriver"
9 9
10COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" 10COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
11 11
12MACHINE_KERNEL_PR:append = "x"
13PR = "${MACHINE_KERNEL_PR}"
14
15PACKAGE_ARCH = "${MACHINE_ARCH}" 12PACKAGE_ARCH = "${MACHINE_ARCH}"
16 13
17DEPENDS = "virtual/kernel" 14DEPENDS = "virtual/kernel"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
index 5c495d46..47b573e1 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
@@ -18,10 +18,6 @@ S = "${WORKDIR}/git"
18SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa" 18SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa"
19PV = "6.6+git" 19PV = "6.6+git"
20 20
21# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
22MACHINE_KERNEL_PR:append = "b"
23PR = "${MACHINE_KERNEL_PR}"
24
25KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" 21KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
26KERNEL_GIT_PROTOCOL = "https" 22KERNEL_GIT_PROTOCOL = "https"
27KERNEL_GIT_BRANCH = "master" 23KERNEL_GIT_BRANCH = "master"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
index 51d0a6a5..2cdfb1b9 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
@@ -26,10 +26,6 @@ BRANCH ?= "ti-linux-6.1.y"
26SRCREV ?= "c1c2f1971fbf6ddad93a8c94314fe8221e7aa6be" 26SRCREV ?= "c1c2f1971fbf6ddad93a8c94314fe8221e7aa6be"
27PV = "6.1.83+git" 27PV = "6.1.83+git"
28 28
29# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
30MACHINE_KERNEL_PR:append = "b"
31PR = "${MACHINE_KERNEL_PR}"
32
33KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" 29KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
34KERNEL_GIT_PROTOCOL = "https" 30KERNEL_GIT_PROTOCOL = "https"
35SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ 31SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
diff --git 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
index 3adf9b7f..58a9fa52 100644
--- 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
@@ -26,10 +26,6 @@ BRANCH ?= "ti-linux-6.6.y"
26SRCREV ?= "f7f73d9d344c89081db499a2968d9033d7cac45c" 26SRCREV ?= "f7f73d9d344c89081db499a2968d9033d7cac45c"
27PV = "6.6.25+git" 27PV = "6.6.25+git"
28 28
29# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
30MACHINE_KERNEL_PR:append = "b"
31PR = "${MACHINE_KERNEL_PR}"
32
33KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" 29KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
34KERNEL_GIT_PROTOCOL = "https" 30KERNEL_GIT_PROTOCOL = "https"
35SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ 31SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
diff --git a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
index 9d85829b..62b4645c 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
@@ -2,9 +2,6 @@ DESCRIPTION = "Debug Sub-System (DebugSS) driver for Keystone and DRA7xx devices
2LICENSE = "GPL-2.0-only" 2LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://COPYING.txt;md5=9d4316fe434ba450dca4da25348ca5a3" 3LIC_FILES_CHKSUM = "file://COPYING.txt;md5=9d4316fe434ba450dca4da25348ca5a3"
4 4
5# This package builds a kernel module, use kernel PR as base and append a local
6MACHINE_KERNEL_PR:append = "d"
7PR = "${MACHINE_KERNEL_PR}"
8PV:append = "+git" 5PV:append = "+git"
9 6
10S = "${WORKDIR}/git/debugss_module/debugss-mod" 7S = "${WORKDIR}/git/debugss_module/debugss-mod"
diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
index 8bea12f7..d2b5f004 100644
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
@@ -2,9 +2,6 @@ DESCRIPTION = "Interface for GDB to commincate witha TI C66X DSP"
2LICENSE = "GPL-2.0-only" 2LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://COPYING.txt;md5=75859989545e37968a99b631ef42722e" 3LIC_FILES_CHKSUM = "file://COPYING.txt;md5=75859989545e37968a99b631ef42722e"
4 4
5# This package builds a kernel module, use kernel PR as base and append a local
6MACHINE_KERNEL_PR:append = "b"
7PR = "${MACHINE_KERNEL_PR}"
8PV:append = "+git" 5PV:append = "+git"
9 6
10SRC_URI:append = "\ 7SRC_URI:append = "\