diff options
67 files changed, 135 insertions, 1211 deletions
diff --git a/meta-beagle/conf/machine/beagle-x15.conf b/meta-beagle/conf/machine/beagle-x15.conf index 8ad028f4..60cb2183 100644 --- a/meta-beagle/conf/machine/beagle-x15.conf +++ b/meta-beagle/conf/machine/beagle-x15.conf | |||
@@ -5,21 +5,17 @@ | |||
5 | require conf/machine/include/am57xx.inc | 5 | require conf/machine/include/am57xx.inc |
6 | require conf/machine/include/beagle-bsp.inc | 6 | require conf/machine/include/beagle-bsp.inc |
7 | 7 | ||
8 | DT_VENDOR_PREFIX = "ti/omap/" | ||
9 | DT_VENDOR_PREFIX:bsp-ti-6_1 = "" | ||
10 | DT_VENDOR_PREFIX:bsp-bb_org-6_1 = "" | ||
11 | |||
12 | KERNEL_DEVICETREE_PREFIX = " \ | 8 | KERNEL_DEVICETREE_PREFIX = " \ |
13 | ${DT_VENDOR_PREFIX}am57xx-beagle-x15 \ | 9 | ti/omap/am57xx-beagle-x15 \ |
14 | ${DT_VENDOR_PREFIX}am57xx-idk-lcd \ | 10 | ti/omap/am57xx-idk-lcd \ |
15 | " | 11 | " |
16 | 12 | ||
17 | KERNEL_DEVICETREE = " \ | 13 | KERNEL_DEVICETREE = " \ |
18 | ${DT_VENDOR_PREFIX}am57xx-beagle-x15.dtb \ | 14 | ti/omap/am57xx-beagle-x15.dtb \ |
19 | ${DT_VENDOR_PREFIX}am57xx-beagle-x15-revb1.dtb \ | 15 | ti/omap/am57xx-beagle-x15-revb1.dtb \ |
20 | ${DT_VENDOR_PREFIX}am57xx-beagle-x15-revc.dtb \ | 16 | ti/omap/am57xx-beagle-x15-revc.dtb \ |
21 | ${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2045.dtbo \ | 17 | ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \ |
22 | ${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2587.dtbo \ | 18 | ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \ |
23 | " | 19 | " |
24 | 20 | ||
25 | MACHINE_GUI_CLASS = "bigscreen" | 21 | MACHINE_GUI_CLASS = "bigscreen" |
diff --git a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf index 4574f82b..1bdfd7a1 100644 --- a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf +++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf | |||
@@ -16,9 +16,3 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" | |||
16 | UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" | 16 | UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" |
17 | 17 | ||
18 | UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig" | 18 | UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig" |
19 | |||
20 | UBOOT_MACHINE:bsp-ti-6_1 = "j721e_evm_r5_defconfig" | ||
21 | UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config" | ||
22 | |||
23 | UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_r5_defconfig" | ||
24 | UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_r5.config" | ||
diff --git a/meta-beagle/conf/machine/beaglebone-ai64.conf b/meta-beagle/conf/machine/beaglebone-ai64.conf index c7d72590..0f15c712 100644 --- a/meta-beagle/conf/machine/beaglebone-ai64.conf +++ b/meta-beagle/conf/machine/beaglebone-ai64.conf | |||
@@ -12,12 +12,6 @@ IMAGE_SR2_HS_SE_FILES = "" | |||
12 | 12 | ||
13 | UBOOT_MACHINE = "j721e_beagleboneai64_a72_defconfig" | 13 | UBOOT_MACHINE = "j721e_beagleboneai64_a72_defconfig" |
14 | 14 | ||
15 | UBOOT_MACHINE:bsp-ti-6_1 = "j721e_evm_a72_config" | ||
16 | UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config" | ||
17 | |||
18 | UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_a72_config" | ||
19 | UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_a72.config" | ||
20 | |||
21 | SPL_BINARY = "tispl.bin_unsigned" | 15 | SPL_BINARY = "tispl.bin_unsigned" |
22 | 16 | ||
23 | KERNEL_DEVICETREE_PREFIX = " \ | 17 | KERNEL_DEVICETREE_PREFIX = " \ |
@@ -32,23 +26,9 @@ ti/k3-j721e-evm-quad-port-eth-exp.dtbo \ | |||
32 | ti/k3-j721e-sk.dtb \ | 26 | ti/k3-j721e-sk.dtb \ |
33 | " | 27 | " |
34 | 28 | ||
35 | KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \ | ||
36 | ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \ | ||
37 | ti/k3-j721e-common-proc-board-infotainment.dtbo \ | ||
38 | ti/k3-j721e-evm-csi2-ov5640.dtbo \ | ||
39 | ti/k3-j721e-evm-fusion.dtbo \ | ||
40 | ti/k3-j721e-evm-pcie0-ep.dtbo \ | ||
41 | ti/k3-j721e-evm-virt-mac-client.dtbo \ | ||
42 | ti/k3-j721e-sk-csi2-ov5640.dtbo \ | ||
43 | ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \ | ||
44 | ti/k3-j721e-sk-fusion.dtbo \ | ||
45 | ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \ | ||
46 | " | ||
47 | |||
48 | MACHINE_GUI_CLASS = "bigscreen" | 29 | MACHINE_GUI_CLASS = "bigscreen" |
49 | 30 | ||
50 | # TI has moved a driver out of its kernel tree and into an out of tree module. | 31 | # TI has moved a driver out of its kernel tree and into an out of tree module. |
51 | # We need to not include that for older kernels since the module is still in | 32 | # We need to not include that for older kernels since the module is still in |
52 | # the kernel. | 33 | # the kernel. |
53 | TI_VXE_VXD_DRIVER:bsp-bb_org-6_6 = "" | 34 | TI_VXE_VXD_DRIVER:bsp-bb_org-6_6 = "" |
54 | TI_VXE_VXD_DRIVER:bsp-bb_org-6_1 = "" | ||
diff --git a/meta-beagle/conf/machine/beaglebone.conf b/meta-beagle/conf/machine/beaglebone.conf index 456da618..63e52914 100644 --- a/meta-beagle/conf/machine/beaglebone.conf +++ b/meta-beagle/conf/machine/beaglebone.conf | |||
@@ -5,27 +5,23 @@ | |||
5 | require conf/machine/include/ti33x.inc | 5 | require conf/machine/include/ti33x.inc |
6 | require conf/machine/include/beagle-bsp.inc | 6 | require conf/machine/include/beagle-bsp.inc |
7 | 7 | ||
8 | DT_VENDOR_PREFIX = "ti/omap/" | ||
9 | DT_VENDOR_PREFIX:bsp-ti-6_1 = "" | ||
10 | DT_VENDOR_PREFIX:bsp-bb_org-6_1 = "" | ||
11 | |||
12 | KERNEL_DEVICETREE_PREFIX = " \ | 8 | KERNEL_DEVICETREE_PREFIX = " \ |
13 | ${DT_VENDOR_PREFIX}am335x-bone \ | 9 | ti/omap/am335x-bone \ |
14 | ${DT_VENDOR_PREFIX}am335x-pocketbeagle \ | 10 | ti/omap/am335x-pocketbeagle \ |
15 | ${DT_VENDOR_PREFIX}am335x-sancloud-bbe \ | 11 | ti/omap/am335x-sancloud-bbe \ |
16 | " | 12 | " |
17 | 13 | ||
18 | KERNEL_DEVICETREE = " \ | 14 | KERNEL_DEVICETREE = " \ |
19 | ${DT_VENDOR_PREFIX}am335x-bone.dtb \ | 15 | ti/omap/am335x-bone.dtb \ |
20 | ${DT_VENDOR_PREFIX}am335x-boneblack.dtb \ | 16 | ti/omap/am335x-boneblack.dtb \ |
21 | ${DT_VENDOR_PREFIX}am335x-boneblack-wireless.dtb \ | 17 | ti/omap/am335x-boneblack-wireless.dtb \ |
22 | ${DT_VENDOR_PREFIX}am335x-boneblue.dtb \ | 18 | ti/omap/am335x-boneblue.dtb \ |
23 | ${DT_VENDOR_PREFIX}am335x-bonegreen.dtb \ | 19 | ti/omap/am335x-bonegreen.dtb \ |
24 | ${DT_VENDOR_PREFIX}am335x-bonegreen-wireless.dtb \ | 20 | ti/omap/am335x-bonegreen-wireless.dtb \ |
25 | ${DT_VENDOR_PREFIX}am335x-pocketbeagle.dtb \ | 21 | ti/omap/am335x-pocketbeagle.dtb \ |
26 | ${DT_VENDOR_PREFIX}am335x-sancloud-bbe.dtb \ | 22 | ti/omap/am335x-sancloud-bbe.dtb \ |
27 | ${DT_VENDOR_PREFIX}am335x-sancloud-bbe-extended-wifi.dtb \ | 23 | ti/omap/am335x-sancloud-bbe-extended-wifi.dtb \ |
28 | ${DT_VENDOR_PREFIX}am335x-sancloud-bbe-lite.dtb \ | 24 | ti/omap/am335x-sancloud-bbe-lite.dtb \ |
29 | " | 25 | " |
30 | 26 | ||
31 | MACHINE_GUI_CLASS = "bigscreen" | 27 | MACHINE_GUI_CLASS = "bigscreen" |
diff --git a/meta-beagle/conf/machine/beagleplay-k3r5.conf b/meta-beagle/conf/machine/beagleplay-k3r5.conf index f053c11e..ea4c5160 100644 --- a/meta-beagle/conf/machine/beagleplay-k3r5.conf +++ b/meta-beagle/conf/machine/beagleplay-k3r5.conf | |||
@@ -5,7 +5,3 @@ | |||
5 | require conf/machine/beagleplay-ti-k3r5.conf | 5 | require conf/machine/beagleplay-ti-k3r5.conf |
6 | 6 | ||
7 | require conf/machine/include/beagle-bsp.inc | 7 | require conf/machine/include/beagle-bsp.inc |
8 | |||
9 | UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_r5_defconfig" | ||
10 | |||
11 | UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_r5.config" | ||
diff --git a/meta-beagle/conf/machine/beagleplay.conf b/meta-beagle/conf/machine/beagleplay.conf index bc0de3f0..87d4942e 100644 --- a/meta-beagle/conf/machine/beagleplay.conf +++ b/meta-beagle/conf/machine/beagleplay.conf | |||
@@ -6,47 +6,6 @@ require conf/machine/beagleplay-ti.conf | |||
6 | 6 | ||
7 | require conf/machine/include/beagle-bsp.inc | 7 | require conf/machine/include/beagle-bsp.inc |
8 | 8 | ||
9 | UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_a53_defconfig" | ||
10 | |||
11 | UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_a53.config" | ||
12 | |||
13 | KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \ | ||
14 | ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ | ||
15 | ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ | ||
16 | ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \ | ||
17 | ti/k3-am625-beaglemod.dtb \ | ||
18 | ti/k3-am625-beaglemod-audio.dtbo \ | ||
19 | ti/k3-am625-beaglemod-can0.dtbo \ | ||
20 | ti/k3-am625-beaglemod-can1.dtbo \ | ||
21 | ti/k3-am625-beaglemod-csi0-ov5640.dtbo \ | ||
22 | ti/k3-am625-beaglemod-eeprom.dtbo \ | ||
23 | ti/k3-am625-beaglemod-eth.dtbo \ | ||
24 | ti/k3-am625-beaglemod-hdmi.dtbo \ | ||
25 | ti/k3-am625-beaglemod-io-expand.dtbo \ | ||
26 | ti/k3-am625-beaglemod-lt-lcd185.dtbo \ | ||
27 | ti/k3-am625-beaglemod-ospi-flash.dtbo \ | ||
28 | ti/k3-am625-beaglemod-rs485-1.dtbo \ | ||
29 | ti/k3-am625-beaglemod-rs485-2.dtbo \ | ||
30 | ti/k3-am625-beaglemod-rtc.dtbo \ | ||
31 | ti/k3-am625-beaglemod-wl1835.dtbo \ | ||
32 | ti/k3-am625-sk-dmtimer-pwm.dtbo \ | ||
33 | ti/k3-am625-sk-ecap-capture.dtbo \ | ||
34 | ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \ | ||
35 | ti/k3-am625-sk-mcspi-loopback.dtbo \ | ||
36 | ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \ | ||
37 | ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \ | ||
38 | ti/k3-am625-sk-pwm.dtbo \ | ||
39 | ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \ | ||
40 | ti/k3-am62x-sk-csi2-imx219.dtbo \ | ||
41 | ti/k3-am62x-sk-csi2-ov5640.dtbo \ | ||
42 | ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \ | ||
43 | ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \ | ||
44 | ti/k3-am62x-sk-eqep.dtbo \ | ||
45 | ti/k3-am62x-sk-hdmi-disable-fastboot.dtbo \ | ||
46 | ti/k3-am62x-sk-lpm-wkup-sources.dtbo \ | ||
47 | ti/k3-am62x-sk-mcan.dtbo \ | ||
48 | " | ||
49 | |||
50 | KERNEL_DEVICETREE:append:bsp-bb_org-6_6 = " \ | 9 | KERNEL_DEVICETREE:append:bsp-bb_org-6_6 = " \ |
51 | ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ | 10 | ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ |
52 | ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ | 11 | ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ |
diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf index 8d5111f0..07198f2e 100644 --- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf +++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf | |||
@@ -11,5 +11,3 @@ SYSFW_SUFFIX = "hs-fs" | |||
11 | 11 | ||
12 | UBOOT_MACHINE = "j722s_evm_r5_defconfig" | 12 | UBOOT_MACHINE = "j722s_evm_r5_defconfig" |
13 | UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_r5_defconfig" | 13 | UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_r5_defconfig" |
14 | |||
15 | UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_r5.config" | ||
diff --git a/meta-beagle/conf/machine/beagley-ai.conf b/meta-beagle/conf/machine/beagley-ai.conf index 497001ee..9e9e33b6 100644 --- a/meta-beagle/conf/machine/beagley-ai.conf +++ b/meta-beagle/conf/machine/beagley-ai.conf | |||
@@ -8,19 +8,12 @@ require conf/machine/include/beagle-bsp.inc | |||
8 | UBOOT_MACHINE = "j722s_evm_a53_config" | 8 | UBOOT_MACHINE = "j722s_evm_a53_config" |
9 | UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_a53_defconfig" | 9 | UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_a53_defconfig" |
10 | 10 | ||
11 | UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_a53.config" | ||
12 | |||
13 | KERNEL_DEVICETREE_PREFIX = " \ | 11 | KERNEL_DEVICETREE_PREFIX = " \ |
14 | ti/k3-j722s \ | 12 | ti/k3-j722s \ |
15 | " | 13 | " |
16 | 14 | ||
17 | KERNEL_DEVICETREE = "" | 15 | KERNEL_DEVICETREE = "" |
18 | 16 | ||
19 | KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \ | ||
20 | ti/k3-j722s-evm.dtb \ | ||
21 | ti/k3-am67a-beagley-ai.dtb \ | ||
22 | " | ||
23 | |||
24 | KERNEL_DEVICETREE:append:bsp-bb_org-6_12 = " \ | 17 | KERNEL_DEVICETREE:append:bsp-bb_org-6_12 = " \ |
25 | ti/k3-j722s-evm.dtb \ | 18 | ti/k3-j722s-evm.dtb \ |
26 | ti/k3-am67a-beagley-ai.dtb \ | 19 | ti/k3-am67a-beagley-ai.dtb \ |
diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc index af8e4b01..d180c297 100644 --- a/meta-beagle/conf/machine/include/beagle-bsp.inc +++ b/meta-beagle/conf/machine/include/beagle-bsp.inc | |||
@@ -4,12 +4,12 @@ | |||
4 | # Default is bb_org-6_12, but can override with any of the existing options | 4 | # Default is bb_org-6_12, but can override with any of the existing options |
5 | TI_PREFERRED_BSP ?= "bb_org-6_12" | 5 | TI_PREFERRED_BSP ?= "bb_org-6_12" |
6 | 6 | ||
7 | # ========== | 7 | # =========== |
8 | # bb_org-6_12 | 8 | # bb_org-6_12 |
9 | # BeagleBoard.org kernel 6.12, Upstream u-boot 2025.04 | 9 | # BeagleBoard.org kernel 6.12, u-boot 2025.04 |
10 | # based on TI staging trees with extra Beagle-specific features | 10 | # based on TI staging trees with extra Beagle-specific features |
11 | # but may not be up-to-date with TI version | 11 | # but may not be up-to-date with TI version |
12 | # ========== | 12 | # =========== |
13 | BSP_KERNEL_PROVIDER:bsp-bb_org-6_12 = "linux-bb.org" | 13 | BSP_KERNEL_PROVIDER:bsp-bb_org-6_12 = "linux-bb.org" |
14 | BSP_KERNEL_VERSION:bsp-bb_org-6_12 = "6.12.%" | 14 | BSP_KERNEL_VERSION:bsp-bb_org-6_12 = "6.12.%" |
15 | BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_12 = "u-boot-bb.org" | 15 | BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_12 = "u-boot-bb.org" |
@@ -24,12 +24,12 @@ BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "24%" | |||
24 | BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_12 = "24%" | 24 | BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_12 = "24%" |
25 | BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%" | 25 | BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%" |
26 | 26 | ||
27 | # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6 | 27 | # GC320 support requires out-of-tree drivers not yet available in bb.org 6.12 |
28 | MACHINE_FEATURES:remove:bsp-bb_org-6_12 = "gc320" | 28 | MACHINE_FEATURES:remove:bsp-bb_org-6_12 = "gc320" |
29 | 29 | ||
30 | # ========== | 30 | # ========== |
31 | # bb_org-6_6 | 31 | # bb_org-6_6 |
32 | # BeagleBoard.org kernel 6.6, Upstream u-boot 2024.07 | 32 | # BeagleBoard.org kernel 6.6, u-boot 2024.10 |
33 | # based on TI staging trees with extra Beagle-specific features | 33 | # based on TI staging trees with extra Beagle-specific features |
34 | # but may not be up-to-date with TI version | 34 | # but may not be up-to-date with TI version |
35 | # ========== | 35 | # ========== |
@@ -49,26 +49,3 @@ BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%" | |||
49 | 49 | ||
50 | # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6 | 50 | # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6 |
51 | MACHINE_FEATURES:remove:bsp-bb_org-6_6 = "gc320" | 51 | MACHINE_FEATURES:remove:bsp-bb_org-6_6 = "gc320" |
52 | |||
53 | # ========== | ||
54 | # bb_org-6_1 | ||
55 | # BeagleBoard.org kernel 6.1, u-boot 2023.04 | ||
56 | # based on TI staging trees with extra Beagle-specific features | ||
57 | # but may not be up-to-date with TI version | ||
58 | # ========== | ||
59 | BSP_KERNEL_PROVIDER:bsp-bb_org-6_1 = "linux-bb.org" | ||
60 | BSP_KERNEL_VERSION:bsp-bb_org-6_1 = "6.1.%" | ||
61 | BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_1 = "u-boot-bb.org" | ||
62 | BSP_BOOTLOADER_VERSION:bsp-bb_org-6_1 = "2023.%" | ||
63 | KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_1 = "" | ||
64 | |||
65 | BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-sgx-ddk-km" | ||
66 | BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_1 = "1.17%" | ||
67 | BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_1 = "1.17%" | ||
68 | BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-img-rogue-driver" | ||
69 | BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_1 = "23%" | ||
70 | BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_1 = "23%" | ||
71 | BSP_MESA_PVR_VERSION:bsp-bb_org-6_1 = "22%" | ||
72 | |||
73 | # GC320 support requires out-of-tree drivers not yet available in bb.org 6.1 | ||
74 | MACHINE_FEATURES:remove:bsp-bb_org-6_1 = "gc320" | ||
diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb deleted file mode 100644 index fb7b0c18..00000000 --- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | require recipes-bsp/u-boot/u-boot-ti.inc | ||
2 | |||
3 | SUMMARY = "BeagleBoard.org U-Boot" | ||
4 | |||
5 | COMPATIBLE_MACHINE = "beagle.*" | ||
6 | |||
7 | PV = "2023.04" | ||
8 | |||
9 | SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch" | ||
10 | |||
11 | UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git" | ||
12 | UBOOT_GIT_PROTOCOL = "https" | ||
13 | BRANCH = "v2023.04-ti-09.01.00.008" | ||
14 | SRCREV = "b0d717b732ee28e446baf94522b3491e590f7fbb" | ||
15 | |||
16 | BRANCH:beagleplay = "v2023.04-ti-09.01.00.008-BeaglePlay" | ||
17 | BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay" | ||
18 | SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" | ||
19 | SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" | ||
20 | |||
21 | BRANCH:beagley-ai = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production" | ||
22 | BRANCH:beagley-ai-k3r5 = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production" | ||
23 | SRCREV:beagley-ai = "93735daa6fe024304934d5a5e93ab05a06abf1a8" | ||
24 | SRCREV:beagley-ai-k3r5 = "93735daa6fe024304934d5a5e93ab05a06abf1a8" | ||
diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig deleted file mode 100644 index a5de2e24..00000000 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | use-kernel-config=bb.org_defconfig | ||
diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb deleted file mode 100644 index 320ee60b..00000000 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | # Look in the generic major.minor directory for files | ||
2 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" | ||
3 | |||
4 | SECTION = "kernel" | ||
5 | SUMMARY = "BeagleBoard.org Linux kernel" | ||
6 | LICENSE = "GPL-2.0-only" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | ||
8 | |||
9 | COMPATIBLE_MACHINE = "beagle.*" | ||
10 | |||
11 | inherit kernel | ||
12 | |||
13 | require recipes-kernel/linux/setup-defconfig.inc | ||
14 | require recipes-kernel/linux/ti-kernel.inc | ||
15 | |||
16 | DEPENDS += "gmp-native libmpc-native" | ||
17 | |||
18 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" | ||
19 | |||
20 | # Extra DT overlays/capes | ||
21 | KERNEL_DEVICETREE:append:armv7a = " \ | ||
22 | AM335X-PRU-UIO-00A0.dtbo \ | ||
23 | BB-ADC-00A0.dtbo \ | ||
24 | BB-BBBW-WL1835-00A0.dtbo \ | ||
25 | BB-BBGG-WL1835-00A0.dtbo \ | ||
26 | BB-BBGW-WL1835-00A0.dtbo \ | ||
27 | BB-BONE-4D5R-01-00A1.dtbo \ | ||
28 | BB-BONE-eMMC1-01-00A0.dtbo \ | ||
29 | BB-BONE-LCD4-01-00A1.dtbo \ | ||
30 | BB-BONE-NH7C-01-A0.dtbo \ | ||
31 | BB-CAPE-DISP-CT4-00A0.dtbo \ | ||
32 | BB-HDMI-TDA998x-00A0.dtbo \ | ||
33 | BB-I2C1-MCP7940X-00A0.dtbo \ | ||
34 | BB-I2C1-RTC-DS3231.dtbo \ | ||
35 | BB-I2C1-RTC-PCF8563.dtbo \ | ||
36 | BB-I2C2-BME680.dtbo \ | ||
37 | BB-I2C2-MPU6050.dtbo \ | ||
38 | BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ | ||
39 | BB-NHDMI-TDA998x-00A0.dtbo \ | ||
40 | BBORG_COMMS-00A2.dtbo \ | ||
41 | BBORG_FAN-A000.dtbo \ | ||
42 | BBORG_RELAY-00A2.dtbo \ | ||
43 | BB-SPIDEV0-00A0.dtbo \ | ||
44 | BB-SPIDEV1-00A0.dtbo \ | ||
45 | BB-UART1-00A0.dtbo \ | ||
46 | BB-UART2-00A0.dtbo \ | ||
47 | BB-UART4-00A0.dtbo \ | ||
48 | BB-W1-P9.12-00A0.dtbo \ | ||
49 | BONE-ADC.dtbo \ | ||
50 | M-BB-BBG-00A0.dtbo \ | ||
51 | M-BB-BBGG-00A0.dtbo \ | ||
52 | PB-MIKROBUS-0.dtbo \ | ||
53 | PB-MIKROBUS-1.dtbo \ | ||
54 | " | ||
55 | |||
56 | S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" | ||
57 | |||
58 | # 6.1.83 version for 32-bit | ||
59 | SRCREV:armv7a = "be9b910b08dfd674e47a2643f35080b005ac3792" | ||
60 | PV:armv7a = "6.1.83+git" | ||
61 | BRANCH:armv7a = "v6.1.83-ti-r35" | ||
62 | |||
63 | # 6.1.83 version for 64-bit | ||
64 | SRCREV:aarch64 = "135558243d5a98ed39812b797d2ba6295ef3b86a" | ||
65 | PV:aarch64 = "6.1.83+git" | ||
66 | BRANCH:aarch64 = "v6.1.83-ti-arm64-r64" | ||
67 | |||
68 | KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git" | ||
69 | |||
70 | INSANE_SKIP:kernel-modules += "debug-deps" | ||
diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb index b7e609e6..625a4a39 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb | |||
@@ -19,38 +19,38 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" | |||
19 | 19 | ||
20 | # Extra DT overlays/capes | 20 | # Extra DT overlays/capes |
21 | KERNEL_DEVICETREE:append:armv7a = " \ | 21 | KERNEL_DEVICETREE:append:armv7a = " \ |
22 | ${DT_VENDOR_PREFIX}AM335X-PRU-UIO-00A0.dtbo \ | 22 | ti/omap/AM335X-PRU-UIO-00A0.dtbo \ |
23 | ${DT_VENDOR_PREFIX}BB-ADC-00A0.dtbo \ | 23 | ti/omap/BB-ADC-00A0.dtbo \ |
24 | ${DT_VENDOR_PREFIX}BB-BBBW-WL1835-00A0.dtbo \ | 24 | ti/omap/BB-BBBW-WL1835-00A0.dtbo \ |
25 | ${DT_VENDOR_PREFIX}BB-BBGG-WL1835-00A0.dtbo \ | 25 | ti/omap/BB-BBGG-WL1835-00A0.dtbo \ |
26 | ${DT_VENDOR_PREFIX}BB-BBGW-WL1835-00A0.dtbo \ | 26 | ti/omap/BB-BBGW-WL1835-00A0.dtbo \ |
27 | ${DT_VENDOR_PREFIX}BB-BONE-4D5R-01-00A1.dtbo \ | 27 | ti/omap/BB-BONE-4D5R-01-00A1.dtbo \ |
28 | ${DT_VENDOR_PREFIX}BB-BONE-eMMC1-01-00A0.dtbo \ | 28 | ti/omap/BB-BONE-eMMC1-01-00A0.dtbo \ |
29 | ${DT_VENDOR_PREFIX}BB-BONE-LCD4-01-00A1.dtbo \ | 29 | ti/omap/BB-BONE-LCD4-01-00A1.dtbo \ |
30 | ${DT_VENDOR_PREFIX}BB-BONE-NH7C-01-A0.dtbo \ | 30 | ti/omap/BB-BONE-NH7C-01-A0.dtbo \ |
31 | ${DT_VENDOR_PREFIX}BB-CAPE-DISP-CT4-00A0.dtbo \ | 31 | ti/omap/BB-CAPE-DISP-CT4-00A0.dtbo \ |
32 | ${DT_VENDOR_PREFIX}BB-HDMI-TDA998x-00A0.dtbo \ | 32 | ti/omap/BB-HDMI-TDA998x-00A0.dtbo \ |
33 | ${DT_VENDOR_PREFIX}BB-I2C1-MCP7940X-00A0.dtbo \ | 33 | ti/omap/BB-I2C1-MCP7940X-00A0.dtbo \ |
34 | ${DT_VENDOR_PREFIX}BB-I2C1-RTC-DS3231.dtbo \ | 34 | ti/omap/BB-I2C1-RTC-DS3231.dtbo \ |
35 | ${DT_VENDOR_PREFIX}BB-I2C1-RTC-PCF8563.dtbo \ | 35 | ti/omap/BB-I2C1-RTC-PCF8563.dtbo \ |
36 | ${DT_VENDOR_PREFIX}BB-I2C2-BME680.dtbo \ | 36 | ti/omap/BB-I2C2-BME680.dtbo \ |
37 | ${DT_VENDOR_PREFIX}BB-I2C2-MPU6050.dtbo \ | 37 | ti/omap/BB-I2C2-MPU6050.dtbo \ |
38 | ${DT_VENDOR_PREFIX}BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ | 38 | ti/omap/BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ |
39 | ${DT_VENDOR_PREFIX}BB-NHDMI-TDA998x-00A0.dtbo \ | 39 | ti/omap/BB-NHDMI-TDA998x-00A0.dtbo \ |
40 | ${DT_VENDOR_PREFIX}BBORG_COMMS-00A2.dtbo \ | 40 | ti/omap/BBORG_COMMS-00A2.dtbo \ |
41 | ${DT_VENDOR_PREFIX}BBORG_FAN-A000.dtbo \ | 41 | ti/omap/BBORG_FAN-A000.dtbo \ |
42 | ${DT_VENDOR_PREFIX}BBORG_RELAY-00A2.dtbo \ | 42 | ti/omap/BBORG_RELAY-00A2.dtbo \ |
43 | ${DT_VENDOR_PREFIX}BB-SPIDEV0-00A0.dtbo \ | 43 | ti/omap/BB-SPIDEV0-00A0.dtbo \ |
44 | ${DT_VENDOR_PREFIX}BB-SPIDEV1-00A0.dtbo \ | 44 | ti/omap/BB-SPIDEV1-00A0.dtbo \ |
45 | ${DT_VENDOR_PREFIX}BB-UART1-00A0.dtbo \ | 45 | ti/omap/BB-UART1-00A0.dtbo \ |
46 | ${DT_VENDOR_PREFIX}BB-UART2-00A0.dtbo \ | 46 | ti/omap/BB-UART2-00A0.dtbo \ |
47 | ${DT_VENDOR_PREFIX}BB-UART4-00A0.dtbo \ | 47 | ti/omap/BB-UART4-00A0.dtbo \ |
48 | ${DT_VENDOR_PREFIX}BB-W1-P9.12-00A0.dtbo \ | 48 | ti/omap/BB-W1-P9.12-00A0.dtbo \ |
49 | ${DT_VENDOR_PREFIX}BONE-ADC.dtbo \ | 49 | ti/omap/BONE-ADC.dtbo \ |
50 | ${DT_VENDOR_PREFIX}M-BB-BBG-00A0.dtbo \ | 50 | ti/omap/M-BB-BBG-00A0.dtbo \ |
51 | ${DT_VENDOR_PREFIX}M-BB-BBGG-00A0.dtbo \ | 51 | ti/omap/M-BB-BBGG-00A0.dtbo \ |
52 | ${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \ | 52 | ti/omap/PB-MIKROBUS-0.dtbo \ |
53 | ${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \ | 53 | ti/omap/PB-MIKROBUS-1.dtbo \ |
54 | " | 54 | " |
55 | 55 | ||
56 | S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" | 56 | S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" |
diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb index 6a1f7868..a6098712 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb | |||
@@ -19,38 +19,38 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" | |||
19 | 19 | ||
20 | # Extra DT overlays/capes | 20 | # Extra DT overlays/capes |
21 | KERNEL_DEVICETREE:append:armv7a = " \ | 21 | KERNEL_DEVICETREE:append:armv7a = " \ |
22 | ${DT_VENDOR_PREFIX}AM335X-PRU-UIO-00A0.dtbo \ | 22 | ti/omap/AM335X-PRU-UIO-00A0.dtbo \ |
23 | ${DT_VENDOR_PREFIX}BB-ADC-00A0.dtbo \ | 23 | ti/omap/BB-ADC-00A0.dtbo \ |
24 | ${DT_VENDOR_PREFIX}BB-BBBW-WL1835-00A0.dtbo \ | 24 | ti/omap/BB-BBBW-WL1835-00A0.dtbo \ |
25 | ${DT_VENDOR_PREFIX}BB-BBGG-WL1835-00A0.dtbo \ | 25 | ti/omap/BB-BBGG-WL1835-00A0.dtbo \ |
26 | ${DT_VENDOR_PREFIX}BB-BBGW-WL1835-00A0.dtbo \ | 26 | ti/omap/BB-BBGW-WL1835-00A0.dtbo \ |
27 | ${DT_VENDOR_PREFIX}BB-BONE-4D5R-01-00A1.dtbo \ | 27 | ti/omap/BB-BONE-4D5R-01-00A1.dtbo \ |
28 | ${DT_VENDOR_PREFIX}BB-BONE-eMMC1-01-00A0.dtbo \ | 28 | ti/omap/BB-BONE-eMMC1-01-00A0.dtbo \ |
29 | ${DT_VENDOR_PREFIX}BB-BONE-LCD4-01-00A1.dtbo \ | 29 | ti/omap/BB-BONE-LCD4-01-00A1.dtbo \ |
30 | ${DT_VENDOR_PREFIX}BB-BONE-NH7C-01-A0.dtbo \ | 30 | ti/omap/BB-BONE-NH7C-01-A0.dtbo \ |
31 | ${DT_VENDOR_PREFIX}BB-CAPE-DISP-CT4-00A0.dtbo \ | 31 | ti/omap/BB-CAPE-DISP-CT4-00A0.dtbo \ |
32 | ${DT_VENDOR_PREFIX}BB-HDMI-TDA998x-00A0.dtbo \ | 32 | ti/omap/BB-HDMI-TDA998x-00A0.dtbo \ |
33 | ${DT_VENDOR_PREFIX}BB-I2C1-MCP7940X-00A0.dtbo \ | 33 | ti/omap/BB-I2C1-MCP7940X-00A0.dtbo \ |
34 | ${DT_VENDOR_PREFIX}BB-I2C1-RTC-DS3231.dtbo \ | 34 | ti/omap/BB-I2C1-RTC-DS3231.dtbo \ |
35 | ${DT_VENDOR_PREFIX}BB-I2C1-RTC-PCF8563.dtbo \ | 35 | ti/omap/BB-I2C1-RTC-PCF8563.dtbo \ |
36 | ${DT_VENDOR_PREFIX}BB-I2C2-BME680.dtbo \ | 36 | ti/omap/BB-I2C2-BME680.dtbo \ |
37 | ${DT_VENDOR_PREFIX}BB-I2C2-MPU6050.dtbo \ | 37 | ti/omap/BB-I2C2-MPU6050.dtbo \ |
38 | ${DT_VENDOR_PREFIX}BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ | 38 | ti/omap/BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ |
39 | ${DT_VENDOR_PREFIX}BB-NHDMI-TDA998x-00A0.dtbo \ | 39 | ti/omap/BB-NHDMI-TDA998x-00A0.dtbo \ |
40 | ${DT_VENDOR_PREFIX}BBORG_COMMS-00A2.dtbo \ | 40 | ti/omap/BBORG_COMMS-00A2.dtbo \ |
41 | ${DT_VENDOR_PREFIX}BBORG_FAN-A000.dtbo \ | 41 | ti/omap/BBORG_FAN-A000.dtbo \ |
42 | ${DT_VENDOR_PREFIX}BBORG_RELAY-00A2.dtbo \ | 42 | ti/omap/BBORG_RELAY-00A2.dtbo \ |
43 | ${DT_VENDOR_PREFIX}BB-SPIDEV0-00A0.dtbo \ | 43 | ti/omap/BB-SPIDEV0-00A0.dtbo \ |
44 | ${DT_VENDOR_PREFIX}BB-SPIDEV1-00A0.dtbo \ | 44 | ti/omap/BB-SPIDEV1-00A0.dtbo \ |
45 | ${DT_VENDOR_PREFIX}BB-UART1-00A0.dtbo \ | 45 | ti/omap/BB-UART1-00A0.dtbo \ |
46 | ${DT_VENDOR_PREFIX}BB-UART2-00A0.dtbo \ | 46 | ti/omap/BB-UART2-00A0.dtbo \ |
47 | ${DT_VENDOR_PREFIX}BB-UART4-00A0.dtbo \ | 47 | ti/omap/BB-UART4-00A0.dtbo \ |
48 | ${DT_VENDOR_PREFIX}BB-W1-P9.12-00A0.dtbo \ | 48 | ti/omap/BB-W1-P9.12-00A0.dtbo \ |
49 | ${DT_VENDOR_PREFIX}BONE-ADC.dtbo \ | 49 | ti/omap/BONE-ADC.dtbo \ |
50 | ${DT_VENDOR_PREFIX}M-BB-BBG-00A0.dtbo \ | 50 | ti/omap/M-BB-BBG-00A0.dtbo \ |
51 | ${DT_VENDOR_PREFIX}M-BB-BBGG-00A0.dtbo \ | 51 | ti/omap/M-BB-BBGG-00A0.dtbo \ |
52 | ${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \ | 52 | ti/omap/PB-MIKROBUS-0.dtbo \ |
53 | ${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \ | 53 | ti/omap/PB-MIKROBUS-1.dtbo \ |
54 | " | 54 | " |
55 | 55 | ||
56 | S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" | 56 | S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" |
diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf index f7835459..10067159 100644 --- a/meta-ti-bsp/conf/layer.conf +++ b/meta-ti-bsp/conf/layer.conf | |||
@@ -25,6 +25,7 @@ LAYERRECOMMENDS_meta-ti-bsp = " \ | |||
25 | BBFILES_DYNAMIC += " \ | 25 | BBFILES_DYNAMIC += " \ |
26 | meta-arago-distro:${LAYERDIR}/dynamic-layers/meta-arago-distro/recipes*/*/*.bbappend \ | 26 | meta-arago-distro:${LAYERDIR}/dynamic-layers/meta-arago-distro/recipes*/*/*.bbappend \ |
27 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \ | 27 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \ |
28 | core:${LAYERDIR}/dynamic-layers/core/recipes*/*/*.bbappend \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ | 31 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ |
diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf index cdde69eb..3f9249e6 100644 --- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf | |||
@@ -31,5 +31,3 @@ UBOOT_MACHINE = "am62px_evm_a53_defconfig" | |||
31 | # For AM62P tisdk-display-cluster image, splash screen is handled by SBL. | 31 | # For AM62P tisdk-display-cluster image, splash screen is handled by SBL. |
32 | # Hence, disable the A53 based splash screen using the am62x_evm_prune_splashscreen.config fragment present in ti-u-boot tree | 32 | # Hence, disable the A53 based splash screen using the am62x_evm_prune_splashscreen.config fragment present in ti-u-boot tree |
33 | UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}" | 33 | UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}" |
34 | |||
35 | UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}" | ||
diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf index 2fd0cb54..e846c0da 100644 --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | |||
@@ -9,9 +9,4 @@ SYSFW_CONFIG = "evm" | |||
9 | SYSFW_SUFFIX = "hs-fs" | 9 | SYSFW_SUFFIX = "hs-fs" |
10 | 10 | ||
11 | UBOOT_MACHINE = "am6254xxl_evm_r5_defconfig" | 11 | UBOOT_MACHINE = "am6254xxl_evm_r5_defconfig" |
12 | |||
13 | UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_r5_defconfig" | 12 | UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_r5_defconfig" |
14 | |||
15 | UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig" | ||
16 | |||
17 | UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config" | ||
diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf index 9469cdeb..c5a3a92d 100644 --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf | |||
@@ -6,15 +6,12 @@ require conf/machine/include/am62xx.inc | |||
6 | 6 | ||
7 | TFA_K3_BL32_BASE = "0x80080000" | 7 | TFA_K3_BL32_BASE = "0x80080000" |
8 | TFA_K3_BL32_BASE:bsp-ti-6_6 = "" | 8 | TFA_K3_BL32_BASE:bsp-ti-6_6 = "" |
9 | TFA_K3_BL32_BASE:bsp-ti-6_1 = "" | ||
10 | 9 | ||
11 | TFA_K3_PRELOADED_BL33 = "0x82000000" | 10 | TFA_K3_PRELOADED_BL33 = "0x82000000" |
12 | TFA_K3_PRELOADED_BL33:bsp-ti-6_6 = "" | 11 | TFA_K3_PRELOADED_BL33:bsp-ti-6_6 = "" |
13 | TFA_K3_PRELOADED_BL33:bsp-ti-6_1 = "" | ||
14 | 12 | ||
15 | OPTEE_K3_TZDRAM_START = "0x80080000" | 13 | OPTEE_K3_TZDRAM_START = "0x80080000" |
16 | OPTEE_K3_TZDRAM_START:bsp-ti-6_6 = "" | 14 | OPTEE_K3_TZDRAM_START:bsp-ti-6_6 = "" |
17 | OPTEE_K3_TZDRAM_START:bsp-ti-6_1 = "" | ||
18 | 15 | ||
19 | KERNEL_DEVICETREE_PREFIX = " \ | 16 | KERNEL_DEVICETREE_PREFIX = " \ |
20 | ti/k3-am625 \ | 17 | ti/k3-am625 \ |
@@ -27,8 +24,6 @@ KERNEL_DEVICETREE = " \ | |||
27 | 24 | ||
28 | FIT_CONF_DEFAULT_DTB = "k3-am6254xxl-sk.dtb" | 25 | FIT_CONF_DEFAULT_DTB = "k3-am6254xxl-sk.dtb" |
29 | FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "k3-am625-sk.dtb" | 26 | FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "k3-am625-sk.dtb" |
30 | FIT_CONF_DEFAULT_DTB:bsp-ti-6_1 = "k3-am625-sk.dtb" | ||
31 | 27 | ||
32 | UBOOT_MACHINE = "am6254xxl_evm_a53_defconfig" | 28 | UBOOT_MACHINE = "am6254xxl_evm_a53_defconfig" |
33 | UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_a53_defconfig" | 29 | UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_a53_defconfig" |
34 | UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig" | ||
diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf index 72dc145b..b597c702 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf | |||
@@ -9,6 +9,3 @@ SYSFW_CONFIG = "evm" | |||
9 | SYSFW_SUFFIX = "gp" | 9 | SYSFW_SUFFIX = "gp" |
10 | 10 | ||
11 | UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig" | 11 | UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig" |
12 | UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig" | ||
13 | |||
14 | UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config" | ||
diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti.conf b/meta-ti-bsp/conf/machine/beagleplay-ti.conf index 3824d867..792c91b2 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-ti.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf | |||
@@ -20,9 +20,6 @@ TFA_K3_SYSTEM_SUSPEND = "1" | |||
20 | OPTEEMACHINE = "k3-am62x" | 20 | OPTEEMACHINE = "k3-am62x" |
21 | 21 | ||
22 | UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig" | 22 | UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig" |
23 | UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig" | ||
24 | |||
25 | UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config" | ||
26 | 23 | ||
27 | SPL_BINARY = "tispl.bin_unsigned" | 24 | SPL_BINARY = "tispl.bin_unsigned" |
28 | 25 | ||
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 49e996c8..56b56afe 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc | |||
@@ -34,3 +34,5 @@ TFA_BOARD = "lite" | |||
34 | OPTEEMACHINE = "k3-am64x" | 34 | OPTEEMACHINE = "k3-am64x" |
35 | 35 | ||
36 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw" | 36 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw" |
37 | |||
38 | TI_WKS_BOOTLOADER_APPEND="console=ttyS2,115200n8" | ||
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 30aa2a69..5833c322 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc | |||
@@ -38,6 +38,5 @@ OPTEEMACHINE = "k3-j721e" | |||
38 | 38 | ||
39 | TI_VXE_VXD_DRIVER = "ti-vxe-vxd-driver" | 39 | TI_VXE_VXD_DRIVER = "ti-vxe-vxd-driver" |
40 | TI_VXE_VXD_DRIVER:bsp-ti-6_6 = "" | 40 | TI_VXE_VXD_DRIVER:bsp-ti-6_6 = "" |
41 | TI_VXE_VXD_DRIVER:bsp-ti-6_1 = "" | ||
42 | 41 | ||
43 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw-j721e ${TI_VXE_VXD_DRIVER}" | 42 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw-j721e ${TI_VXE_VXD_DRIVER}" |
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 0e8729df..7860a84c 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc | |||
@@ -50,6 +50,8 @@ MACHINE_FEATURES += "efi" | |||
50 | 50 | ||
51 | WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" | 51 | WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" |
52 | 52 | ||
53 | TI_WKS_BOOTLOADER_APPEND ?= "" | ||
54 | |||
53 | do_image_wic[depends] += "virtual/bootloader:do_deploy" | 55 | do_image_wic[depends] += "virtual/bootloader:do_deploy" |
54 | 56 | ||
55 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" | 57 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" |
diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index ce8efecd..c690cb5a 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc | |||
@@ -3,7 +3,7 @@ | |||
3 | # preferences for kernel, bootloader and graphics components, as | 3 | # preferences for kernel, bootloader and graphics components, as |
4 | # well as a dedicated machine override. | 4 | # well as a dedicated machine override. |
5 | 5 | ||
6 | # Supported options are: mainline, next, ti-6_12, ti-6_6, ti-6_1 | 6 | # Supported options are: mainline, next, ti-6_12, ti-6_6 |
7 | TI_PREFERRED_BSP ??= "ti-6_12" | 7 | TI_PREFERRED_BSP ??= "ti-6_12" |
8 | 8 | ||
9 | # Use bsp-* namespace for overrides | 9 | # Use bsp-* namespace for overrides |
@@ -79,26 +79,6 @@ BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%" | |||
79 | MACHINE_FEATURES:remove:bsp-ti-6_6 = "gc320" | 79 | MACHINE_FEATURES:remove:bsp-ti-6_6 = "gc320" |
80 | 80 | ||
81 | # ========== | 81 | # ========== |
82 | # ti-6_1 | ||
83 | # TI staging kernel 6.1, u-boot 2023.04 | ||
84 | # ========== | ||
85 | BSP_KERNEL_PROVIDER:bsp-ti-6_1 = "linux-ti-staging" | ||
86 | BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1.%" | ||
87 | BSP_BOOTLOADER_PROVIDER:bsp-ti-6_1 = "u-boot-ti-staging" | ||
88 | BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023.04%" | ||
89 | |||
90 | BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km" | ||
91 | BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%" | ||
92 | BSP_SGX_UMLIBS_VERSION:bsp-ti-6_1 = "1.17%" | ||
93 | BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-img-rogue-driver" | ||
94 | BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_1 = "23%" | ||
95 | BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_1 = "23%" | ||
96 | BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%" | ||
97 | |||
98 | # GC320 support requires out-of-tree drivers not yet available in 6.1 | ||
99 | MACHINE_FEATURES:remove:bsp-ti-6_1 = "gc320" | ||
100 | |||
101 | # ========== | ||
102 | # sane fallback defaults | 82 | # sane fallback defaults |
103 | # if specific values are not defined or bsp is set incorrectly | 83 | # if specific values are not defined or bsp is set incorrectly |
104 | # use default preference TI staging and SW-rendering graphics | 84 | # use default preference TI staging and SW-rendering graphics |
diff --git a/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-base.bbappend b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-base.bbappend new file mode 100644 index 00000000..db5a0dc5 --- /dev/null +++ b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-base.bbappend | |||
@@ -0,0 +1,4 @@ | |||
1 | IMAGE_TI = "" | ||
2 | IMAGE_TI:ti-soc = "image-ti.inc" | ||
3 | |||
4 | require ${IMAGE_TI} | ||
diff --git a/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-minimal.bbappend b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-minimal.bbappend new file mode 100644 index 00000000..db5a0dc5 --- /dev/null +++ b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-minimal.bbappend | |||
@@ -0,0 +1,4 @@ | |||
1 | IMAGE_TI = "" | ||
2 | IMAGE_TI:ti-soc = "image-ti.inc" | ||
3 | |||
4 | require ${IMAGE_TI} | ||
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/image-arago.inc b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/image-ti.inc index 31c6b6f7..31c6b6f7 100644 --- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/image-arago.inc +++ b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/image-ti.inc | |||
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/image-ti.inc b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/image-ti.inc new file mode 100644 index 00000000..31c6b6f7 --- /dev/null +++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/image-ti.inc | |||
@@ -0,0 +1,3 @@ | |||
1 | include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} | ||
2 | |||
3 | do_image_wic[depends] += "virtual/kernel:do_shared_workdir" | ||
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-base-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-base-image.bbappend index 36e6f793..db5a0dc5 100644 --- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-base-image.bbappend +++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-base-image.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | IMAGE_ARAGO = "" | 1 | IMAGE_TI = "" |
2 | IMAGE_ARAGO:arago = "image-arago.inc" | 2 | IMAGE_TI:ti-soc = "image-ti.inc" |
3 | 3 | ||
4 | require ${IMAGE_ARAGO} | 4 | require ${IMAGE_TI} |
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bbappend index 36e6f793..db5a0dc5 100644 --- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bbappend +++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | IMAGE_ARAGO = "" | 1 | IMAGE_TI = "" |
2 | IMAGE_ARAGO:arago = "image-arago.inc" | 2 | IMAGE_TI:ti-soc = "image-ti.inc" |
3 | 3 | ||
4 | require ${IMAGE_ARAGO} | 4 | require ${IMAGE_TI} |
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bbappend index 36e6f793..db5a0dc5 100644 --- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bbappend +++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | IMAGE_ARAGO = "" | 1 | IMAGE_TI = "" |
2 | IMAGE_ARAGO:arago = "image-arago.inc" | 2 | IMAGE_TI:ti-soc = "image-ti.inc" |
3 | 3 | ||
4 | require ${IMAGE_ARAGO} | 4 | require ${IMAGE_TI} |
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-default-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-default-image.bbappend index 36e6f793..db5a0dc5 100644 --- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-default-image.bbappend +++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-default-image.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | IMAGE_ARAGO = "" | 1 | IMAGE_TI = "" |
2 | IMAGE_ARAGO:arago = "image-arago.inc" | 2 | IMAGE_TI:ti-soc = "image-ti.inc" |
3 | 3 | ||
4 | require ${IMAGE_ARAGO} | 4 | require ${IMAGE_TI} |
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bbappend index 36e6f793..db5a0dc5 100644 --- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bbappend +++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | IMAGE_ARAGO = "" | 1 | IMAGE_TI = "" |
2 | IMAGE_ARAGO:arago = "image-arago.inc" | 2 | IMAGE_TI:ti-soc = "image-ti.inc" |
3 | 3 | ||
4 | require ${IMAGE_ARAGO} | 4 | require ${IMAGE_TI} |
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bbappend index 36e6f793..db5a0dc5 100644 --- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bbappend +++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | IMAGE_ARAGO = "" | 1 | IMAGE_TI = "" |
2 | IMAGE_ARAGO:arago = "image-arago.inc" | 2 | IMAGE_TI:ti-soc = "image-ti.inc" |
3 | 3 | ||
4 | require ${IMAGE_ARAGO} | 4 | require ${IMAGE_TI} |
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 deleted file mode 100644 index 0d39571b..00000000 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | SUMMARY = "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs" | ||
2 | HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" | ||
3 | LICENSE = "MIT | GPL-2.0-only" | ||
4 | LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" | ||
5 | |||
6 | inherit module | ||
7 | |||
8 | PROVIDES = "virtual/gpudriver" | ||
9 | |||
10 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
11 | |||
12 | COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" | ||
13 | |||
14 | DEPENDS = "virtual/kernel" | ||
15 | |||
16 | BRANCH = "linuxws/kirkstone/k6.1/${PV}" | ||
17 | |||
18 | SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" | ||
19 | |||
20 | SRCREV = "c838bc06a163abad46dcc193c8fb9a4fb9e2e356" | ||
21 | |||
22 | TARGET_PRODUCT:j721e = "j721e_linux" | ||
23 | TARGET_PRODUCT:j721s2 = "j721s2_linux" | ||
24 | TARGET_PRODUCT:j784s4 = "j784s4_linux" | ||
25 | TARGET_PRODUCT:am62xx = "am62_linux" | ||
26 | TARGET_PRODUCT:am62pxx = "am62p_linux" | ||
27 | TARGET_PRODUCT:j722s = "j722s_linux" | ||
28 | PVR_BUILD = "release" | ||
29 | PVR_WS = "lws-generic" | ||
30 | |||
31 | EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' | ||
32 | |||
33 | do_install() { | ||
34 | 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 | ||
35 | } | ||
36 | |||
37 | RRECOMMENDS:${PN} += "ti-img-rogue-umlibs" | ||
diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc index 575d5632..571259e0 100644 --- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | |||
@@ -14,12 +14,12 @@ GOODIX_FW_VERSION = "1.0.0.0" | |||
14 | CADENCE_MHDP_FW_VERSION = "2.1.0" | 14 | CADENCE_MHDP_FW_VERSION = "2.1.0" |
15 | IMG_DEC_FW_VERSION = "1.0" | 15 | IMG_DEC_FW_VERSION = "1.0" |
16 | CNM_WAVE521_FW_VERSION = "1.0.8" | 16 | CNM_WAVE521_FW_VERSION = "1.0.8" |
17 | TI_DM_FW_VERSION = "11.00.09" | 17 | TI_DM_FW_VERSION = "11.01.09" |
18 | TI_SYSFW_VERSION = "11.01.02" | 18 | TI_SYSFW_VERSION = "11.01.05" |
19 | TI_HSM_DEMO_FW_VERSION = "11.00.09" | 19 | TI_HSM_DEMO_FW_VERSION = "11.00.09" |
20 | TAD5212_FW_VERSION = "1.0.0.0" | 20 | TAD5212_FW_VERSION = "1.0.0.0" |
21 | 21 | ||
22 | TI_LINUX_FW_SRCREV ?= "373c2f5646e3947b3b4a340da729288ee3f07833" | 22 | TI_LINUX_FW_SRCREV ?= "f59a711599249ecac75fea38b7a15ef9137d650d" |
23 | SRCREV = "${TI_LINUX_FW_SRCREV}" | 23 | SRCREV = "${TI_LINUX_FW_SRCREV}" |
24 | 24 | ||
25 | BRANCH ?= "ti-linux-firmware" | 25 | BRANCH ?= "ti-linux-firmware" |
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc index cc443c3f..ee58c193 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc | |||
@@ -8,7 +8,7 @@ SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmwar | |||
8 | SRCBRANCH = "master" | 8 | SRCBRANCH = "master" |
9 | 9 | ||
10 | LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130" | 10 | LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130" |
11 | SRCREV_tfa:am62lxx = "c7583e555f0c7152a54e9ccac492dffddc4e3db0" | 11 | SRCREV_tfa:am62lxx = "ed89d963b00e8dbdb91cea87e1ba43db0a64fba9" |
12 | SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https" | 12 | SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https" |
13 | SRCBRANCH:am62lxx = "ti-master" | 13 | SRCBRANCH:am62lxx = "ti-master" |
14 | 14 | ||
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb deleted file mode 100644 index b26c59d4..00000000 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | require u-boot-ti.inc | ||
2 | |||
3 | include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} | ||
4 | |||
5 | PR = "r0" | ||
6 | |||
7 | BRANCH = "ti-u-boot-2023.04" | ||
8 | |||
9 | SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch" | ||
10 | |||
11 | SRCREV = "2bedcd265ca6de803c90505df5962cbd70cda611" | ||
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb index 6c88489d..83965d54 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb | |||
@@ -6,4 +6,4 @@ PR = "r0" | |||
6 | 6 | ||
7 | BRANCH = "ti-u-boot-2025.01" | 7 | BRANCH = "ti-u-boot-2025.01" |
8 | 8 | ||
9 | SRCREV = "827c35b4d141865e25d234e3d298614e6c47150c" | 9 | SRCREV = "3bcfad6cee95403f7f62dd9d871cc3ea948c0761" |
diff --git a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb index 3be1f46b..62f3485b 100644 --- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb +++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb | |||
@@ -10,6 +10,6 @@ PV = "0.3+git" | |||
10 | COMPATIBLE_MACHINE = "k3" | 10 | COMPATIBLE_MACHINE = "k3" |
11 | 11 | ||
12 | BRANCH ?= "master" | 12 | BRANCH ?= "master" |
13 | SRCREV = "e6abc1b87f1d5bc4c2ab5f1ebfbf5a70e437dcb4" | 13 | SRCREV = "6034420195cf763c9470fb2113810695e5e37a23" |
14 | 14 | ||
15 | SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}" | 15 | SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}" |
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch deleted file mode 100644 index 7d4fe078..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | From bb2db56ffec6e527d88751f75117ae690227cd6c Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <kai@dev.carbon-project.org> | ||
3 | Date: Sat, 11 Feb 2023 18:38:01 +0100 | ||
4 | Subject: [PATCH] fix: gallivm: fix LLVM #include of Host.h, moved to | ||
5 | TargetParser | ||
6 | |||
7 | Upstream moved Host.h from Support to TargetParser in LLVM 17. | ||
8 | |||
9 | This shouldn't lead to a FTBFS, since there is a forwarding include left | ||
10 | behind. Sadly the added deprecation warning #pragma is invalid and thus | ||
11 | causes a build failure right away. But since we would have to follow the | ||
12 | move anyway in the future, just do it right away. | ||
13 | |||
14 | Reference: https://github.com/llvm/llvm-project/commit/d768bf994f508d7eaf9541a568be3d71096febf5 | ||
15 | Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | ||
16 | Closes: #8275 | ||
17 | Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21263> | ||
18 | |||
19 | Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/bb2db56ffec6e527d88751f75117ae690227cd6c] | ||
20 | |||
21 | --- | ||
22 | src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 7 ++++++- | ||
23 | src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 +++- | ||
24 | 2 files changed, 9 insertions(+), 2 deletions(-) | ||
25 | |||
26 | diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | ||
27 | index 54bc5d5ada36c..f78f04f042be8 100644 | ||
28 | --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | ||
29 | +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | ||
30 | @@ -35,9 +35,14 @@ | ||
31 | #include <llvm-c/Disassembler.h> | ||
32 | #include <llvm/Support/raw_ostream.h> | ||
33 | #include <llvm/Support/Format.h> | ||
34 | -#include <llvm/Support/Host.h> | ||
35 | #include <llvm/IR/Module.h> | ||
36 | |||
37 | +#if LLVM_VERSION_MAJOR >= 17 | ||
38 | +#include <llvm/TargetParser/Host.h> | ||
39 | +#else | ||
40 | +#include <llvm/Support/Host.h> | ||
41 | +#endif | ||
42 | + | ||
43 | #include "util/u_math.h" | ||
44 | #include "util/u_debug.h" | ||
45 | |||
46 | diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
47 | index 334c13530394b..5e7a30a6cc2e3 100644 | ||
48 | --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
49 | +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
50 | @@ -60,7 +60,11 @@ | ||
51 | #include <llvm/Analysis/TargetLibraryInfo.h> | ||
52 | #include <llvm/ExecutionEngine/SectionMemoryManager.h> | ||
53 | #include <llvm/Support/CommandLine.h> | ||
54 | +#if LLVM_VERSION_MAJOR >= 17 | ||
55 | +#include <llvm/TargetParser/Host.h> | ||
56 | +#else | ||
57 | #include <llvm/Support/Host.h> | ||
58 | +#endif | ||
59 | #include <llvm/Support/PrettyStackTrace.h> | ||
60 | #include <llvm/ExecutionEngine/ObjectCache.h> | ||
61 | #include <llvm/Support/TargetSelect.h> | ||
62 | |||
63 | -- | ||
64 | GitLab | ||
65 | |||
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch deleted file mode 100644 index 905fad04..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch +++ /dev/null | |||
@@ -1,128 +0,0 @@ | |||
1 | From 1a894699354f5f984f31e5d3418b651edf486df9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ryan Eatmon <reatmon@ti.com> | ||
3 | Date: Fri, 22 Sep 2023 22:32:41 -0500 | ||
4 | Subject: [PATCH] fix: gallivm: limit usage of LLVMContextSetOpaquePointers() | ||
5 | to LLVM 15 | ||
6 | |||
7 | LLVMContextSetOpaquePointers() was a temporary workaround offered to | ||
8 | allow transitioning to opaque pointers. Mesa is ready for this now with | ||
9 | recent versions of LLVM (16+). Therefore we limit the workaround of | ||
10 | using LLVMContextSetOpaquePointers() to LLVM 15 now, that this C | ||
11 | interface was removed in LLVM 17. | ||
12 | |||
13 | Reference: https://github.com/llvm/llvm-project/commit/1270879376025457e266572c7cccc51eb5de9276 | ||
14 | |||
15 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21124] | ||
16 | Signed-off-by: Ryan Eatmon <reatmon@ti.com> | ||
17 | --- | ||
18 | src/gallium/auxiliary/draw/draw_llvm.c | 2 +- | ||
19 | src/gallium/drivers/llvmpipe/lp_context.c | 2 +- | ||
20 | src/gallium/drivers/llvmpipe/lp_test_arit.c | 2 +- | ||
21 | src/gallium/drivers/llvmpipe/lp_test_blend.c | 2 +- | ||
22 | src/gallium/drivers/llvmpipe/lp_test_conv.c | 2 +- | ||
23 | src/gallium/drivers/llvmpipe/lp_test_format.c | 4 ++-- | ||
24 | src/gallium/drivers/llvmpipe/lp_test_printf.c | 2 +- | ||
25 | 7 files changed, 8 insertions(+), 8 deletions(-) | ||
26 | |||
27 | diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c | ||
28 | index 50c157bc3cc..8b3a1522725 100644 | ||
29 | --- a/src/gallium/auxiliary/draw/draw_llvm.c | ||
30 | +++ b/src/gallium/auxiliary/draw/draw_llvm.c | ||
31 | @@ -784,7 +784,7 @@ draw_llvm_create(struct draw_context *draw, LLVMContextRef context) | ||
32 | if (!llvm->context) { | ||
33 | llvm->context = LLVMContextCreate(); | ||
34 | |||
35 | -#if LLVM_VERSION_MAJOR >= 15 | ||
36 | +#if LLVM_VERSION_MAJOR == 15 | ||
37 | LLVMContextSetOpaquePointers(llvm->context, false); | ||
38 | #endif | ||
39 | |||
40 | diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c | ||
41 | index 8309335aebc..0ef4317fc76 100644 | ||
42 | --- a/src/gallium/drivers/llvmpipe/lp_context.c | ||
43 | +++ b/src/gallium/drivers/llvmpipe/lp_context.c | ||
44 | @@ -263,7 +263,7 @@ llvmpipe_create_context(struct pipe_screen *screen, void *priv, | ||
45 | if (!llvmpipe->context) | ||
46 | goto fail; | ||
47 | |||
48 | -#if LLVM_VERSION_MAJOR >= 15 | ||
49 | +#if LLVM_VERSION_MAJOR == 15 | ||
50 | LLVMContextSetOpaquePointers(llvmpipe->context, false); | ||
51 | #endif | ||
52 | |||
53 | diff --git a/src/gallium/drivers/llvmpipe/lp_test_arit.c b/src/gallium/drivers/llvmpipe/lp_test_arit.c | ||
54 | index 4118928d52e..565b1c47753 100644 | ||
55 | --- a/src/gallium/drivers/llvmpipe/lp_test_arit.c | ||
56 | +++ b/src/gallium/drivers/llvmpipe/lp_test_arit.c | ||
57 | @@ -434,7 +434,7 @@ test_unary(unsigned verbose, FILE *fp, const struct unary_test_t *test, unsigned | ||
58 | } | ||
59 | |||
60 | context = LLVMContextCreate(); | ||
61 | -#if LLVM_VERSION_MAJOR >= 15 | ||
62 | +#if LLVM_VERSION_MAJOR == 15 | ||
63 | LLVMContextSetOpaquePointers(context, false); | ||
64 | #endif | ||
65 | gallivm = gallivm_create("test_module", context, NULL); | ||
66 | diff --git a/src/gallium/drivers/llvmpipe/lp_test_blend.c b/src/gallium/drivers/llvmpipe/lp_test_blend.c | ||
67 | index 37c3f731eaf..3d2899a78d4 100644 | ||
68 | --- a/src/gallium/drivers/llvmpipe/lp_test_blend.c | ||
69 | +++ b/src/gallium/drivers/llvmpipe/lp_test_blend.c | ||
70 | @@ -452,7 +452,7 @@ test_one(unsigned verbose, | ||
71 | dump_blend_type(stdout, blend, type); | ||
72 | |||
73 | context = LLVMContextCreate(); | ||
74 | -#if LLVM_VERSION_MAJOR >= 15 | ||
75 | +#if LLVM_VERSION_MAJOR == 15 | ||
76 | LLVMContextSetOpaquePointers(context, false); | ||
77 | #endif | ||
78 | gallivm = gallivm_create("test_module", context, NULL); | ||
79 | diff --git a/src/gallium/drivers/llvmpipe/lp_test_conv.c b/src/gallium/drivers/llvmpipe/lp_test_conv.c | ||
80 | index c7ea9efc12d..83236f0c0ba 100644 | ||
81 | --- a/src/gallium/drivers/llvmpipe/lp_test_conv.c | ||
82 | +++ b/src/gallium/drivers/llvmpipe/lp_test_conv.c | ||
83 | @@ -223,7 +223,7 @@ test_one(unsigned verbose, | ||
84 | } | ||
85 | |||
86 | context = LLVMContextCreate(); | ||
87 | -#if LLVM_VERSION_MAJOR >= 15 | ||
88 | +#if LLVM_VERSION_MAJOR == 15 | ||
89 | LLVMContextSetOpaquePointers(context, false); | ||
90 | #endif | ||
91 | gallivm = gallivm_create("test_module", context, NULL); | ||
92 | diff --git a/src/gallium/drivers/llvmpipe/lp_test_format.c b/src/gallium/drivers/llvmpipe/lp_test_format.c | ||
93 | index 0a2a1e449e8..89f7d5dec1a 100644 | ||
94 | --- a/src/gallium/drivers/llvmpipe/lp_test_format.c | ||
95 | +++ b/src/gallium/drivers/llvmpipe/lp_test_format.c | ||
96 | @@ -150,7 +150,7 @@ test_format_float(unsigned verbose, FILE *fp, | ||
97 | unsigned i, j, k, l; | ||
98 | |||
99 | context = LLVMContextCreate(); | ||
100 | -#if LLVM_VERSION_MAJOR >= 15 | ||
101 | +#if LLVM_VERSION_MAJOR == 15 | ||
102 | LLVMContextSetOpaquePointers(context, false); | ||
103 | #endif | ||
104 | gallivm = gallivm_create("test_module_float", context, NULL); | ||
105 | @@ -254,7 +254,7 @@ test_format_unorm8(unsigned verbose, FILE *fp, | ||
106 | unsigned i, j, k, l; | ||
107 | |||
108 | context = LLVMContextCreate(); | ||
109 | -#if LLVM_VERSION_MAJOR >= 15 | ||
110 | +#if LLVM_VERSION_MAJOR == 15 | ||
111 | LLVMContextSetOpaquePointers(context, false); | ||
112 | #endif | ||
113 | gallivm = gallivm_create("test_module_unorm8", context, NULL); | ||
114 | diff --git a/src/gallium/drivers/llvmpipe/lp_test_printf.c b/src/gallium/drivers/llvmpipe/lp_test_printf.c | ||
115 | index b3de9cb9e8b..850c0abfe22 100644 | ||
116 | --- a/src/gallium/drivers/llvmpipe/lp_test_printf.c | ||
117 | +++ b/src/gallium/drivers/llvmpipe/lp_test_printf.c | ||
118 | @@ -96,7 +96,7 @@ test_printf(unsigned verbose, FILE *fp, | ||
119 | boolean success = TRUE; | ||
120 | |||
121 | context = LLVMContextCreate(); | ||
122 | -#if LLVM_VERSION_MAJOR >= 15 | ||
123 | +#if LLVM_VERSION_MAJOR == 15 | ||
124 | LLVMContextSetOpaquePointers(context, false); | ||
125 | #endif | ||
126 | gallivm = gallivm_create("test_module", context, NULL); | ||
127 | -- | ||
128 | 2.17.1 | ||
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch deleted file mode 100644 index f0775176..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 8a5de0b6cf1090d7f29f3974ec79c32776cf2745 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jami Kettunen <jami.kettunen@protonmail.com> | ||
3 | Date: Tue, 31 Aug 2021 00:15:58 +0300 | ||
4 | Subject: [PATCH] freedreno/pm4: Use unsigned instead of uint to fix musl build | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Fixes the following error I noticed when building against aarch64 with | ||
9 | musl libc: | ||
10 | |||
11 | In file included from ../src/freedreno/decode/crashdec.h:38, | ||
12 | from ../src/freedreno/decode/crashdec.c:40: | ||
13 | ../src/freedreno/common/freedreno_pm4.h:104:15: error: unknown type name 'uint' | ||
14 | 104 | static inline uint | ||
15 | | ^~~~ | ||
16 | ../src/freedreno/common/freedreno_pm4.h:105:25: error: unknown type name 'uint'; did you mean 'int'? | ||
17 | 105 | pm4_calc_odd_parity_bit(uint val) | ||
18 | | ^~~~ | ||
19 | | int | ||
20 | |||
21 | Signed-off-by: Jami Kettunen <jami.kettunen@protonmail.com> | ||
22 | Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19665> | ||
23 | --- | ||
24 | src/freedreno/common/freedreno_pm4.h | 4 ++-- | ||
25 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/src/freedreno/common/freedreno_pm4.h b/src/freedreno/common/freedreno_pm4.h | ||
28 | index 8f958953d693..091247e709a0 100644 | ||
29 | --- a/src/freedreno/common/freedreno_pm4.h | ||
30 | +++ b/src/freedreno/common/freedreno_pm4.h | ||
31 | @@ -105,8 +105,8 @@ pm4_pkt7_hdr(uint8_t opcode, uint16_t cnt) | ||
32 | #define cp_type3_opcode(pkt) (((pkt) >> 8) & 0xFF) | ||
33 | #define type3_pkt_size(pkt) ((((pkt) >> 16) & 0x3FFF) + 1) | ||
34 | |||
35 | -static inline uint | ||
36 | -pm4_calc_odd_parity_bit(uint val) | ||
37 | +static inline unsigned | ||
38 | +pm4_calc_odd_parity_bit(unsigned val) | ||
39 | { | ||
40 | return (0x9669 >> (0xf & ((val) ^ ((val) >> 4) ^ ((val) >> 8) ^ | ||
41 | ((val) >> 12) ^ ((val) >> 16) ^ ((val) >> 20) ^ | ||
42 | -- | ||
43 | 2.39.2 | ||
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-17.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-17.patch deleted file mode 100644 index bdfe7bb8..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-17.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From 2dfe0f899aeb415a5491b8c67e208673d2a2914f Mon Sep 17 00:00:00 2001 | ||
2 | From: Ryan Eatmon <reatmon@ti.com> | ||
3 | Date: Fri, 22 Sep 2023 21:50:08 -0500 | ||
4 | Subject: [PATCH] gallium: Fix build with llvm 17 | ||
5 | |||
6 | These headers are not available for C files in llvm 17+ | ||
7 | and they seem to be not needed to compile after all with llvm 17 | ||
8 | so add conditions to exclude them for llvm >= 17 | ||
9 | |||
10 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21262] | ||
11 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22980] | ||
12 | Signed-off-by: Ryan Eatmon <reatmon@ti.com> | ||
13 | --- | ||
14 | src/gallium/auxiliary/gallivm/lp_bld_init.c | 8 ++++---- | ||
15 | src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++++ | ||
16 | 2 files changed, 8 insertions(+), 4 deletions(-) | ||
17 | |||
18 | diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c | ||
19 | index 584ea738668..fe8bb2b11af 100644 | ||
20 | --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c | ||
21 | +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c | ||
22 | @@ -42,14 +42,14 @@ | ||
23 | |||
24 | #include <llvm/Config/llvm-config.h> | ||
25 | #include <llvm-c/Analysis.h> | ||
26 | -#include <llvm-c/Transforms/Scalar.h> | ||
27 | -#if LLVM_VERSION_MAJOR >= 7 | ||
28 | -#include <llvm-c/Transforms/Utils.h> | ||
29 | -#endif | ||
30 | #include <llvm-c/BitWriter.h> | ||
31 | #if GALLIVM_USE_NEW_PASS == 1 | ||
32 | #include <llvm-c/Transforms/PassBuilder.h> | ||
33 | #elif GALLIVM_HAVE_CORO == 1 | ||
34 | +#include <llvm-c/Transforms/Scalar.h> | ||
35 | +#if LLVM_VERSION_MAJOR >= 7 | ||
36 | +#include <llvm-c/Transforms/Utils.h> | ||
37 | +#endif | ||
38 | #if LLVM_VERSION_MAJOR <= 8 && (defined(PIPE_ARCH_AARCH64) || defined (PIPE_ARCH_ARM) || defined(PIPE_ARCH_S390) || defined(PIPE_ARCH_MIPS64)) | ||
39 | #include <llvm-c/Transforms/IPO.h> | ||
40 | #endif | ||
41 | diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
42 | index 2279e5acb28..0caeaf94263 100644 | ||
43 | --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
44 | +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
45 | @@ -56,7 +56,11 @@ | ||
46 | #include <llvm-c/ExecutionEngine.h> | ||
47 | #include <llvm/Target/TargetOptions.h> | ||
48 | #include <llvm/ExecutionEngine/ExecutionEngine.h> | ||
49 | +#if LLVM_VERSION_MAJOR >= 17 | ||
50 | +#include <llvm/TargetParser/Triple.h> | ||
51 | +#else | ||
52 | #include <llvm/ADT/Triple.h> | ||
53 | +#endif | ||
54 | #include <llvm/Analysis/TargetLibraryInfo.h> | ||
55 | #include <llvm/ExecutionEngine/SectionMemoryManager.h> | ||
56 | #include <llvm/Support/CommandLine.h> | ||
57 | -- | ||
58 | 2.17.1 | ||
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch deleted file mode 100644 index 37888c34..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From 6c5033bb01a3a1341d4db5007586a5f2e2727b0a Mon Sep 17 00:00:00 2001 | ||
2 | From: Ryan Eatmon <reatmon@ti.com> | ||
3 | Date: Mon, 4 Nov 2024 13:37:29 -0600 | ||
4 | Subject: [PATCH] gallium: Fix build with llvm 18 and 19 | ||
5 | |||
6 | - CodeGenOpt::Level changed to CodeGenOoptLevel. [1] | ||
7 | - llvm::sys::getHostCPUFeatures() now returns the features instead of | ||
8 | modifying the passed in argument. [2] | ||
9 | |||
10 | Upstream-Status: Backport [1][https://gitlab.freedesktop.org/mesa/mesa/-/commit/f79617fe804ea6524651ff1bc3a91098d3199179] | ||
11 | Upstream-Status: Backport [2][https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d] | ||
12 | |||
13 | Signed-off-by: Ryan Eatmon <reatmon@ti.com> | ||
14 | --- | ||
15 | src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 14 ++++++++++++-- | ||
16 | 1 file changed, 12 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
19 | index 5e7a30a6cc2..dbc777e3096 100644 | ||
20 | --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
21 | +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
22 | @@ -368,7 +368,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, | ||
23 | builder.setEngineKind(EngineKind::JIT) | ||
24 | .setErrorStr(&Error) | ||
25 | .setTargetOptions(options) | ||
26 | +#if LLVM_VERSION_MAJOR >= 18 | ||
27 | + .setOptLevel((CodeGenOptLevel)OptLevel); | ||
28 | +#else | ||
29 | .setOptLevel((CodeGenOpt::Level)OptLevel); | ||
30 | +#endif | ||
31 | |||
32 | #ifdef _WIN32 | ||
33 | /* | ||
34 | @@ -392,8 +396,14 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, | ||
35 | * which allows us to enable/disable code generation based | ||
36 | * on the results of cpuid on these architectures. | ||
37 | */ | ||
38 | - llvm::StringMap<bool> features; | ||
39 | - llvm::sys::getHostCPUFeatures(features); | ||
40 | + #if LLVM_VERSION_MAJOR >= 19 | ||
41 | + /* llvm-19+ returns StringMap from getHostCPUFeatures. | ||
42 | + */ | ||
43 | + auto features = llvm::sys::getHostCPUFeatures(); | ||
44 | + #else | ||
45 | + llvm::StringMap<bool> features; | ||
46 | + llvm::sys::getHostCPUFeatures(features); | ||
47 | + #endif | ||
48 | |||
49 | for (StringMapIterator<bool> f = features.begin(); | ||
50 | f != features.end(); | ||
51 | -- | ||
52 | 2.17.1 | ||
53 | |||
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gbm-backend-fix-gbm-compile-without-dri.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gbm-backend-fix-gbm-compile-without-dri.patch deleted file mode 100644 index 289ff032..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gbm-backend-fix-gbm-compile-without-dri.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 25946100e21cf2095bea334e8d7096798561d0b7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Vincent Davis Jr <vince@underview.tech> | ||
3 | Date: Wed, 28 Dec 2022 16:28:01 -0600 | ||
4 | Subject: [PATCH] gbm/backend: fix gbm compile without dri | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20447 | ||
9 | https://gitlab.freedesktop.org/mesa/mesa/-/commit/842ca284650f066e58706741a7d22d67b5088e60 | ||
10 | |||
11 | At mesa version 22.2.3 patch wasn't introduced until after. | ||
12 | |||
13 | Commit introduces a fix that allows for gbm to be built with an empty | ||
14 | backend. There are situation especially in a Yocto/OE cross compilation | ||
15 | environment where you want to build with an empty backend. The particular | ||
16 | situation is as such: | ||
17 | |||
18 | The mesa-gl recipe is the preferred provider for virtual/libgbm, virtual/libgl, | ||
19 | virtual/mesa, etc... But the x11 DISTRO_FEATURE in't included this leads to build | ||
20 | errors such as: | ||
21 | |||
22 | | /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o: in function `find_backend': | ||
23 | | backend.c:(.text.find_backend+0xa4): undefined reference to `gbm_dri_backend' | ||
24 | | /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o:(.data.rel.ro.builtin_backends+0x4): | ||
25 | undefined reference to `gbm_dri_backend' | ||
26 | | collect2: error: ld returned 1 exit status | ||
27 | |||
28 | Issue should be replicable by setting -Ddri3=disabled and -Dgbm=enabled | ||
29 | |||
30 | Add fix to bypasses compilation issue by excluding gbm dri backend. If | ||
31 | HAVE_DRI || HAVE_DRIX not specified. | ||
32 | |||
33 | Acked-by: David Heidelberg <david.heidelberg@collabora.com> | ||
34 | Signed-off-by: Vincent Davis Jr <vince@underview.tech> | ||
35 | --- | ||
36 | src/gbm/main/backend.c | 4 ++++ | ||
37 | 1 file changed, 4 insertions(+) | ||
38 | |||
39 | diff --git a/src/gbm/main/backend.c b/src/gbm/main/backend.c | ||
40 | index 974d0a76a4e..feee0703495 100644 | ||
41 | --- a/src/gbm/main/backend.c | ||
42 | +++ b/src/gbm/main/backend.c | ||
43 | @@ -42,7 +42,9 @@ | ||
44 | #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) | ||
45 | #define VER_MIN(a, b) ((a) < (b) ? (a) : (b)) | ||
46 | |||
47 | +#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3) | ||
48 | extern const struct gbm_backend gbm_dri_backend; | ||
49 | +#endif | ||
50 | |||
51 | struct gbm_backend_desc { | ||
52 | const char *name; | ||
53 | @@ -51,7 +53,9 @@ struct gbm_backend_desc { | ||
54 | }; | ||
55 | |||
56 | static const struct gbm_backend_desc builtin_backends[] = { | ||
57 | +#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3) | ||
58 | { "dri", &gbm_dri_backend }, | ||
59 | +#endif | ||
60 | }; | ||
61 | |||
62 | #define BACKEND_LIB_SUFFIX "_gbm" | ||
63 | -- | ||
64 | 2.34.1 | ||
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch deleted file mode 100644 index 35bd0ea1..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From 3ef37c63f03ad6f2af407de350486fdd25e9132a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 13 Jan 2020 15:23:47 -0800 | ||
4 | Subject: [PATCH] meson misdetects 64bit atomics on mips/clang | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | --- | ||
10 | src/util/u_atomic.c | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/src/util/u_atomic.c b/src/util/u_atomic.c | ||
14 | index 5a5eab4..e499516 100644 | ||
15 | --- a/src/util/u_atomic.c | ||
16 | +++ b/src/util/u_atomic.c | ||
17 | @@ -21,7 +21,7 @@ | ||
18 | * IN THE SOFTWARE. | ||
19 | */ | ||
20 | |||
21 | -#if defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) | ||
22 | +#if !defined(__clang__) && defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) | ||
23 | |||
24 | #include <stdint.h> | ||
25 | #include <pthread.h> | ||
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson.build-check-for-all-linux-host_os-combinations.patch deleted file mode 100644 index f0c1de46..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 3b4d6b89f644b43e507c08181fef06db4326f9da Mon Sep 17 00:00:00 2001 | ||
2 | From: Alistair Francis <alistair@alistair23.me> | ||
3 | Date: Thu, 14 Nov 2019 13:04:49 -0800 | ||
4 | Subject: [PATCH] meson.build: check for all linux host_os combinations | ||
5 | |||
6 | Make sure that we are also looking for our host_os combinations like | ||
7 | linux-musl etc. when assuming support for DRM/KMS. | ||
8 | |||
9 | Also delete a duplicate line. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
16 | Signed-off-by: Alistair Francis <alistair@alistair23.me> | ||
17 | |||
18 | --- | ||
19 | meson.build | 4 ++-- | ||
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/meson.build b/meson.build | ||
23 | index 172c64a..9b5294c 100644 | ||
24 | --- a/meson.build | ||
25 | +++ b/meson.build | ||
26 | @@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 | ||
27 | # Only build shared_glapi if at least one OpenGL API is enabled | ||
28 | with_shared_glapi = with_shared_glapi and with_any_opengl | ||
29 | |||
30 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) | ||
31 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or host_machine.system().startswith('linux') | ||
32 | |||
33 | with_freedreno_kgsl = get_option('freedreno-kgsl') | ||
34 | if with_freedreno_kgsl | ||
35 | @@ -1076,7 +1076,7 @@ if cc.has_function('reallocarray') | ||
36 | endif | ||
37 | |||
38 | # TODO: this is very incomplete | ||
39 | -if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android'].contains(host_machine.system()) | ||
40 | +if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) or host_machine.system().startswith('linux') | ||
41 | pre_args += '-D_GNU_SOURCE' | ||
42 | elif host_machine.system() == 'sunos' | ||
43 | pre_args += '-D__EXTENSIONS__' | ||
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-util-format-Check-for-NEON-before-using-it.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-util-format-Check-for-NEON-before-using-it.patch deleted file mode 100644 index 6eea5ed8..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-util-format-Check-for-NEON-before-using-it.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From f17e836ef9b1bbc6056790596420b699e48128c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 2 Dec 2021 19:57:42 -0800 | ||
4 | Subject: [PATCH] util/format: Check for NEON before using it | ||
5 | |||
6 | This fixes build on rpi0-w and any other machine which does not have | ||
7 | neon unit and is not used as FPU unit | ||
8 | |||
9 | Fixes errors e.g. | ||
10 | |||
11 | In file included from ../mesa-21.3.0/src/util/format/u_format_unpack_neon.c:35: | ||
12 | /mnt/b/yoe/master/build/tmp/work/arm1176jzfshf-vfp-yoe-linux-gnueabi/mesa/2_21.3.0-r0/recipe-sysroot-native/usr/lib/clang/13.0.1/include/arm_neon.h:32:2: error: "NEON support not enabled" | ||
13 | |||
14 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14032] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | |||
17 | --- | ||
18 | src/util/format/u_format.c | 2 +- | ||
19 | src/util/format/u_format_unpack_neon.c | 2 +- | ||
20 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c | ||
23 | index c071250..0880984 100644 | ||
24 | --- a/src/util/format/u_format.c | ||
25 | +++ b/src/util/format/u_format.c | ||
26 | @@ -1184,7 +1184,7 @@ static void | ||
27 | util_format_unpack_table_init(void) | ||
28 | { | ||
29 | for (enum pipe_format format = PIPE_FORMAT_NONE; format < PIPE_FORMAT_COUNT; format++) { | ||
30 | -#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) | ||
31 | +#if (defined(PIPE_ARCH_AARCH64) || (defined(__ARM_NEON) && defined(PIPE_ARCH_ARM))) && !defined(NO_FORMAT_ASM) | ||
32 | const struct util_format_unpack_description *unpack = util_format_unpack_description_neon(format); | ||
33 | if (unpack) { | ||
34 | util_format_unpack_table[format] = unpack; | ||
35 | diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c | ||
36 | index a4a5cb1..1e4f794 100644 | ||
37 | --- a/src/util/format/u_format_unpack_neon.c | ||
38 | +++ b/src/util/format/u_format_unpack_neon.c | ||
39 | @@ -23,7 +23,7 @@ | ||
40 | |||
41 | #include <u_format.h> | ||
42 | |||
43 | -#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) | ||
44 | +#if (defined(PIPE_ARCH_AARCH64) || (defined(__ARM_NEON) && defined(PIPE_ARCH_ARM))) && !defined(NO_FORMAT_ASM) | ||
45 | |||
46 | /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics | ||
47 | * unless you tell it "no really". | ||
diff --git 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 deleted file mode 100644 index 2f160141..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | # PowerVR Graphics require several patches that have not made their way | ||
2 | # upstream yet. This allows us to build the shims we need without completely | ||
3 | # clobbering mesa. | ||
4 | |||
5 | require recipes-graphics/mesa/mesa-pvr.inc | ||
6 | |||
7 | SUMMARY += " (with PowerVR for TI parts)" | ||
8 | |||
9 | LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10" | ||
10 | |||
11 | BRANCH = "powervr/kirkstone/${PV}" | ||
12 | |||
13 | SRC_URI = " \ | ||
14 | git://gitlab.freedesktop.org/StaticRocket/mesa.git;protocol=https;branch=${BRANCH} \ | ||
15 | file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ | ||
16 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ | ||
17 | file://0001-util-format-Check-for-NEON-before-using-it.patch \ | ||
18 | file://0001-gbm-backend-fix-gbm-compile-without-dri.patch \ | ||
19 | file://0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch \ | ||
20 | file://0001-gallium-Fix-build-with-llvm-17.patch \ | ||
21 | file://0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch \ | ||
22 | file://0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch \ | ||
23 | file://0001-gallium-Fix-build-with-llvm-18-and-19.patch \ | ||
24 | " | ||
25 | |||
26 | PACKAGECONFIG:append = " \ | ||
27 | ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \ | ||
28 | ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ | ||
29 | " | ||
30 | |||
31 | SRCREV = "c9f0919367589b38f5682183846de9d60eec082d" | ||
32 | PV = "22.3.5" | ||
33 | |||
34 | PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss" | ||
35 | PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," | ||
36 | PACKAGECONFIG[sgx] = "-Dgallium-sgx-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," | ||
37 | |||
38 | PACKAGECONFIG:remove = "video-codecs" | ||
39 | PACKAGECONFIG[video-codecs] = "" | ||
40 | PACKAGECONFIG:remove = "elf-tls" | ||
41 | PACKAGECONFIG[elf-tls] = "" | ||
42 | PACKAGECONFIG:remove = "xvmc" | ||
43 | PACKAGECONFIG[xvmc] = "" | ||
44 | |||
45 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
46 | |||
47 | GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}" | ||
48 | GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'sgx', ',sgx', '', d)}" | ||
49 | |||
50 | VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}" | ||
51 | |||
52 | do_install:append () { | ||
53 | # remove pvr custom pkgconfig | ||
54 | rm -rf ${D}${datadir}/pkgconfig | ||
55 | } | ||
56 | |||
57 | FILES:${PN}-dev += "${datadir}/mesa/wayland-drm.xml" | ||
58 | FILES:mesa-vulkan-drivers += "${libdir}/libpvr_mesa_wsi.so" | ||
59 | |||
60 | RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}" | ||
diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb deleted file mode 100644 index 5dc6c211..00000000 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb +++ /dev/null | |||
@@ -1,147 +0,0 @@ | |||
1 | SUMMARY = "Userspace libraries for PowerVR Rogue GPU on TI SoCs" | ||
2 | HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs" | ||
3 | LICENSE = "TI-TFL" | ||
4 | LIC_FILES_CHKSUM = "file://git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" | ||
5 | |||
6 | inherit bin_package | ||
7 | |||
8 | INHIBIT_DEFAULT_DEPS = "" | ||
9 | |||
10 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
11 | COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" | ||
12 | |||
13 | PR = "r3" | ||
14 | |||
15 | BRANCH = "linuxws/kirkstone/k6.1/${PV}" | ||
16 | SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" | ||
17 | SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199" | ||
18 | S:append = "/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}" | ||
19 | |||
20 | TARGET_PRODUCT:j721e = "j721e_linux" | ||
21 | TARGET_PRODUCT:j721s2 = "j721s2_linux" | ||
22 | TARGET_PRODUCT:j784s4 = "j784s4_linux" | ||
23 | TARGET_PRODUCT:am62xx = "am62_linux" | ||
24 | TARGET_PRODUCT:am62pxx = "am62p_linux" | ||
25 | TARGET_PRODUCT:j722s = "j722s_linux" | ||
26 | PVR_BUILD = "release" | ||
27 | PVR_WS = "lws-generic" | ||
28 | |||
29 | RDEPENDS:${PN} = " \ | ||
30 | libdrm \ | ||
31 | ti-img-rogue-driver \ | ||
32 | ${PN}-firmware \ | ||
33 | " | ||
34 | |||
35 | PACKAGECONFIG ?= " \ | ||
36 | ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan wayland', 'vulkan', '', d)} \ | ||
37 | ${@bb.utils.filter('DISTRO_FEATURES', 'opengl opencl', d)} \ | ||
38 | " | ||
39 | |||
40 | PACKAGECONFIG[opengl] = ",,,,${GLES_PACKAGES}" | ||
41 | PACKAGECONFIG[vulkan] = ",,,,${VULKAN_PACKAGES}" | ||
42 | PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}" | ||
43 | |||
44 | def get_file_list(package_list_var, d): | ||
45 | file_list = [] | ||
46 | package_list = d.getVar(package_list_var) | ||
47 | prefix = f"{d.getVar('D')}/" | ||
48 | if package_list: | ||
49 | for package in package_list.split(): | ||
50 | package_file_string = d.getVar(f"FILES:{package}") | ||
51 | if package_file_string: | ||
52 | for package_file in package_file_string.split(): | ||
53 | file_list.append(f"{prefix}{package_file}") | ||
54 | return " ".join(file_list) | ||
55 | |||
56 | do_install:append() { | ||
57 | if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then | ||
58 | for file in ${@get_file_list('GLES_PACKAGES', d)}; do | ||
59 | rm -rf ${file} | ||
60 | done | ||
61 | fi | ||
62 | if ${@bb.utils.contains('PACKAGECONFIG', 'vulkan', 'false', 'true', d)}; then | ||
63 | for file in ${@get_file_list('VULKAN_PACKAGES', d)}; do | ||
64 | rm -rf ${file} | ||
65 | done | ||
66 | fi | ||
67 | if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'false', 'true', d)}; then | ||
68 | for file in ${@get_file_list('OPENCL_PACKAGES', d)}; do | ||
69 | rm -rf ${file} | ||
70 | done | ||
71 | fi | ||
72 | if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then | ||
73 | if [ -e ${D}/lib/firmware ]; then | ||
74 | mv ${D}/lib/firmware ${D}${nonarch_base_libdir} | ||
75 | fi | ||
76 | fi | ||
77 | |||
78 | # clean up any empty directories | ||
79 | find "${D}" -empty -type d -delete | ||
80 | } | ||
81 | |||
82 | GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue" | ||
83 | VULKAN_PACKAGES = "libvk-rogue" | ||
84 | OPENCL_PACKAGES = "libopencl-rogue libopencl-rogue-tools" | ||
85 | |||
86 | PACKAGES = " \ | ||
87 | ${@bb.utils.contains('PACKAGECONFIG', 'opengl', d.getVar('GLES_PACKAGES'), '', d)} \ | ||
88 | ${@bb.utils.contains('PACKAGECONFIG', 'vulkan', d.getVar('VULKAN_PACKAGES'), '', d)} \ | ||
89 | ${@bb.utils.contains('PACKAGECONFIG', 'opencl', d.getVar('OPENCL_PACKAGES'), '', d)} \ | ||
90 | ${PN}-tools \ | ||
91 | ${PN}-firmware \ | ||
92 | ${PN} \ | ||
93 | " | ||
94 | |||
95 | # Inject variables so that packages don't get Debian-renamed (which would | ||
96 | # remove the -rogue suffix), but don't RPROVIDEs/RCONFLICTs on the generic | ||
97 | # libgl name to prevent colliding with swrast libs | ||
98 | python __anonymous() { | ||
99 | suffix = "" | ||
100 | if "-native" in d.getVar("PN"): | ||
101 | suffix = "-native" | ||
102 | for p in (("vulkan", "libvk",), | ||
103 | ("gles", "libgles1", "libglesv1-cm1"), | ||
104 | ("gles", "libgles2", "libglesv2-2"), | ||
105 | ("gles", "libgles3",), | ||
106 | ("opencl", "libopencl",)): | ||
107 | mlprefix = d.getVar("MLPREFIX") | ||
108 | fullp = mlprefix + p[1] + "-rogue" + suffix | ||
109 | mlprefix = d.getVar("MLPREFIX") | ||
110 | pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:]) | ||
111 | d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") | ||
112 | d.setVar("INSANE_SKIP:" + fullp, "dev-so ldflags") | ||
113 | d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}ti-img-rogue-umlibs" + suffix) | ||
114 | } | ||
115 | |||
116 | # gles specific shared objects | ||
117 | FILES:libgles1-rogue = "${libdir}/libGLESv1*.so*" | ||
118 | FILES:libgles2-rogue = "${libdir}/libGLESv2*.so*" | ||
119 | RDEPENDS:libgles1-rogue += "mesa-megadriver" | ||
120 | RDEPENDS:libgles2-rogue += "mesa-megadriver" | ||
121 | |||
122 | # vulkan specific shared objects and configs | ||
123 | FILES:libvk-rogue = "${libdir}/libVK_IMG.so* ${datadir}/vulkan" | ||
124 | RDEPENDS:libvk-rogue += "vulkan-loader wayland libdrm" | ||
125 | |||
126 | # opencl specific shared objects and configs | ||
127 | FILES:libopencl-rogue = "${libdir}/libPVROCL.so* ${sysconfdir}/OpenCL" | ||
128 | RDEPENDS:libopencl-rogue += "opencl-icd-loader" | ||
129 | RRECOMMENDS:libopencl-rogue += "libopencl-rogue-tools" | ||
130 | FILES:libopencl-rogue-tools += "${bindir}/ocl*" | ||
131 | DEBIAN_NOAUTONAME:libopencl-rogue-tools = "1" | ||
132 | INSANE_SKIP:libopencl-rogue-tools = "ldflags" | ||
133 | |||
134 | # optional tools and tests | ||
135 | FILES:${PN}-tools = "${bindir}/" | ||
136 | RDEPENDS:${PN}-tools = "python3-core ${PN}" | ||
137 | INSANE_SKIP:${PN}-tools = "ldflags" | ||
138 | |||
139 | # required firmware | ||
140 | FILES:${PN}-firmware = "${base_libdir}/firmware/*" | ||
141 | INSANE_SKIP:${PN}-firmware += "arch" | ||
142 | |||
143 | RRECOMMENDS:${PN} += " \ | ||
144 | ${PN}-tools \ | ||
145 | " | ||
146 | |||
147 | INSANE_SKIP:${PN} += "already-stripped dev-so ldflags" | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig deleted file mode 100644 index 24b53cf7..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | use-kernel-config=multi_v7_defconfig | ||
2 | config-fragment=kernel/configs/ti_multi_v7_prune.config | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig deleted file mode 100644 index ef1d3efd..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | use-kernel-config=defconfig | ||
2 | config-fragment=kernel/configs/ti_arm64_prune.config | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig deleted file mode 100644 index 099493af..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | use-kernel-config=davinci_all_defconfig | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti33x/defconfig deleted file mode 100644 index e6a967e1..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti33x/defconfig +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | use-kernel-config=multi_v7_defconfig | ||
2 | config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti43x/defconfig deleted file mode 100644 index e6a967e1..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti43x/defconfig +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | use-kernel-config=multi_v7_defconfig | ||
2 | config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig deleted file mode 100644 index 43089dc8..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | use-kernel-config=multi_v7_defconfig | ||
2 | config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig deleted file mode 100644 index 47d78664..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | use-kernel-config=defconfig | ||
2 | config-fragment=kernel/configs/ti_arm64_prune.config kernel/configs/ti_rt.config | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig deleted file mode 100644 index 2c829c0b..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | use-kernel-config=davinci_all_defconfig | ||
2 | config-fragment=kernel/configs/ti_rt.config | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti33x/defconfig deleted file mode 100644 index 5de2b229..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti33x/defconfig +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | use-kernel-config=multi_v7_defconfig | ||
2 | config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti43x/defconfig deleted file mode 100644 index 5de2b229..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti43x/defconfig +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | use-kernel-config=multi_v7_defconfig | ||
2 | config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb deleted file mode 100644 index 9fe0eb02..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | require linux-ti-staging_6.1.bb | ||
2 | |||
3 | KERNEL_LOCALVERSION:append = "-rt" | ||
4 | |||
5 | # Look in the generic major.minor directory for files | ||
6 | # This will have priority over generic non-rt path | ||
7 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" | ||
8 | |||
9 | BRANCH = "ti-rt-linux-6.1.y" | ||
10 | |||
11 | SRCREV = "9e8992fb839c642e3c20ee8ce69a30dbaae7f498" | ||
12 | |||
13 | include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''} | ||
14 | |||
15 | PV = "6.1.119+git" | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb index 974bf1d7..7240db0e 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb | |||
@@ -10,7 +10,7 @@ BRANCH_ARM64 = "ti-linux-6.12.y" | |||
10 | BRANCH = "${BRANCH_ARM64}" | 10 | BRANCH = "${BRANCH_ARM64}" |
11 | 11 | ||
12 | BRANCH_ARM32 = "ti-rt-linux-6.12.y-arm32" | 12 | BRANCH_ARM32 = "ti-rt-linux-6.12.y-arm32" |
13 | SRCREV_ARM32 = "f0e4f5ca0905956c70779b31663f594c08c6a3bc" | 13 | SRCREV_ARM32 = "b5ee9420d81f46861c4f0a172154e477feda1980" |
14 | PV_ARM32 = "6.12.35+git" | 14 | PV_ARM32 = "6.12.35+git" |
15 | 15 | ||
16 | BRANCH:ti33x = "${BRANCH_ARM32}" | 16 | BRANCH:ti33x = "${BRANCH_ARM32}" |
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 deleted file mode 100644 index c1d5f87e..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | SECTION = "kernel" | ||
2 | SUMMARY = "Linux kernel for TI devices" | ||
3 | LICENSE = "GPL-2.0-only" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | ||
5 | |||
6 | inherit ${KERNEL_BASE_CLASS} | ||
7 | |||
8 | require recipes-kernel/linux/setup-defconfig.inc | ||
9 | require recipes-kernel/linux/ti-kernel.inc | ||
10 | include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} | ||
11 | include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} | ||
12 | |||
13 | DEPENDS += "gmp-native libmpc-native" | ||
14 | |||
15 | # Look in the generic major.minor directory for files | ||
16 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" | ||
17 | |||
18 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ | ||
19 | ${EXTRA_DTC_ARGS}" | ||
20 | |||
21 | S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" | ||
22 | |||
23 | BRANCH ?= "ti-linux-6.1.y" | ||
24 | |||
25 | SRCREV ?= "e4e8b16e66f592749984b2d287e0479e93ef35b3" | ||
26 | PV = "6.1.119+git" | ||
27 | |||
28 | # Special configuration for remoteproc/rpmsg IPC modules | ||
29 | module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" | ||
30 | module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus" | ||
31 | module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus" | ||
32 | KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc" | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb index f5caad62..40742fe6 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb | |||
@@ -22,7 +22,7 @@ S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" | |||
22 | 22 | ||
23 | BRANCH ?= "ti-linux-6.12.y" | 23 | BRANCH ?= "ti-linux-6.12.y" |
24 | 24 | ||
25 | SRCREV ?= "78e6abff322081d53c5a685d927476086c9b2846" | 25 | SRCREV ?= "72f48d59b8f087fa0dd1f1e8c2c0b5bc0baa537c" |
26 | PV = "6.12.35+git" | 26 | PV = "6.12.35+git" |
27 | 27 | ||
28 | KERNEL_REPRODUCIBILITY_PATCHES = " \ | 28 | KERNEL_REPRODUCIBILITY_PATCHES = " \ |
diff --git a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in index ca042be1..ae38daa7 100644 --- a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in +++ b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in | |||
@@ -3,6 +3,6 @@ | |||
3 | # supports EFI. Boot files are located in the first vfat partition with extra | 3 | # supports EFI. Boot files are located in the first vfat partition with extra |
4 | # reserved space. We cannot use a GPT here. | 4 | # reserved space. We cannot use a GPT here. |
5 | 5 | ||
6 | bootloader --timeout=3 --append="rootfstype=ext4" | 6 | bootloader --timeout=3 --append="rootfstype=ext4 ${TI_WKS_BOOTLOADER_APPEND}" |
7 | part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M | 7 | part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M |
8 | part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid | 8 | part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid |
diff --git a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb index 73b582a2..84d00eed 100644 --- a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +++ b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb | |||
@@ -8,9 +8,9 @@ inherit update-alternatives | |||
8 | 8 | ||
9 | BRANCH = "master" | 9 | BRANCH = "master" |
10 | SRC_URI = "git://git.ti.com/git/pru-software-support-package/pru-software-support-package.git;protocol=https;branch=${BRANCH}" | 10 | SRC_URI = "git://git.ti.com/git/pru-software-support-package/pru-software-support-package.git;protocol=https;branch=${BRANCH}" |
11 | SRCREV = "00a5efa5157feb84cb2e4bf50b481f7082acca82" | 11 | SRCREV = "5584926fa3721274e61c5473593cfb7f9f4284d4" |
12 | 12 | ||
13 | PV = "6.3.0" | 13 | PV = "6.5.0" |
14 | 14 | ||
15 | require recipes-ti/includes/ti-paths.inc | 15 | require recipes-ti/includes/ti-paths.inc |
16 | 16 | ||