From: Denys Dmytriyenko <[email protected]> With the addition of multi-BSP support in meta-ti, some branding configs can be simplified significantly.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../conf/distro/include/branding-ltsprep.inc | 17 +---------------- .../conf/distro/include/branding-mainline.inc | 10 +--------- .../conf/distro/include/branding-next.inc | 9 ++------- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/meta-arago-distro/conf/distro/include/branding-ltsprep.inc b/meta-arago-distro/conf/distro/include/branding-ltsprep.inc index 4853f3c6..1b295adf 100644 --- a/meta-arago-distro/conf/distro/include/branding-ltsprep.inc +++ b/meta-arago-distro/conf/distro/include/branding-ltsprep.inc @@ -1,11 +1,4 @@ - -PREFERRED_VERSION_linux-ti-staging = "6.6%" -PREFERRED_VERSION_linux-ti-staging-rt = "6.6%" -PREFERRED_VERSION_linux-ti-staging-systest = "6.6%" -PREFERRED_VERSION_u-boot-ti-staging = "2024.04%" -PREFERRED_VERSION_ti-img-rogue-umlibs = "24.1.6554834" -PREFERRED_VERSION_ti-img-rogue-driver = "24.1.6554834" -PREFERRED_VERSION_mesa-pvr = "23.2.1" +TI_DEFAULT_BSP = "ti-6_6" # Remove mmip - DRM allocator, KMS sink, Wayland sink need porting to GST 1.18 MACHINE_FEATURES:remove = "mmip" @@ -13,11 +6,3 @@ MACHINE_FEATURES:remove = "mmip" # GC320 support requires out-of-tree drivers not available in until LTS prep is # complete. Disable for now. MACHINE_FEATURES:remove = "gc320" - -PREFERRED_PROVIDER_virtual/gpudriver:am335x-evm = "" -PREFERRED_PROVIDER_virtual/gpudriver:am335x-hs-evm = "" -PREFERRED_PROVIDER_virtual/gpudriver:am437x-evm = "" -PREFERRED_PROVIDER_virtual/gpudriver:am437x-hs-evm = "" -PREFERRED_PROVIDER_virtual/gpudriver:am57xx-evm = "" -PREFERRED_PROVIDER_virtual/gpudriver:am57xx-hs-evm = "" -PREFERRED_PROVIDER_virtual/gpudriver:am65xx-evm = "" diff --git a/meta-arago-distro/conf/distro/include/branding-mainline.inc b/meta-arago-distro/conf/distro/include/branding-mainline.inc index 613e76f9..245fa19b 100644 --- a/meta-arago-distro/conf/distro/include/branding-mainline.inc +++ b/meta-arago-distro/conf/distro/include/branding-mainline.inc @@ -1,9 +1 @@ -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-mainline" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-mainline" -PREFERRED_PROVIDER_u-boot = "u-boot-ti-mainline" -SRCREV_ti-upstream-tools:pn-linux-ti-mainline = "${AUTOREV}" - -# GPU support requires out-of-tree SGX and RGX drivers not available in mainline -# fall back to software rendering -MACHINE_FEATURES:remove = "gpu" -PREFERRED_PROVIDER_virtual/gpudriver = "" +TI_DEFAULT_BSP = "mainline" diff --git a/meta-arago-distro/conf/distro/include/branding-next.inc b/meta-arago-distro/conf/distro/include/branding-next.inc index 20291041..3b504aa1 100644 --- a/meta-arago-distro/conf/distro/include/branding-next.inc +++ b/meta-arago-distro/conf/distro/include/branding-next.inc @@ -1,10 +1,5 @@ +TI_DEFAULT_BSP = "mainline" PREFERRED_PROVIDER_virtual/kernel = "linux-ti-next" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-mainline" -PREFERRED_PROVIDER_u-boot = "u-boot-ti-mainline" + SRCREV:pn-linux-ti-next = "${AUTOREV}" SRCREV:pn-u-boot-ti-mainline = "${AUTOREV}" - -# GPU support requires out-of-tree SGX and RGX drivers not available in next -# fall back to software rendering -MACHINE_FEATURES:remove = "gpu" -PREFERRED_PROVIDER_virtual/gpudriver = "" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15384): https://lists.yoctoproject.org/g/meta-arago/message/15384 Mute This Topic: https://lists.yoctoproject.org/mt/106656018/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
