From 8090ce9a4b1108fe51b40b3d8997314a59bf89f1 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 14 Jun 2024 17:57:21 -0400 Subject: conf/machine: use the default TI BSP for BeaglePlay BeaglePlay gains official support from latest TI lts-6.6 baseline, so set it as the default. Other Beagle platforms will still use BB.org as default. And these defaults can still be changed with TI_PREFERRED_BSP setting in a distro config or by end user in the local.conf Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/beagle-x15.conf | 3 ++- meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf | 3 ++- meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 ++- meta-ti-bsp/conf/machine/beaglebone.conf | 3 ++- meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 1 - meta-ti-bsp/conf/machine/beagleplay.conf | 1 - meta-ti-bsp/conf/machine/include/beagle.inc | 1 - 7 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 meta-ti-bsp/conf/machine/include/beagle.inc diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf index 15815119..6f8c435b 100644 --- a/meta-ti-bsp/conf/machine/beagle-x15.conf +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf @@ -2,7 +2,8 @@ #@NAME: BeagleBoard X15 #@DESCRIPTION: Machine configuration for the BeagleBoard X15 -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/am57xx.inc DT_VENDOR_PREFIX = "ti/omap/" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf index 85669cca..d415a212 100644 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf @@ -2,7 +2,8 @@ #@NAME: BeagleBone AI-64 (R5F) #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core) -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/k3r5.inc SYSFW_SOC = "j721e" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf index 618e27d7..2d681827 100644 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf @@ -2,7 +2,8 @@ #@NAME: BeagleBone AI-64 (A72) #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core) -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/j721e.inc UBOOT_MACHINE = "j721e_evm_a72_config" diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf index 9f5f41e0..0db4d304 100644 --- a/meta-ti-bsp/conf/machine/beaglebone.conf +++ b/meta-ti-bsp/conf/machine/beaglebone.conf @@ -2,7 +2,8 @@ #@NAME: BeagleBone machine #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/ti33x.inc DT_VENDOR_PREFIX = "ti/omap/" diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf index 16503f09..338a6fbf 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf @@ -2,7 +2,6 @@ #@NAME: BeaglePlay (R5F) #@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core) -require conf/machine/include/beagle.inc require conf/machine/include/k3r5.inc SYSFW_SOC = "am62x" diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf index 6f042d03..8c83198a 100644 --- a/meta-ti-bsp/conf/machine/beagleplay.conf +++ b/meta-ti-bsp/conf/machine/beagleplay.conf @@ -2,7 +2,6 @@ #@NAME: BeaglePlay (A53) #@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core) -require conf/machine//include/beagle.inc require conf/machine/include/k3.inc SOC_FAMILY:append = ":am62xx" diff --git a/meta-ti-bsp/conf/machine/include/beagle.inc b/meta-ti-bsp/conf/machine/include/beagle.inc deleted file mode 100644 index 4d5942c2..00000000 --- a/meta-ti-bsp/conf/machine/include/beagle.inc +++ /dev/null @@ -1 +0,0 @@ -TI_PREFERRED_BSP ?= "bb_org" -- cgit v1.2.3-54-g00ecf