From 2b581ee748e7008ceb2aec3f489b49261189c804 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 12 Apr 2020 12:29:11 +0200 Subject: distros: define imx default bsp meta-freescale handles use-mainline-bsp in the common imx-base.inc file. Follow that change. While at it, simplify the upstream-rt distros by including the corresponding upstream distro. Signed-off-by: Max Krummenacher --- conf/distro/tdx-x11-upstream-rt.conf | 4 ++-- conf/distro/tdx-x11-upstream.conf | 2 ++ conf/distro/tdx-x11.conf | 2 ++ conf/distro/tdx-xwayland-upstream-rt.conf | 4 ++-- conf/distro/tdx-xwayland-upstream.conf | 2 ++ conf/distro/tdx-xwayland.conf | 2 ++ 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/conf/distro/tdx-x11-upstream-rt.conf b/conf/distro/tdx-x11-upstream-rt.conf index 6e5f01e..1047f57 100644 --- a/conf/distro/tdx-x11-upstream-rt.conf +++ b/conf/distro/tdx-x11-upstream-rt.conf @@ -1,11 +1,11 @@ # Toradex Distro with X11 without wayland. # Using the upstream kernel flavour with rt-patch applied. -require conf/distro/tdx-x11.conf +require conf/distro/tdx-x11-upstream.conf DISTRO = "tdx-x11-upstream-rt" DISTRO_NAME = "TDX X11 Upstream RT" -DISTROOVERRIDES .= ":upstream:preempt-rt" +DISTROOVERRIDES .= ":preempt-rt" DISTRO_FLAVOUR = " (UPSTREAM PREEMPT_RT)" IMAGE_BASENAME_append = "-rt-upstream" diff --git a/conf/distro/tdx-x11-upstream.conf b/conf/distro/tdx-x11-upstream.conf index 69e6c44..a306590 100644 --- a/conf/distro/tdx-x11-upstream.conf +++ b/conf/distro/tdx-x11-upstream.conf @@ -8,4 +8,6 @@ DISTRO_NAME = "TDX X11 Upstream" DISTROOVERRIDES .= ":upstream" DISTRO_FLAVOUR = " (UPSTREAM)" +IMX_DEFAULT_BSP = "mainline" + IMAGE_BASENAME_append = "-upstream" diff --git a/conf/distro/tdx-x11.conf b/conf/distro/tdx-x11.conf index 37ae401..e0d27f5 100644 --- a/conf/distro/tdx-x11.conf +++ b/conf/distro/tdx-x11.conf @@ -7,6 +7,8 @@ DISTRO = "tdx-x11" DISTRO_NAME = "TDX X11" DISTRO_FLAVOUR = "" +IMX_DEFAULT_BSP = "nxp" + # Remove conflicting backends. DISTRO_FEATURES_remove = "wayland " diff --git a/conf/distro/tdx-xwayland-upstream-rt.conf b/conf/distro/tdx-xwayland-upstream-rt.conf index 6e0d196..2b711e3 100644 --- a/conf/distro/tdx-xwayland-upstream-rt.conf +++ b/conf/distro/tdx-xwayland-upstream-rt.conf @@ -1,11 +1,11 @@ # Toradex Distro for Wayland with XWayland. # Using the upstream kernel flavour with rt-patch applied. -require conf/distro/tdx-xwayland.conf +require conf/distro/tdx-xwayland-upstream.conf DISTRO = "tdx-xwayland-upstream-rt" DISTRO_NAME = "TDX Wayland with XWayland Upstream RT" -DISTROOVERRIDES .= ":upstream:preempt-rt" +DISTROOVERRIDES .= ":preempt-rt" DISTRO_FLAVOUR = " (UPSTREAM PREEMPT_RT)" IMAGE_BASENAME_append = "-rt-upstream" diff --git a/conf/distro/tdx-xwayland-upstream.conf b/conf/distro/tdx-xwayland-upstream.conf index 321b473..6bc703a 100644 --- a/conf/distro/tdx-xwayland-upstream.conf +++ b/conf/distro/tdx-xwayland-upstream.conf @@ -8,4 +8,6 @@ DISTRO_NAME = "TDX Wayland with XWayland Upstream" DISTROOVERRIDES .= ":upstream" DISTRO_FLAVOUR = " (UPSTREAM)" +IMX_DEFAULT_BSP = "mainline" + IMAGE_BASENAME_append = "-upstream" diff --git a/conf/distro/tdx-xwayland.conf b/conf/distro/tdx-xwayland.conf index 40bdda3..b2be0d9 100644 --- a/conf/distro/tdx-xwayland.conf +++ b/conf/distro/tdx-xwayland.conf @@ -7,6 +7,8 @@ DISTRO = "tdx-xwayland" DISTRO_NAME = "TDX Wayland with XWayland" DISTRO_FLAVOUR = "" +IMX_DEFAULT_BSP = "nxp" + # we use graphics, so set opengl DISTRO_FEATURES_append = " opengl" -- cgit v1.2.3