summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-ti-bsp/conf/machine/am437x-evm.conf2
-rw-r--r--meta-ti-bsp/conf/machine/include/am65xx.inc2
-rw-r--r--meta-ti-bsp/conf/machine/include/omap-a15.inc2
-rw-r--r--meta-ti-bsp/conf/machine/include/ti33x.inc2
-rw-r--r--meta-ti-bsp/conf/machine/include/ti43x.inc2
-rw-r--r--meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb2
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb4
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb2
-rw-r--r--meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.bb2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb4
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb4
12 files changed, 8 insertions, 22 deletions
diff --git a/meta-ti-bsp/conf/machine/am437x-evm.conf b/meta-ti-bsp/conf/machine/am437x-evm.conf
index 58b7996f..248add70 100644
--- a/meta-ti-bsp/conf/machine/am437x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am437x-evm.conf
@@ -21,7 +21,7 @@ SERIAL_CONSOLES = "115200;ttyS0"
21# UBI: logical eraseblock size: 253952 bytes 21# UBI: logical eraseblock size: 253952 bytes
22# from ubiattach stdout: 22# from ubiattach stdout:
23# UBI device number 0, total 994 LEBs 23# UBI device number 0, total 994 LEBs
24MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 6000" 24MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 8000"
25 25
26# do ubiattach /dev/ubi_ctrl -m 11 -O 4096 26# do ubiattach /dev/ubi_ctrl -m 11 -O 4096
27# from dmesg: 27# from dmesg:
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index 80a7744a..48b89638 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am65xx"
4MACHINE_FEATURES += "screen touchscreen gpu" 4MACHINE_FEATURES += "screen touchscreen gpu"
5 5
6require conf/machine/include/mesa-pvr.inc 6require conf/machine/include/mesa-pvr.inc
7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 7PREFERRED_PROVIDER_virtual/gpudriver ?= ""
8 8
9KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" 9KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
10 10
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index a875713f..9ca41403 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -13,7 +13,7 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
13 13
14# Graphics providers and variables 14# Graphics providers and variables
15require conf/machine/include/mesa-pvr.inc 15require conf/machine/include/mesa-pvr.inc
16PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 16PREFERRED_PROVIDER_virtual/gpudriver ?= ""
17PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" 17PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
18 18
19KERNEL_IMAGETYPE = "zImage" 19KERNEL_IMAGETYPE = "zImage"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index b0ed1c69..6fd65b2d 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -14,7 +14,7 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
14 14
15# Graphics providers and variables 15# Graphics providers and variables
16require conf/machine/include/mesa-pvr.inc 16require conf/machine/include/mesa-pvr.inc
17PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 17PREFERRED_PROVIDER_virtual/gpudriver ?= ""
18PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" 18PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc"
19 19
20KERNEL_IMAGETYPE = "zImage" 20KERNEL_IMAGETYPE = "zImage"
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 17ca5240..0a3ef4c3 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -14,7 +14,7 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
14 14
15# Graphics providers and variables 15# Graphics providers and variables
16require conf/machine/include/mesa-pvr.inc 16require conf/machine/include/mesa-pvr.inc
17PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 17PREFERRED_PROVIDER_virtual/gpudriver ?= ""
18PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" 18PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
19 19
20KERNEL_IMAGETYPE = "zImage" 20KERNEL_IMAGETYPE = "zImage"
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 a1b76d27..fdb8b51d 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
@@ -3,8 +3,6 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver"
3LICENSE = "MIT | GPL-2.0-only" 3LICENSE = "MIT | GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" 4LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2"
5 5
6DEFAULT_PREFERENCE = "-1"
7
8inherit module 6inherit module
9 7
10PROVIDES = "virtual/gpudriver" 8PROVIDES = "virtual/gpudriver"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
index fbf3b416..fa8a790c 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
@@ -1,11 +1,9 @@
1require u-boot-ti.inc 1require u-boot-ti.inc
2 2
3DEFAULT_PREFERENCE = "-1"
4
5include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} 3include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
6 4
7PR = "r0" 5PR = "r0"
8 6
9BRANCH = "ti-u-boot-2024.04" 7BRANCH = "ti-u-boot-2024.04"
10 8
11SRCREV = "243d0c74704df56b1fab4e7989805adb45142070" 9SRCREV = "919b5bb5e9eea5324b6d8b469ae69ff1dae45b75"
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb
index 1e66acd2..a137f452 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb
@@ -2,8 +2,6 @@
2# upstream yet. This allows us to build the shims we need without completely 2# upstream yet. This allows us to build the shims we need without completely
3# clobbering mesa. 3# clobbering mesa.
4 4
5DEFAULT_PREFERENCE = "-1"
6
7require recipes-graphics/mesa/mesa.inc 5require recipes-graphics/mesa/mesa.inc
8 6
9SUMMARY += " (with PowerVR support for TI platforms)" 7SUMMARY += " (with PowerVR support for TI platforms)"
diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.bb
index d43d1635..6d8e65ff 100644
--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.bb
@@ -3,8 +3,6 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs"
3LICENSE = "TI-TFL" 3LICENSE = "TI-TFL"
4LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" 4LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
5 5
6DEFAULT_PREFERENCE = "-1"
7
8inherit bin_package 6inherit bin_package
9 7
10INHIBIT_DEFAULT_DEPS = "" 8INHIBIT_DEFAULT_DEPS = ""
diff --git 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
index 8ea4ca0a..3870f9be 100644
--- 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
@@ -1,7 +1,5 @@
1require linux-ti-staging_6.6.bb 1require linux-ti-staging_6.6.bb
2 2
3DEFAULT_PREFERENCE = "-1"
4
5KERNEL_LOCALVERSION:append = "-rt" 3KERNEL_LOCALVERSION:append = "-rt"
6 4
7# Look in the generic major.minor directory for files 5# Look in the generic major.minor directory for files
@@ -10,7 +8,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
10 8
11BRANCH = "ti-rt-linux-6.6.y" 9BRANCH = "ti-rt-linux-6.6.y"
12 10
13SRCREV = "de1e0f90de78b391c98f02bb8e178e89cb81e1a8" 11SRCREV = "7cceac93947da35755935827cd675925400d0102"
14 12
15include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''} 13include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
16 14
diff --git 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
index 21090904..a17b744b 100644
--- 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
@@ -1,7 +1,5 @@
1require linux-ti-staging_6.6.bb 1require linux-ti-staging_6.6.bb
2 2
3DEFAULT_PREFERENCE = "-1"
4
5# Look in the generic major.minor directory for files 3# Look in the generic major.minor directory for files
6# This will have priority over generic non-rt path 4# This will have priority over generic non-rt path
7FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:" 5FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
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 9a787013..3adf9b7f 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
@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
6inherit ti-secdev 6inherit ti-secdev
7inherit kernel 7inherit kernel
8 8
9DEFAULT_PREFERENCE = "-1"
10
11require recipes-kernel/linux/setup-defconfig.inc 9require recipes-kernel/linux/setup-defconfig.inc
12require recipes-kernel/linux/ti-kernel.inc 10require recipes-kernel/linux/ti-kernel.inc
13include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} 11include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
@@ -25,7 +23,7 @@ S = "${WORKDIR}/git"
25 23
26BRANCH ?= "ti-linux-6.6.y" 24BRANCH ?= "ti-linux-6.6.y"
27 25
28SRCREV ?= "9478b0bdd90a0df151c1cba3c90cab74a8d98009" 26SRCREV ?= "f7f73d9d344c89081db499a2968d9033d7cac45c"
29PV = "6.6.25+git" 27PV = "6.6.25+git"
30 28
31# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild 29# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild