diff options
author | Andrew Davis <afd@ti.com> | 2025-01-08 14:51:45 -0600 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2025-01-22 15:08:56 -0600 |
commit | 417aa872fd86428ce3a1970aa532a1baea5387d5 (patch) | |
tree | 487ff139fe03b945f730615d812ed82448db37b6 | |
parent | e97be59f71caf48207bb3742248b4bef84ec1176 (diff) | |
download | meta-ti-417aa872fd86428ce3a1970aa532a1baea5387d5.tar.gz |
ti-bsp: Disable GC320 support conditionally on BSP version
Like we do with GPU support, GC320 support is conditional on the
kernel we are building and so should be disabled here for kernels
on which it is not functional yet.
We can then remove these disabling lines as the driver is updated
for each supported kernel, instead of blanket disabling in the
distro layer as done currently.
Signed-off-by: Andrew Davis <afd@ti.com>
-rw-r--r-- | meta-beagle/conf/machine/include/beagle-bsp.inc | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/ti-bsp.inc | 15 |
2 files changed, 21 insertions, 0 deletions
diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc index 34889b41..06483ba9 100644 --- a/meta-beagle/conf/machine/include/beagle-bsp.inc +++ b/meta-beagle/conf/machine/include/beagle-bsp.inc | |||
@@ -23,6 +23,9 @@ BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_1 = "23%" | |||
23 | BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_1 = "23%" | 23 | BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_1 = "23%" |
24 | BSP_MESA_PVR_VERSION:bsp-bb_org-6_1 = "22%" | 24 | BSP_MESA_PVR_VERSION:bsp-bb_org-6_1 = "22%" |
25 | 25 | ||
26 | # GC320 support requires out-of-tree drivers not yet available in bb.org 6.1 | ||
27 | MACHINE_FEATURES:remove:bsp-bb_org-6_1 = "gc320" | ||
28 | |||
26 | # ========== | 29 | # ========== |
27 | # bb_org-6_6 | 30 | # bb_org-6_6 |
28 | # BeagleBoard.org kernel 6.6, Upstream u-boot 2024.07 | 31 | # BeagleBoard.org kernel 6.6, Upstream u-boot 2024.07 |
@@ -41,3 +44,6 @@ BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver" | |||
41 | BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%" | 44 | BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%" |
42 | BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%" | 45 | BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%" |
43 | BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "23%" | 46 | BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "23%" |
47 | |||
48 | # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6 | ||
49 | MACHINE_FEATURES:remove:bsp-bb_org-6_6 = "gc320" | ||
diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index d7861609..0d519671 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc | |||
@@ -22,6 +22,9 @@ BSP_BOOTLOADER_VERSION:bsp-mainline = "%" | |||
22 | # in mainline, usually present in TI staging or derivative like BB.org | 22 | # in mainline, usually present in TI staging or derivative like BB.org |
23 | MACHINE_FEATURES:remove:bsp-mainline = "gpu" | 23 | MACHINE_FEATURES:remove:bsp-mainline = "gpu" |
24 | 24 | ||
25 | # GC320 support requires out-of-tree drivers not available in mainline | ||
26 | MACHINE_FEATURES:remove:bsp-mainline = "gc320" | ||
27 | |||
25 | # ========== | 28 | # ========== |
26 | # next | 29 | # next |
27 | # upcoming upstream/mainline kernel, u-boot | 30 | # upcoming upstream/mainline kernel, u-boot |
@@ -35,6 +38,9 @@ BSP_BOOTLOADER_VERSION:bsp-next = "%" | |||
35 | # in next, usually present in TI staging or derivative like BB.org | 38 | # in next, usually present in TI staging or derivative like BB.org |
36 | MACHINE_FEATURES:remove:bsp-next = "gpu" | 39 | MACHINE_FEATURES:remove:bsp-next = "gpu" |
37 | 40 | ||
41 | # GC320 support requires out-of-tree drivers not yet available in next | ||
42 | MACHINE_FEATURES:remove:bsp-next = "gc320" | ||
43 | |||
38 | # ========== | 44 | # ========== |
39 | # ti-6_12 | 45 | # ti-6_12 |
40 | # TI staging kernel 6.12, u-boot 2025.01 | 46 | # TI staging kernel 6.12, u-boot 2025.01 |
@@ -48,6 +54,9 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%" | |||
48 | # in 6.12 yet | 54 | # in 6.12 yet |
49 | MACHINE_FEATURES:remove:bsp-ti-6_12 = "gpu" | 55 | MACHINE_FEATURES:remove:bsp-ti-6_12 = "gpu" |
50 | 56 | ||
57 | # GC320 support requires out-of-tree drivers not yet available in 6.12 | ||
58 | MACHINE_FEATURES:remove:bsp-ti-6_12 = "gc320" | ||
59 | |||
51 | # ========== | 60 | # ========== |
52 | # ti-6_6 | 61 | # ti-6_6 |
53 | # TI staging kernel 6.6, u-boot 2024.04 | 62 | # TI staging kernel 6.6, u-boot 2024.04 |
@@ -65,6 +74,9 @@ BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%" | |||
65 | BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%" | 74 | BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%" |
66 | BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%" | 75 | BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%" |
67 | 76 | ||
77 | # GC320 support requires out-of-tree drivers not yet available in 6.6 | ||
78 | MACHINE_FEATURES:remove:bsp-ti-6_6 = "gc320" | ||
79 | |||
68 | # ========== | 80 | # ========== |
69 | # ti-6_1 | 81 | # ti-6_1 |
70 | # TI staging kernel 6.1, u-boot 2023.04 | 82 | # TI staging kernel 6.1, u-boot 2023.04 |
@@ -82,6 +94,9 @@ BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_1 = "23%" | |||
82 | BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_1 = "23%" | 94 | BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_1 = "23%" |
83 | BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%" | 95 | BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%" |
84 | 96 | ||
97 | # GC320 support requires out-of-tree drivers not yet available in 6.1 | ||
98 | MACHINE_FEATURES:remove:bsp-ti-6_1 = "gc320" | ||
99 | |||
85 | # ========== | 100 | # ========== |
86 | # sane fallback defaults | 101 | # sane fallback defaults |
87 | # if specific values are not defined or bsp is set incorrectly | 102 | # if specific values are not defined or bsp is set incorrectly |