From 397a903c88c9936151ce703b628c27fa97e601d6 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 13 Dec 2024 18:31:55 -0500 Subject: conf/machine: move "bb_org" BSP settings to meta-beagle Define "bb_org" default BSP settings in meta-beagle layer that all Beagle platforms will use. Signed-off-by: Denys Dmytriyenko --- meta-beagle/conf/machine/include/beagle-bsp.inc | 24 ++++++++++++++++++++++++ meta-ti-bsp/conf/machine/include/ti-bsp.inc | 21 +-------------------- 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 meta-beagle/conf/machine/include/beagle-bsp.inc diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc new file mode 100644 index 00000000..77d0b483 --- /dev/null +++ b/meta-beagle/conf/machine/include/beagle-bsp.inc @@ -0,0 +1,24 @@ +# Use meta-ti-bsp "multi-BSP" facility to create a custom "bb_org" BSP profile +# with default preferences for Beagle platforms + +# Default is bb_org, but can override with any of the existing options +TI_PREFERRED_BSP ?= "bb_org" + +# ========== +# bb_org +# BeagleBoard.org kernel 6.1, u-boot 2023.04 +# based on TI staging trees with extra Beagle-specific features +# but may not be up-to-date with TI version +# ========== +BSP_KERNEL_PROVIDER:bsp-bb_org = "linux-bb.org" +BSP_KERNEL_VERSION:bsp-bb_org = "%" +BSP_BOOTLOADER_PROVIDER:bsp-bb_org = "u-boot-bb.org" +BSP_BOOTLOADER_VERSION:bsp-bb_org = "%" + +BSP_SGX_DRIVER_PROVIDER:bsp-bb_org = "ti-sgx-ddk-km" +BSP_SGX_DRIVER_VERSION:bsp-bb_org = "1.17%" +BSP_SGX_UMLIBS_VERSION:bsp-bb_org = "1.17%" +BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org = "ti-img-rogue-driver" +BSP_ROGUE_DRIVER_VERSION:bsp-bb_org = "23%" +BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org = "23%" +BSP_MESA_PVR_VERSION:bsp-bb_org = "22%" diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index 814c6ca8..4bbe7668 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 @@ # preferences for kernel, bootloader and graphics components, as # well as a dedicated machine override. -# Supported options are: mainline, next, ti-6_6, ti-6_1, bb_org +# Supported options are: mainline, next, ti-6_12, ti-6_6, ti-6_1 TI_PREFERRED_BSP ??= "ti-6_6" # Use bsp-* namespace for overrides @@ -82,25 +82,6 @@ BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_1 = "23%" BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_1 = "23%" BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%" -# ========== -# bb_org -# BeagleBoard.org kernel 6.1, u-boot 2023.04 -# based on TI staging trees with extra Beagle-specific features -# but may not be up-to-date with TI version -# ========== -BSP_KERNEL_PROVIDER:bsp-bb_org = "linux-bb.org" -BSP_KERNEL_VERSION:bsp-bb_org = "%" -BSP_BOOTLOADER_PROVIDER:bsp-bb_org = "u-boot-bb.org" -BSP_BOOTLOADER_VERSION:bsp-bb_org = "%" - -BSP_SGX_DRIVER_PROVIDER:bsp-bb_org = "ti-sgx-ddk-km" -BSP_SGX_DRIVER_VERSION:bsp-bb_org = "1.17%" -BSP_SGX_UMLIBS_VERSION:bsp-bb_org = "1.17%" -BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org = "ti-img-rogue-driver" -BSP_ROGUE_DRIVER_VERSION:bsp-bb_org = "23%" -BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org = "23%" -BSP_MESA_PVR_VERSION:bsp-bb_org = "22%" - # ========== # sane fallback defaults # if specific values are not defined or bsp is set incorrectly -- cgit v1.2.3-54-g00ecf