From 294d5b1f05b672b19af350c000180261d92104a0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 15 Apr 2020 17:24:57 -0300 Subject: Finally fix the mainline BSP vs NXP BSP dynamic change We cannot change the default BSP based on SoC as we trim out those when moving to the mainline BSP. For this reason, we moved the i.MX8 forced setting to our respective machines as they lack mainline BSP support. Signed-off-by: Otavio Salvador --- conf/machine/imx8mmevk.conf | 2 ++ conf/machine/imx8mnevk.conf | 2 ++ conf/machine/imx8mqevk.conf | 2 ++ conf/machine/imx8qmmek.conf | 2 ++ conf/machine/imx8qxpmek.conf | 2 ++ conf/machine/include/imx-base.inc | 13 ++----------- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf index a648db9d..d7643540 100644 --- a/conf/machine/imx8mmevk.conf +++ b/conf/machine/imx8mmevk.conf @@ -9,6 +9,8 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa53.inc +IMX_DEFAULT_BSP = "nxp" + MACHINE_FEATURES += " pci wifi bluetooth optee qca9377" KERNEL_DEVICETREE = "freescale/fsl-imx8mm-evk.dtb \ diff --git a/conf/machine/imx8mnevk.conf b/conf/machine/imx8mnevk.conf index b74805d2..23558e1f 100644 --- a/conf/machine/imx8mnevk.conf +++ b/conf/machine/imx8mnevk.conf @@ -9,6 +9,8 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa53.inc +IMX_DEFAULT_BSP = "nxp" + MACHINE_FEATURES += "wifi bluetooth optee bcm43455" KERNEL_DEVICETREE = "freescale/fsl-imx8mn-ddr4-evk-ak5558.dtb \ diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf index fef9e778..d6aa3a9f 100644 --- a/conf/machine/imx8mqevk.conf +++ b/conf/machine/imx8mqevk.conf @@ -9,6 +9,8 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa53.inc +IMX_DEFAULT_BSP = "nxp" + MACHINE_FEATURES += "pci wifi bluetooth optee qca6174" MACHINE_SOCARCH_FILTER_append_mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf index 01d92009..6c91172b 100644 --- a/conf/machine/imx8qmmek.conf +++ b/conf/machine/imx8qmmek.conf @@ -8,6 +8,8 @@ MACHINEOVERRIDES =. "mx8:mx8qm:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa72-cortexa53.inc +IMX_DEFAULT_BSP = "nxp" + MACHINE_FEATURES_append = " qca6174" # Don't include kernels in standard images diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf index 80da6e2d..c0a044fb 100644 --- a/conf/machine/imx8qxpmek.conf +++ b/conf/machine/imx8qxpmek.conf @@ -8,6 +8,8 @@ MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/arch-arm64.inc +IMX_DEFAULT_BSP = "nxp" + MACHINE_FEATURES_append = " qca6174" # Don't include kernels in standard images diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index aba852a6..f9db2785 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -14,22 +14,13 @@ IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx" # DISTROs might change it if need. # # Two values are considered valid: mainline, nxp -IMX_DEFAULT_BSP ??= "mainline" +IMX_DEFAULT_BSP = "mainline" # Those are SoC families we'd like to force the use of mainline BSP. IMX_DEFAULT_BSP_mxs = "mainline" IMX_DEFAULT_BSP_mx5 = "mainline" -# Those are SoC families we'd like to force to use of NXP BSP. -IMX_DEFAULT_BSP_mx8mm = "nxp" -IMX_DEFAULT_BSP_mx8mn = "nxp" -IMX_DEFAULT_BSP_mx8mq = "nxp" -IMX_DEFAULT_BSP_mx8qm = "nxp" - -# We set the override as a DISTROOVERRIDES so we avoid a cycle while expanding -# the MACHINEOVERRIDES. This is required so this is reworked late in the -# expansion cycle. -DISTROOVERRIDES_append = ":use-${IMX_DEFAULT_BSP}-bsp" +MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:" PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" -- cgit v1.2.3-54-g00ecf