diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2020-12-12 14:58:22 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-01-21 08:37:58 -0300 |
commit | 60c0ac6e015df134f4c1dc3ffbfc3ac8daf23ccf (patch) | |
tree | 596a5fcc75018141ff06dfbf23877c8171201321 | |
parent | ac25d3a3d09a2707d9ee614d3ed506fd2ebe2f83 (diff) | |
download | meta-freescale-60c0ac6e015df134f4c1dc3ffbfc3ac8daf23ccf.tar.gz |
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>
-rw-r--r-- | conf/machine/imx8mmevk.conf | 4 | ||||
-rw-r--r-- | conf/machine/imx8mnevk.conf | 4 | ||||
-rw-r--r-- | conf/machine/imx8mpevk.conf | 4 |
3 files changed, 6 insertions, 6 deletions
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" | |||
15 | # Since the firmware is not available publicly, and rather distributed | 15 | # Since the firmware is not available publicly, and rather distributed |
16 | # under "Proprietary" license - we opt-out from using it in all BSPs | 16 | # under "Proprietary" license - we opt-out from using it in all BSPs |
17 | # and pin it to NXP BSP only | 17 | # and pin it to NXP BSP only |
18 | MACHINE_FEATURES_use-nxp-bsp_append = " qca9377" | 18 | MACHINE_FEATURES_append_use-nxp-bsp = " qca9377" |
19 | 19 | ||
20 | # Mainline kernel contains only one DTB file for | 20 | # Mainline kernel contains only one DTB file for |
21 | # imx8mmevk machine | 21 | # imx8mmevk machine |
@@ -23,7 +23,7 @@ KERNEL_DEVICETREE = "freescale/imx8mm-evk.dtb" | |||
23 | 23 | ||
24 | # NXP kernel has additional DTB files for various board configuration and | 24 | # NXP kernel has additional DTB files for various board configuration and |
25 | # derivates. Include them here for NXP BSP only | 25 | # derivates. Include them here for NXP BSP only |
26 | KERNEL_DEVICETREE_use-nxp-bsp_append = " \ | 26 | KERNEL_DEVICETREE_append_use-nxp-bsp = " \ |
27 | freescale/imx8mm-ddr4-evk.dtb \ | 27 | freescale/imx8mm-ddr4-evk.dtb \ |
28 | freescale/imx8mm-ddr4-evk-revb.dtb \ | 28 | freescale/imx8mm-ddr4-evk-revb.dtb \ |
29 | freescale/imx8mm-ddr4-evk-revb-rm67191.dtb \ | 29 | 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 | |||
12 | MACHINE_FEATURES += "wifi bluetooth optee" | 12 | MACHINE_FEATURES += "wifi bluetooth optee" |
13 | 13 | ||
14 | # NXP BSP can consume propietary Broadcomm driver | 14 | # NXP BSP can consume propietary Broadcomm driver |
15 | MACHINE_FEATURES_use-nxp-bsp_append = " bcm43455" | 15 | MACHINE_FEATURES_append_use-nxp-bsp = " bcm43455" |
16 | 16 | ||
17 | # Mainline kernel contains only two DTB file for | 17 | # Mainline kernel contains only two DTB file for |
18 | # imx8mnevk machine | 18 | # imx8mnevk machine |
@@ -21,7 +21,7 @@ KERNEL_DEVICETREE = " \ | |||
21 | freescale/imx8mn-evk.dtb \ | 21 | freescale/imx8mn-evk.dtb \ |
22 | " | 22 | " |
23 | 23 | ||
24 | KERNEL_DEVICETREE_use-nxp-bsp_append = " \ | 24 | KERNEL_DEVICETREE_append_use-nxp-bsp = " \ |
25 | freescale/imx8mn-ddr4-evk-ak5558.dtb \ | 25 | freescale/imx8mn-ddr4-evk-ak5558.dtb \ |
26 | freescale/imx8mn-ddr4-evk-inmate.dtb \ | 26 | freescale/imx8mn-ddr4-evk-inmate.dtb \ |
27 | freescale/imx8mn-ddr4-evk-rm67191.dtb \ | 27 | 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 | |||
10 | require conf/machine/include/tune-cortexa53.inc | 10 | require conf/machine/include/tune-cortexa53.inc |
11 | 11 | ||
12 | MACHINE_FEATURES += "pci wifi bluetooth optee" | 12 | MACHINE_FEATURES += "pci wifi bluetooth optee" |
13 | MACHINE_FEATURES_use-nxp-bsp_append = " mrvl8997" | 13 | MACHINE_FEATURES_append_use-nxp-bsp = " mrvl8997" |
14 | 14 | ||
15 | # Mainline kernel contains only one DTB file for | 15 | # Mainline kernel contains only one DTB file for |
16 | # imx8mpevk machine | 16 | # imx8mpevk machine |
@@ -18,7 +18,7 @@ KERNEL_DEVICETREE = "freescale/imx8mp-evk.dtb" | |||
18 | 18 | ||
19 | # NXP kernel has additional DTB files for various board configuration and | 19 | # NXP kernel has additional DTB files for various board configuration and |
20 | # derivates. Include them here for NXP BSP only | 20 | # derivates. Include them here for NXP BSP only |
21 | KERNEL_DEVICETREE_use-nxp-bsp_append = " \ | 21 | KERNEL_DEVICETREE_append_use-nxp-bsp = " \ |
22 | freescale/imx8mp-ab2.dtb \ | 22 | freescale/imx8mp-ab2.dtb \ |
23 | freescale/imx8mp-evk-basler.dtb \ | 23 | freescale/imx8mp-evk-basler.dtb \ |
24 | freescale/imx8mp-evk-dsp.dtb \ | 24 | freescale/imx8mp-evk-dsp.dtb \ |