From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Sat, 12 Dec 2020 20:58:22 +0000 (-0600)
Subject: imx8m*evk.conf: Fix use-nxp-bsp override errors
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=60c0ac6e015df134f4c1dc3ffbfc3ac8daf23ccf;p=meta-freescale.git

imx8m*evk.conf: Fix use-nxp-bsp override errors

When `use-nxp-bsp` is active, several variables are missing default values and
contain only the additional values for `use-nxp-bsp`. Fix this by replacing
the override `_use-nxp-bsp_append` with `_append_use-nxp-bsp`.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---

diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
index 44e3781d..b2a398a9 100644
--- a/conf/machine/imx8mmevk.conf
+++ b/conf/machine/imx8mmevk.conf
@@ -15,7 +15,7 @@ MACHINE_FEATURES += "pci wifi bluetooth optee"
 # Since the firmware is not available publicly, and rather distributed
 # under "Proprietary" license - we opt-out from using it in all BSPs
 # and pin it to NXP BSP only
-MACHINE_FEATURES_use-nxp-bsp_append = " qca9377"
+MACHINE_FEATURES_append_use-nxp-bsp = " qca9377"
 
 # Mainline kernel contains only one DTB file for
 # imx8mmevk machine
@@ -23,7 +23,7 @@ KERNEL_DEVICETREE = "freescale/imx8mm-evk.dtb"
 
 # NXP kernel has additional DTB files for various board configuration and
 # derivates. Include them here for NXP BSP only
-KERNEL_DEVICETREE_use-nxp-bsp_append = " \
+KERNEL_DEVICETREE_append_use-nxp-bsp = " \
        freescale/imx8mm-ddr4-evk.dtb \
        freescale/imx8mm-ddr4-evk-revb.dtb \
        freescale/imx8mm-ddr4-evk-revb-rm67191.dtb \
diff --git a/conf/machine/imx8mnevk.conf b/conf/machine/imx8mnevk.conf
index 5d8f3001..8d72b120 100644
--- a/conf/machine/imx8mnevk.conf
+++ b/conf/machine/imx8mnevk.conf
@@ -12,7 +12,7 @@ require conf/machine/include/tune-cortexa53.inc
 MACHINE_FEATURES += "wifi bluetooth optee"
 
 # NXP BSP can consume propietary Broadcomm driver
-MACHINE_FEATURES_use-nxp-bsp_append = " bcm43455"
+MACHINE_FEATURES_append_use-nxp-bsp = " bcm43455"
 
 # Mainline kernel contains only two DTB file for
 # imx8mnevk machine
@@ -21,7 +21,7 @@ KERNEL_DEVICETREE = " \
 	freescale/imx8mn-evk.dtb \
 "
 
-KERNEL_DEVICETREE_use-nxp-bsp_append = " \
+KERNEL_DEVICETREE_append_use-nxp-bsp = " \
 	freescale/imx8mn-ddr4-evk-ak5558.dtb \
 	freescale/imx8mn-ddr4-evk-inmate.dtb \
 	freescale/imx8mn-ddr4-evk-rm67191.dtb \
diff --git a/conf/machine/imx8mpevk.conf b/conf/machine/imx8mpevk.conf
index 1fbf0eef..123c4d36 100644
--- a/conf/machine/imx8mpevk.conf
+++ b/conf/machine/imx8mpevk.conf
@@ -10,7 +10,7 @@ require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa53.inc
 
 MACHINE_FEATURES += "pci wifi bluetooth optee"
-MACHINE_FEATURES_use-nxp-bsp_append = " mrvl8997"
+MACHINE_FEATURES_append_use-nxp-bsp = " mrvl8997"
 
 # Mainline kernel contains only one DTB file for
 # imx8mpevk machine
@@ -18,7 +18,7 @@ KERNEL_DEVICETREE = "freescale/imx8mp-evk.dtb"
 
 # NXP kernel has additional DTB files for various board configuration and
 # derivates. Include them here for NXP BSP only
-KERNEL_DEVICETREE_use-nxp-bsp_append = " \
+KERNEL_DEVICETREE_append_use-nxp-bsp = " \
 	freescale/imx8mp-ab2.dtb \
 	freescale/imx8mp-evk-basler.dtb \
 	freescale/imx8mp-evk-dsp.dtb \