diff options
Diffstat (limited to 'meta-ti-bsp')
20 files changed, 131 insertions, 43 deletions
diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf index 601cbbf7..e38029ff 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | |||
@@ -4,9 +4,6 @@ | |||
4 | 4 | ||
5 | require conf/machine/include/k3r5.inc | 5 | require conf/machine/include/k3r5.inc |
6 | 6 | ||
7 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" | ||
8 | PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" | ||
9 | |||
10 | SYSFW_SOC = "am62x" | 7 | SYSFW_SOC = "am62x" |
11 | SYSFW_CONFIG = "evm" | 8 | SYSFW_CONFIG = "evm" |
12 | SYSFW_SUFFIX = "gp" | 9 | SYSFW_SUFFIX = "gp" |
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf index 02bc6566..a09c0d13 100644 --- a/meta-ti-bsp/conf/machine/beagleplay.conf +++ b/meta-ti-bsp/conf/machine/beagleplay.conf | |||
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "screen gpu" | |||
11 | SERIAL_CONSOLES = "115200;ttyS2" | 11 | SERIAL_CONSOLES = "115200;ttyS2" |
12 | 12 | ||
13 | require conf/machine/include/mesa-pvr.inc | 13 | require conf/machine/include/mesa-pvr.inc |
14 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 14 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" |
15 | 15 | ||
16 | TFA_BOARD = "lite" | 16 | TFA_BOARD = "lite" |
17 | TFA_K3_SYSTEM_SUSPEND = "1" | 17 | TFA_K3_SYSTEM_SUSPEND = "1" |
@@ -25,9 +25,6 @@ UBOOT_MACHINE = "am62x_evm_a53_defconfig" | |||
25 | # under meta-ti-bsp/recipes-bsp/u-boot/ for more details. | 25 | # under meta-ti-bsp/recipes-bsp/u-boot/ for more details. |
26 | UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config" | 26 | UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config" |
27 | 27 | ||
28 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" | ||
29 | PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" | ||
30 | |||
31 | KERNEL_DEVICETREE_PREFIX = " \ | 28 | KERNEL_DEVICETREE_PREFIX = " \ |
32 | ti/k3-am625 \ | 29 | ti/k3-am625 \ |
33 | ti/k3-am62x-sk \ | 30 | ti/k3-am62x-sk \ |
diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc index 38e35851..a2825905 100644 --- a/meta-ti-bsp/conf/machine/include/am62pxx.inc +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc | |||
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am62pxx" | |||
4 | MACHINE_FEATURES += "screen gpu" | 4 | MACHINE_FEATURES += "screen gpu" |
5 | 5 | ||
6 | require conf/machine/include/mesa-pvr.inc | 6 | require conf/machine/include/mesa-pvr.inc |
7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" |
8 | 8 | ||
9 | # Default tiboot3.bin on AM62Px is for HS-FS | 9 | # Default tiboot3.bin on AM62Px is for HS-FS |
10 | IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" | 10 | IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" |
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index a0ec944f..070a691b 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc | |||
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am62xx" | |||
4 | MACHINE_FEATURES += "screen gpu" | 4 | MACHINE_FEATURES += "screen gpu" |
5 | 5 | ||
6 | require conf/machine/include/mesa-pvr.inc | 6 | require conf/machine/include/mesa-pvr.inc |
7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" |
8 | 8 | ||
9 | # Default tiboot3.bin on AM62x is for HS-FS | 9 | # Default tiboot3.bin on AM62x is for HS-FS |
10 | IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" | 10 | IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" |
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 48b89638..e033c09b 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc | |||
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am65xx" | |||
4 | MACHINE_FEATURES += "screen touchscreen gpu" | 4 | MACHINE_FEATURES += "screen touchscreen gpu" |
5 | 5 | ||
6 | require conf/machine/include/mesa-pvr.inc | 6 | require conf/machine/include/mesa-pvr.inc |
7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "" | 7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" |
8 | 8 | ||
9 | KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" | 9 | KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" |
10 | 10 | ||
diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc index cb3d1026..327366be 100644 --- a/meta-ti-bsp/conf/machine/include/am68.inc +++ b/meta-ti-bsp/conf/machine/include/am68.inc | |||
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j721s2" | |||
4 | MACHINE_FEATURES += "screen gpu" | 4 | MACHINE_FEATURES += "screen gpu" |
5 | 5 | ||
6 | require conf/machine/include/mesa-pvr.inc | 6 | require conf/machine/include/mesa-pvr.inc |
7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" |
8 | 8 | ||
9 | # Default tiboot3.bin on AM68 is for SR1.0 HS-FS | 9 | # Default tiboot3.bin on AM68 is for SR1.0 HS-FS |
10 | IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" | 10 | IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" |
diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc index 81be1397..488f9c33 100644 --- a/meta-ti-bsp/conf/machine/include/am69.inc +++ b/meta-ti-bsp/conf/machine/include/am69.inc | |||
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j784s4" | |||
4 | MACHINE_FEATURES += "screen gpu" | 4 | MACHINE_FEATURES += "screen gpu" |
5 | 5 | ||
6 | require conf/machine/include/mesa-pvr.inc | 6 | require conf/machine/include/mesa-pvr.inc |
7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" |
8 | 8 | ||
9 | # Default tiboot3.bin on AM69 is for SR1.0 HS-FS | 9 | # Default tiboot3.bin on AM69 is for SR1.0 HS-FS |
10 | IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" | 10 | IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" |
diff --git a/meta-ti-bsp/conf/machine/include/beagle.inc b/meta-ti-bsp/conf/machine/include/beagle.inc index 27e3298d..4d5942c2 100644 --- a/meta-ti-bsp/conf/machine/include/beagle.inc +++ b/meta-ti-bsp/conf/machine/include/beagle.inc | |||
@@ -1,3 +1 @@ | |||
1 | TI_PREFERRED_BSP ?= "bb_org" | ||
2 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-bb.org" | ||
3 | |||
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 6040feb0..a54c3f2f 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc | |||
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j721e" | |||
4 | MACHINE_FEATURES += "screen gpu" | 4 | MACHINE_FEATURES += "screen gpu" |
5 | 5 | ||
6 | require conf/machine/include/mesa-pvr.inc | 6 | require conf/machine/include/mesa-pvr.inc |
7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" |
8 | 8 | ||
9 | IMAGE_BOOT_FILES += "sysfw.itb" | 9 | IMAGE_BOOT_FILES += "sysfw.itb" |
10 | 10 | ||
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 5289ec5a..9cd88d9b 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc | |||
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j721s2" | |||
4 | MACHINE_FEATURES += "screen gpu" | 4 | MACHINE_FEATURES += "screen gpu" |
5 | 5 | ||
6 | require conf/machine/include/mesa-pvr.inc | 6 | require conf/machine/include/mesa-pvr.inc |
7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" |
8 | 8 | ||
9 | # Default tiboot3.bin on J721S2 is for GP | 9 | # Default tiboot3.bin on J721S2 is for GP |
10 | IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" | 10 | IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" |
diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc index 3b051f1b..3c0717a0 100644 --- a/meta-ti-bsp/conf/machine/include/j722s.inc +++ b/meta-ti-bsp/conf/machine/include/j722s.inc | |||
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j722s" | |||
4 | MACHINE_FEATURES += "screen gpu" | 4 | MACHINE_FEATURES += "screen gpu" |
5 | 5 | ||
6 | require conf/machine/include/mesa-pvr.inc | 6 | require conf/machine/include/mesa-pvr.inc |
7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" |
8 | 8 | ||
9 | # Default tiboot3.bin on J722S is for HS-FS | 9 | # Default tiboot3.bin on J722S is for HS-FS |
10 | IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" | 10 | IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" |
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index 92062cdf..883c4a6e 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc | |||
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j784s4" | |||
4 | MACHINE_FEATURES += "screen gpu" | 4 | MACHINE_FEATURES += "screen gpu" |
5 | 5 | ||
6 | require conf/machine/include/mesa-pvr.inc | 6 | require conf/machine/include/mesa-pvr.inc |
7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 7 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" |
8 | 8 | ||
9 | # Default tiboot3.bin on J784S4 is for GP | 9 | # Default tiboot3.bin on J784S4 is for GP |
10 | IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" | 10 | IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" |
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index e3da9e12..2b82cb82 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc | |||
@@ -10,9 +10,7 @@ BBMULTICONFIG += "k3r5" | |||
10 | # Increase this everytime you change something in the kernel | 10 | # Increase this everytime you change something in the kernel |
11 | MACHINE_KERNEL_PR = "r0" | 11 | MACHINE_KERNEL_PR = "r0" |
12 | 12 | ||
13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" | 13 | require conf/machine/include/ti-bsp.inc |
14 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" | ||
15 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" | ||
16 | 14 | ||
17 | KERNEL_IMAGETYPE = "Image" | 15 | KERNEL_IMAGETYPE = "Image" |
18 | KERNEL_IMAGETYPES = "Image fitImage" | 16 | KERNEL_IMAGETYPES = "Image fitImage" |
diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index 63267a5e..fcd54254 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc | |||
@@ -11,9 +11,9 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc | |||
11 | # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst | 11 | # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst |
12 | # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst | 12 | # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst |
13 | # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst | 13 | # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst |
14 | |||
15 | require conf/machine/include/ti-bsp.inc | ||
14 | PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" | 16 | PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" |
15 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" | ||
16 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" | ||
17 | 17 | ||
18 | SPL_SUFFIX = "bin" | 18 | SPL_SUFFIX = "bin" |
19 | SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" | 19 | SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" |
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index 9ca41403..3637ad0a 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc | |||
@@ -7,13 +7,11 @@ require conf/machine/include/arm/armv7a/tune-cortexa15.inc | |||
7 | # Increase this everytime you change something in the kernel | 7 | # Increase this everytime you change something in the kernel |
8 | MACHINE_KERNEL_PR = "r7" | 8 | MACHINE_KERNEL_PR = "r7" |
9 | 9 | ||
10 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" | 10 | require conf/machine/include/ti-bsp.inc |
11 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" | ||
12 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" | ||
13 | 11 | ||
14 | # Graphics providers and variables | 12 | # Graphics providers and variables |
15 | require conf/machine/include/mesa-pvr.inc | 13 | require conf/machine/include/mesa-pvr.inc |
16 | PREFERRED_PROVIDER_virtual/gpudriver ?= "" | 14 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" |
17 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" | 15 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" |
18 | 16 | ||
19 | KERNEL_IMAGETYPE = "zImage" | 17 | KERNEL_IMAGETYPE = "zImage" |
diff --git a/meta-ti-bsp/conf/machine/include/omapl138.inc b/meta-ti-bsp/conf/machine/include/omapl138.inc index 7f8262a5..486de05d 100644 --- a/meta-ti-bsp/conf/machine/include/omapl138.inc +++ b/meta-ti-bsp/conf/machine/include/omapl138.inc | |||
@@ -5,9 +5,7 @@ require conf/machine/include/arm/armv5/tune-arm926ejs.inc | |||
5 | 5 | ||
6 | KERNEL_IMAGETYPE = "zImage" | 6 | KERNEL_IMAGETYPE = "zImage" |
7 | 7 | ||
8 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" | 8 | require conf/machine/include/ti-bsp.inc |
9 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" | ||
10 | PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" | ||
11 | 9 | ||
12 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" | 10 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" |
13 | 11 | ||
diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc new file mode 100644 index 00000000..953737a0 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc | |||
@@ -0,0 +1,109 @@ | |||
1 | # Support multiple BSP providers | ||
2 | # The main input is TI_PREFERRED_BSP, which translates into default | ||
3 | # preferences for kernel, bootloader and graphics components, as | ||
4 | # well as a dedicated machine override. | ||
5 | |||
6 | # Supported options are: mainline, ti-6_6, ti-6_1, bb_org | ||
7 | TI_PREFERRED_BSP ??= "ti-6_6" | ||
8 | |||
9 | # Use bsp-* namespace for overrides | ||
10 | MACHINEOVERRIDES =. "bsp-${TI_PREFERRED_BSP}:" | ||
11 | |||
12 | # ========== | ||
13 | # mainline | ||
14 | # latest upstream/mainline kernel, u-boot | ||
15 | # ========== | ||
16 | BSP_KERNEL_PROVIDER:bsp-mainline = "linux-ti-mainline" | ||
17 | BSP_KERNEL_VERSION:bsp-mainline = "%" | ||
18 | BSP_BOOTLOADER_PROVIDER:bsp-mainline = "u-boot-ti-mainline" | ||
19 | BSP_BOOTLOADER_VERSION:bsp-mainline = "%" | ||
20 | |||
21 | # GPU support requires out-of-tree SGX and Rogue drivers not available | ||
22 | # in mainline, usually present in TI staging or derivative like BB.org | ||
23 | MACHINE_FEATURES:remove:bsp-mainline = "gpu" | ||
24 | |||
25 | # ========== | ||
26 | # ti-6_6 | ||
27 | # TI staging kernel 6.6, u-boot 2024.04 | ||
28 | # ========== | ||
29 | BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging" | ||
30 | BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6%" | ||
31 | BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging" | ||
32 | BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024%" | ||
33 | |||
34 | # Only Rogue is enabled so far, SGX falls back to SW rendering | ||
35 | BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver" | ||
36 | BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%" | ||
37 | BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%" | ||
38 | BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%" | ||
39 | |||
40 | # ========== | ||
41 | # ti-6_1 | ||
42 | # TI staging kernel 6.1, u-boot 2023.04 | ||
43 | # ========== | ||
44 | BSP_KERNEL_PROVIDER:bsp-ti-6_1 = "linux-ti-staging" | ||
45 | BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1%" | ||
46 | BSP_BOOTLOADER_PROVIDER:bsp-ti-6_1 = "u-boot-ti-staging" | ||
47 | BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023%" | ||
48 | |||
49 | BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km" | ||
50 | BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%" | ||
51 | BSP_SGX_UMLIBS_VERSION:bsp-ti-6_1 = "1.17%" | ||
52 | BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-img-rogue-driver" | ||
53 | BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_1 = "23%" | ||
54 | BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_1 = "23%" | ||
55 | BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%" | ||
56 | |||
57 | # ========== | ||
58 | # bb_org | ||
59 | # BeagleBoard.org kernel 6.1, u-boot 2023.04 | ||
60 | # based on TI staging trees with extra Beagle-specific features | ||
61 | # but may not be up-to-date with TI version | ||
62 | # ========== | ||
63 | BSP_KERNEL_PROVIDER:bsp-bb_org = "linux-bb.org" | ||
64 | BSP_KERNEL_VERSION:bsp-bb_org = "%" | ||
65 | BSP_BOOTLOADER_PROVIDER:bsp-bb_org = "u-boot-bb.org" | ||
66 | BSP_BOOTLOADER_VERSION:bsp-bb_org = "%" | ||
67 | |||
68 | BSP_SGX_DRIVER_PROVIDER:bsp-bb_org = "ti-sgx-ddk-km" | ||
69 | BSP_SGX_DRIVER_VERSION:bsp-bb_org = "1.17%" | ||
70 | BSP_SGX_UMLIBS_VERSION:bsp-bb_org = "1.17%" | ||
71 | BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org = "ti-img-rogue-driver" | ||
72 | BSP_ROGUE_DRIVER_VERSION:bsp-bb_org = "23%" | ||
73 | BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org = "23%" | ||
74 | BSP_MESA_PVR_VERSION:bsp-bb_org = "22%" | ||
75 | |||
76 | # ========== | ||
77 | # sane fallback defaults | ||
78 | # if specific values are not defined or bsp is set incorrectly | ||
79 | # use default preference TI staging and SW-rendering graphics | ||
80 | # ========== | ||
81 | BSP_KERNEL_PROVIDER ?= "linux-ti-staging" | ||
82 | BSP_KERNEL_VERSION ?= "%" | ||
83 | BSP_BOOTLOADER_PROVIDER ?= "u-boot-ti-staging" | ||
84 | BSP_BOOTLOADER_VERSION ?= "%" | ||
85 | |||
86 | BSP_SGX_DRIVER_PROVIDER ?= "" | ||
87 | BSP_SGX_DRIVER_VERSION ?= "" | ||
88 | BSP_ROGUE_DRIVER_PROVIDER ?= "" | ||
89 | BSP_ROGUE_DRIVER_VERSION ?= "" | ||
90 | BSP_SGX_UMLIBS_VERSION ?= "" | ||
91 | BSP_ROGUE_UMLIBS_VERSION ?= "" | ||
92 | BSP_MESA_PVR_VERSION ?= "" | ||
93 | |||
94 | # ========== | ||
95 | # global preferences | ||
96 | # ========== | ||
97 | PREFERRED_PROVIDER_virtual/kernel ?= "${BSP_KERNEL_PROVIDER}" | ||
98 | PREFERRED_VERSION_${BSP_KERNEL_PROVIDER} ?= "${BSP_KERNEL_VERSION}" | ||
99 | PREFERRED_PROVIDER_virtual/bootloader ?= "${BSP_BOOTLOADER_PROVIDER}" | ||
100 | PREFERRED_PROVIDER_u-boot ?= "${BSP_BOOTLOADER_PROVIDER}" | ||
101 | PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}" | ||
102 | |||
103 | # GPU provider gets set in machine configs, as some machines are headless | ||
104 | # Select default preferred versions here | ||
105 | PREFERRED_VERSION_ti-sgx-ddk-km ?= "${BSP_SGX_DRIVER_VERSION}" | ||
106 | PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_UMLIBS_VERSION}" | ||
107 | PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}" | ||
108 | PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_UMLIBS_VERSION}" | ||
109 | PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}" | ||
diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc index a1fd3cbf..5d77e719 100644 --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc | |||
@@ -1,9 +1,8 @@ | |||
1 | # This is a generic TI SOC family. It is a superset of all other SOCs | 1 | # This is a generic TI SOC family. It is a superset of all other SOCs |
2 | # and platforms defined in meta-ti to allow BSP-level overrides. | 2 | # and platforms defined in meta-ti to allow BSP-level overrides. |
3 | SOC_FAMILY = "ti-soc" | 3 | SOC_FAMILY = "ti-soc" |
4 | require conf/machine/include/soc-family.inc | ||
4 | 5 | ||
5 | # TI platforms all use devicetrees with overlays | 6 | # TI platforms all use devicetrees with overlays |
6 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" | 7 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" |
7 | KERNEL_DTB_OVERLAY_SUPPORT ?= "1" | 8 | KERNEL_DTB_OVERLAY_SUPPORT ?= "1" |
8 | |||
9 | require conf/machine/include/soc-family.inc | ||
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index 6fd65b2d..45934aa0 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc | |||
@@ -7,14 +7,11 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc | |||
7 | # Increase this everytime you change something in the kernel | 7 | # Increase this everytime you change something in the kernel |
8 | MACHINE_KERNEL_PR = "r22" | 8 | MACHINE_KERNEL_PR = "r22" |
9 | 9 | ||
10 | # Default providers, may need to override for specific machines | 10 | require conf/machine/include/ti-bsp.inc |
11 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" | ||
12 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" | ||
13 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" | ||
14 | 11 | ||
15 | # Graphics providers and variables | 12 | # Graphics providers and variables |
16 | require conf/machine/include/mesa-pvr.inc | 13 | require conf/machine/include/mesa-pvr.inc |
17 | PREFERRED_PROVIDER_virtual/gpudriver ?= "" | 14 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" |
18 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" | 15 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" |
19 | 16 | ||
20 | KERNEL_IMAGETYPE = "zImage" | 17 | KERNEL_IMAGETYPE = "zImage" |
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index 0a3ef4c3..c6a3c510 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc | |||
@@ -7,14 +7,11 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc | |||
7 | # Increase this everytime you change something in the kernel | 7 | # Increase this everytime you change something in the kernel |
8 | MACHINE_KERNEL_PR = "r3" | 8 | MACHINE_KERNEL_PR = "r3" |
9 | 9 | ||
10 | # Default providers, may need to override for specific machines | 10 | require conf/machine/include/ti-bsp.inc |
11 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" | ||
12 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" | ||
13 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" | ||
14 | 11 | ||
15 | # Graphics providers and variables | 12 | # Graphics providers and variables |
16 | require conf/machine/include/mesa-pvr.inc | 13 | require conf/machine/include/mesa-pvr.inc |
17 | PREFERRED_PROVIDER_virtual/gpudriver ?= "" | 14 | PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" |
18 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" | 15 | PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" |
19 | 16 | ||
20 | KERNEL_IMAGETYPE = "zImage" | 17 | KERNEL_IMAGETYPE = "zImage" |