diff options
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 |
24 | MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 6000" | 24 | MKUBIFS_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" | |||
4 | MACHINE_FEATURES += "screen touchscreen gpu" | 4 | MACHINE_FEATURES += "screen touchscreen gpu" |
5 | 5 | ||
6 | require conf/machine/include/mesa-pvr.inc | 6 | require conf/machine/include/mesa-pvr.inc |
7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" | 7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "" |
8 | 8 | ||
9 | KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" | 9 | KERNEL_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 |
15 | require conf/machine/include/mesa-pvr.inc | 15 | require conf/machine/include/mesa-pvr.inc |
16 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" | 16 | PREFERRED_PROVIDER_virtual/gpudriver ?= "" |
17 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" | 17 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" |
18 | 18 | ||
19 | KERNEL_IMAGETYPE = "zImage" | 19 | KERNEL_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 |
16 | require conf/machine/include/mesa-pvr.inc | 16 | require conf/machine/include/mesa-pvr.inc |
17 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" | 17 | PREFERRED_PROVIDER_virtual/gpudriver ?= "" |
18 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" | 18 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" |
19 | 19 | ||
20 | KERNEL_IMAGETYPE = "zImage" | 20 | KERNEL_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 |
16 | require conf/machine/include/mesa-pvr.inc | 16 | require conf/machine/include/mesa-pvr.inc |
17 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" | 17 | PREFERRED_PROVIDER_virtual/gpudriver ?= "" |
18 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" | 18 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" |
19 | 19 | ||
20 | KERNEL_IMAGETYPE = "zImage" | 20 | KERNEL_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" | |||
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 | DEFAULT_PREFERENCE = "-1" | ||
7 | |||
8 | inherit module | 6 | inherit module |
9 | 7 | ||
10 | PROVIDES = "virtual/gpudriver" | 8 | PROVIDES = "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 @@ | |||
1 | require u-boot-ti.inc | 1 | require u-boot-ti.inc |
2 | 2 | ||
3 | DEFAULT_PREFERENCE = "-1" | ||
4 | |||
5 | include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} | 3 | include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} |
6 | 4 | ||
7 | PR = "r0" | 5 | PR = "r0" |
8 | 6 | ||
9 | BRANCH = "ti-u-boot-2024.04" | 7 | BRANCH = "ti-u-boot-2024.04" |
10 | 8 | ||
11 | SRCREV = "243d0c74704df56b1fab4e7989805adb45142070" | 9 | SRCREV = "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 | ||
5 | DEFAULT_PREFERENCE = "-1" | ||
6 | |||
7 | require recipes-graphics/mesa/mesa.inc | 5 | require recipes-graphics/mesa/mesa.inc |
8 | 6 | ||
9 | SUMMARY += " (with PowerVR support for TI platforms)" | 7 | SUMMARY += " (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" | |||
3 | LICENSE = "TI-TFL" | 3 | LICENSE = "TI-TFL" |
4 | LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" | 4 | LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" |
5 | 5 | ||
6 | DEFAULT_PREFERENCE = "-1" | ||
7 | |||
8 | inherit bin_package | 6 | inherit bin_package |
9 | 7 | ||
10 | INHIBIT_DEFAULT_DEPS = "" | 8 | INHIBIT_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 @@ | |||
1 | require linux-ti-staging_6.6.bb | 1 | require linux-ti-staging_6.6.bb |
2 | 2 | ||
3 | DEFAULT_PREFERENCE = "-1" | ||
4 | |||
5 | KERNEL_LOCALVERSION:append = "-rt" | 3 | KERNEL_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 | ||
11 | BRANCH = "ti-rt-linux-6.6.y" | 9 | BRANCH = "ti-rt-linux-6.6.y" |
12 | 10 | ||
13 | SRCREV = "de1e0f90de78b391c98f02bb8e178e89cb81e1a8" | 11 | SRCREV = "7cceac93947da35755935827cd675925400d0102" |
14 | 12 | ||
15 | include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''} | 13 | include ${@ '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 @@ | |||
1 | require linux-ti-staging_6.6.bb | 1 | require linux-ti-staging_6.6.bb |
2 | 2 | ||
3 | DEFAULT_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 |
7 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:" | 5 | FILESEXTRAPATHS: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" | |||
6 | inherit ti-secdev | 6 | inherit ti-secdev |
7 | inherit kernel | 7 | inherit kernel |
8 | 8 | ||
9 | DEFAULT_PREFERENCE = "-1" | ||
10 | |||
11 | require recipes-kernel/linux/setup-defconfig.inc | 9 | require recipes-kernel/linux/setup-defconfig.inc |
12 | require recipes-kernel/linux/ti-kernel.inc | 10 | require recipes-kernel/linux/ti-kernel.inc |
13 | include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} | 11 | include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} |
@@ -25,7 +23,7 @@ S = "${WORKDIR}/git" | |||
25 | 23 | ||
26 | BRANCH ?= "ti-linux-6.6.y" | 24 | BRANCH ?= "ti-linux-6.6.y" |
27 | 25 | ||
28 | SRCREV ?= "9478b0bdd90a0df151c1cba3c90cab74a8d98009" | 26 | SRCREV ?= "f7f73d9d344c89081db499a2968d9033d7cac45c" |
29 | PV = "6.6.25+git" | 27 | PV = "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 |