summaryrefslogtreecommitdiffstats
path: root/conf/machine/include
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/include')
-rw-r--r--conf/machine/include/imx-base.inc168
-rw-r--r--conf/machine/include/imx8dxl-evk.inc2
-rw-r--r--conf/machine/include/imx8mm-evk.inc12
-rw-r--r--conf/machine/include/imx8mn-evk.inc9
-rw-r--r--conf/machine/include/imx8mp-evk.inc11
-rw-r--r--conf/machine/include/imx8x-mek.inc6
-rw-r--r--conf/machine/include/imx93-evk.inc20
-rw-r--r--conf/machine/include/imx95-evk.inc58
-rw-r--r--conf/machine/include/qoriq-base.inc4
9 files changed, 210 insertions, 80 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index d1f8aca32..15d7b2e8d 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -75,9 +75,9 @@ UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}"
75# wic based images. 75# wic based images.
76SPL_BINARY ??= "${@get_spl_binary(d)}" 76SPL_BINARY ??= "${@get_spl_binary(d)}"
77 77
78PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}"
79PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_BOOTLOADER}"
80PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" 78PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}"
79PREFERRED_PROVIDER_u-boot ??= "${PREFERRED_PROVIDER_virtual/bootloader}"
80PREFERRED_PROVIDER_u-boot-mfgtool ??= "${PREFERRED_PROVIDER_virtual/bootloader}"
81 81
82PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" 82PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native"
83 83
@@ -94,6 +94,7 @@ UBOOT_ENTRYPOINT:mx6ulz-generic-bsp ?= "0x80008000"
94UBOOT_ENTRYPOINT:mx7-generic-bsp ?= "0x80008000" 94UBOOT_ENTRYPOINT:mx7-generic-bsp ?= "0x80008000"
95UBOOT_ENTRYPOINT:mx7ulp-generic-bsp ?= "0x60008000" 95UBOOT_ENTRYPOINT:mx7ulp-generic-bsp ?= "0x60008000"
96UBOOT_ENTRYPOINT:mx8m-generic-bsp ?= "0x40480000" 96UBOOT_ENTRYPOINT:mx8m-generic-bsp ?= "0x40480000"
97UBOOT_ENTRYPOINT:mx93-generic-bsp ?= "0x80400000"
97UBOOT_ENTRYPOINT:vf-generic-bsp ?= "0x80008000" 98UBOOT_ENTRYPOINT:vf-generic-bsp ?= "0x80008000"
98 99
99# Some SoC can utilize the boot container provided by U-Boot, 100# Some SoC can utilize the boot container provided by U-Boot,
@@ -129,6 +130,7 @@ IMX_DEFAULT_ATF_PROVIDER ??= "imx-atf"
129SOC_ATF_BOOT_UART_BASE = "" 130SOC_ATF_BOOT_UART_BASE = ""
130 131
131SOC_ATF_BOOT_UART_BASE:mx8m-generic-bsp = "0x30890000" 132SOC_ATF_BOOT_UART_BASE:mx8m-generic-bsp = "0x30890000"
133SOC_ATF_BOOT_UART_BASE:mx8mq-generic-bsp = "0x30860000"
132ATF_BOOT_UART_BASE ?= "${SOC_ATF_BOOT_UART_BASE}" 134ATF_BOOT_UART_BASE ?= "${SOC_ATF_BOOT_UART_BASE}"
133 135
134PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" 136PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -165,7 +167,9 @@ DEFAULTTUNE:mx8m-generic-bsp ?= "cortexa53-crypto"
165DEFAULTTUNE:mx8qm-generic-bsp ?= "cortexa72-cortexa53-crypto" 167DEFAULTTUNE:mx8qm-generic-bsp ?= "cortexa72-cortexa53-crypto"
166DEFAULTTUNE:mx8x-generic-bsp ?= "cortexa35-crypto" 168DEFAULTTUNE:mx8x-generic-bsp ?= "cortexa35-crypto"
167DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto" 169DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto"
170DEFAULTTUNE:mx91-generic-bsp ?= "cortexa55"
168DEFAULTTUNE:mx93-generic-bsp ?= "cortexa55" 171DEFAULTTUNE:mx93-generic-bsp ?= "cortexa55"
172DEFAULTTUNE:mx95-generic-bsp ?= "cortexa55"
169 173
170INHERIT += "machine-overrides-extender" 174INHERIT += "machine-overrides-extender"
171 175
@@ -189,12 +193,12 @@ IMX_SOC_REV_UPPER = "${@d.getVar('IMX_SOC_REV').upper()}"
189### NXP BSP specific overrides 193### NXP BSP specific overrides
190####### 194#######
191 195
192MACHINEOVERRIDES_EXTENDER:mx6q:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6q-generic-bsp:mx6q-nxp-bsp" 196MACHINEOVERRIDES_EXTENDER:mx6q:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxipu:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6q-generic-bsp:mx6q-nxp-bsp"
193MACHINEOVERRIDES_EXTENDER:mx6dl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6dl-generic-bsp:mx6dl-nxp-bsp" 197MACHINEOVERRIDES_EXTENDER:mx6dl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6dl-generic-bsp:mx6dl-nxp-bsp"
194 198
195MACHINEOVERRIDES_EXTENDER:mx6sx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6sx-generic-bsp:mx6sx-nxp-bsp" 199MACHINEOVERRIDES_EXTENDER:mx6sx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6sx-generic-bsp:mx6sx-nxp-bsp"
196 200
197MACHINEOVERRIDES_EXTENDER:mx6sl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp" 201MACHINEOVERRIDES_EXTENDER:mx6sl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp"
198MACHINEOVERRIDES_EXTENDER:mx6sll:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp:mx6sll-generic-bsp:mx6sll-nxp-bsp" 202MACHINEOVERRIDES_EXTENDER:mx6sll:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp:mx6sll-generic-bsp:mx6sll-nxp-bsp"
199 203
200MACHINEOVERRIDES_EXTENDER:mx6ul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp" 204MACHINEOVERRIDES_EXTENDER:mx6ul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp"
@@ -202,25 +206,27 @@ MACHINEOVERRIDES_EXTENDER:mx6ull:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxf
202MACHINEOVERRIDES_EXTENDER:mx6ulz:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp:mx6ulz-generic-bsp:mx6ulz-nxp-bsp" 206MACHINEOVERRIDES_EXTENDER:mx6ulz:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp:mx6ulz-generic-bsp:mx6ulz-nxp-bsp"
203 207
204MACHINEOVERRIDES_EXTENDER:mx7d:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx7-generic-bsp:mx7-nxp-bsp:mx7d-generic-bsp:mx7d-nxp-bsp" 208MACHINEOVERRIDES_EXTENDER:mx7d:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx7-generic-bsp:mx7-nxp-bsp:mx7d-generic-bsp:mx7d-nxp-bsp"
205MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d:mx7-generic-bsp:mx7-nxp-bsp:mx7ulp-generic-bsp:mx7ulp-nxp-bsp" 209MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx7-generic-bsp:mx7-nxp-bsp:mx7ulp-generic-bsp:mx7ulp-nxp-bsp"
206 210
207MACHINEOVERRIDES_EXTENDER:vf:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:vf-generic-bsp:vf-nxp-bsp" 211MACHINEOVERRIDES_EXTENDER:vf:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:vf-generic-bsp:vf-nxp-bsp"
208 212
209MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp" 213MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp"
210 214
211MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp" 215MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp"
212MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp" 216MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxviv:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp"
213MACHINEOVERRIDES_EXTENDER:mx8mnul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mnul-generic-bsp:mx8mnul-nxp-bsp" 217MACHINEOVERRIDES_EXTENDER:mx8mnul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mnul-generic-bsp:mx8mnul-nxp-bsp"
214MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp" 218MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp"
215MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp" 219MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp"
216 220
217MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp" 221MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp"
218MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp" 222MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp"
219MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dxl-generic-bsp:mx8dxl-nxp-bsp" 223MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dxl-generic-bsp:mx8dxl-nxp-bsp"
220 224
221MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-nxp-bsp" 225MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-nxp-bsp"
222 226
227MACHINEOVERRIDES_EXTENDER:mx91:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:mx9-generic-bsp:mx9-nxp-bsp:mx91-generic-bsp:mx91-nxp-bsp"
223MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp" 228MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp"
229MACHINEOVERRIDES_EXTENDER:mx95:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxmali:imxgpu2d:imxgpu3d:mx9-generic-bsp:mx9-nxp-bsp:mx95-generic-bsp:mx95-nxp-bsp"
224 230
225####### 231#######
226### Mainline BSP specific overrides 232### Mainline BSP specific overrides
@@ -263,7 +269,9 @@ MACHINEOVERRIDES_EXTENDER:mx8dxl:use-mainline-bsp = "imx-generic-bsp:imx-mainlin
263 269
264MACHINEOVERRIDES_EXTENDER:mx8ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8ulp-generic-bsp:mx8ulp-mainline-bsp" 270MACHINEOVERRIDES_EXTENDER:mx8ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8ulp-generic-bsp:mx8ulp-mainline-bsp"
265 271
272MACHINEOVERRIDES_EXTENDER:mx91:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx91-generic-bsp:mx91-mainline-bsp"
266MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp" 273MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp"
274MACHINEOVERRIDES_EXTENDER:mx95:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx95-generic-bsp:mx95-mainline-bsp"
267 275
268MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ 276MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \
269 mx6 \ 277 mx6 \
@@ -294,7 +302,9 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \
294 mx8dx \ 302 mx8dx \
295 mx8dxl \ 303 mx8dxl \
296 mx8ulp \ 304 mx8ulp \
305 mx91 \
297 mx93 \ 306 mx93 \
307 mx95 \
298" 308"
299 309
300MACHINEOVERRIDES_FILTERED_OUT_QA_ERROR = "%s overrides cannot be used and need conversion to use the new BSP-specific overrides. Check 'meta-freescale/scripts/convert-bsp-specific-overrides'." 310MACHINEOVERRIDES_FILTERED_OUT_QA_ERROR = "%s overrides cannot be used and need conversion to use the new BSP-specific overrides. Check 'meta-freescale/scripts/convert-bsp-specific-overrides'."
@@ -305,7 +315,7 @@ MACHINE_SOCARCH_SUFFIX:mx6q-nxp-bsp = "-mx6qdl"
305MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl" 315MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl"
306MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx" 316MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx"
307MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl" 317MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl"
308MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp= "-mx6sll" 318MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp = "-mx6sll"
309MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d" 319MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d"
310MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp" 320MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp"
311MACHINE_SOCARCH_SUFFIX:vf-nxp-bsp = "-vf" 321MACHINE_SOCARCH_SUFFIX:vf-nxp-bsp = "-vf"
@@ -322,7 +332,9 @@ MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8"
322MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp = "-mx8" 332MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp = "-mx8"
323MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8xl" 333MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8xl"
324MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp = "-mx8ulp" 334MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp = "-mx8ulp"
335MACHINE_SOCARCH_SUFFIX:mx91-nxp-bsp = "-mx91"
325MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp = "-mx93" 336MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp = "-mx93"
337MACHINE_SOCARCH_SUFFIX:mx95-nxp-bsp = "-mx95"
326 338
327# For Mainline we use a single SoC suffix as we don't have different build options 339# For Mainline we use a single SoC suffix as we don't have different build options
328MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx" 340MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx"
@@ -399,7 +411,11 @@ IMX_EXTRA_FIRMWARE:mx8-generic-bsp = "imx-boot-firmware-files imx-sc-firmware
399IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "imx-boot-firmware-files" 411IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "imx-boot-firmware-files"
400IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco" 412IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco"
401IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx" 413IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx"
414IMX_EXTRA_FIRMWARE:mx91-generic-bsp = "imx-boot-firmware-files firmware-ele-imx"
402IMX_EXTRA_FIRMWARE:mx93-generic-bsp = "imx-boot-firmware-files firmware-ele-imx" 415IMX_EXTRA_FIRMWARE:mx93-generic-bsp = "imx-boot-firmware-files firmware-ele-imx"
416PREFERRED_PROVIDER_virtual/imx-system-manager ??= "imx-system-manager"
417PREFERRED_PROVIDER_virtual/imx-oei ??= "imx-oei"
418IMX_EXTRA_FIRMWARE:mx95-generic-bsp = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei"
403 419
404# Firmware 420# Firmware
405MACHINE_FIRMWARE ?= "" 421MACHINE_FIRMWARE ?= ""
@@ -420,6 +436,7 @@ MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d f
420MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" 436MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d"
421MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" 437MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion"
422MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" 438MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion"
439MACHINE_FIRMWARE:append:mx95-generic-bsp = " firmware-imx-vpu-wave"
423MACHINE_FIRMWARE:append:imx-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" 440MACHINE_FIRMWARE:append:imx-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
424 441
425MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" 442MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
@@ -510,14 +527,30 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin"
510MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" 527MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin"
511 528
512# GStreamer forked recipes 529# GStreamer forked recipes
513PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.22.5.imx" 530PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.7.imx"
514PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.22.5.imx" 531PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.7.imx"
515PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.22.5.imx" 532PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx"
516PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.22.5.imx" 533PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx"
517PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.22.5.imx" 534PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.7.imx"
518PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.22.5.imx" 535PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.7.imx"
519PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.22.5.imx" 536PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx"
520PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.22.5.imx" 537PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx"
538
539# GStreamer copied recipes
540PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx"
541PREFERRED_VERSION_gst-examples:mx8-nxp-bsp ??= "1.24.7.imx"
542PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.7.imx"
543PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx"
544PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx"
545PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx"
546PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx"
547PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.24.0.imx"
548PREFERRED_VERSION_gst-examples:mx9-nxp-bsp ??= "1.24.7.imx"
549PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.7.imx"
550PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx"
551PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.24.0.imx"
552PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.24.0.imx"
553PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp ??= "1.24.0.imx"
521 554
522# GStreamer downgrade ffmpeg 555# GStreamer downgrade ffmpeg
523PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" 556PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1"
@@ -532,67 +565,62 @@ SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT:imxgpu = "1"
532# 1 - machine has Vivante GPU driver support 565# 1 - machine has Vivante GPU driver support
533MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" 566MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}"
534 567
535# Graphics libraries 568# Override graphics for i.MX GPU
536PREFERRED_PROVIDER_virtual/egl ?= "mesa" 569IMXGPU_GRAPHICS_PROVIDER:imxviv ?= "imx-gpu-viv"
537PREFERRED_PROVIDER_virtual/libgl ?= "mesa" 570IMXGPU_GRAPHICS_PROVIDER:imxmali ?= "mali-imx"
538PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" 571
539PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 572PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "${IMXGPU_GRAPHICS_PROVIDER}"
540 573PREFERRED_PROVIDER_virtual/libgl:imxgpu ?= "mesa-gl"
541PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv" 574PREFERRED_PROVIDER_virtual/mesa:imxgpu ?= "mesa-gl"
542PREFERRED_PROVIDER_virtual/libgl:imxgpu ?= "mesa-gl" 575PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}"
543PREFERRED_PROVIDER_virtual/mesa:imxgpu ?= "mesa-gl" 576PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}"
544PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv" 577PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}"
545PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv" 578
546PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv" 579# The Vivante OpenCL implementation doesn't work with the standard headers and loader
547PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" 580PREFERRED_PROVIDER_opencl-clhpp:imxviv ?= "imx-gpu-viv"
548PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d" 581PREFERRED_PROVIDER_opencl-headers:imxviv ?= "imx-gpu-viv"
582PREFERRED_PROVIDER_opencl-icd-loader:imxviv ?= "imx-gpu-viv"
583PREFERRED_PROVIDER_virtual/opencl-icd:imxviv ?= "imx-gpu-viv"
584
585PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d"
586PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d"
549PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d" 587PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d"
550PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv"
551PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv"
552PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv"
553PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv"
554 588
555PREFERRED_VERSION_weston:imx-nxp-bsp ??= "12.0.3.imx" 589PREFERRED_VERSION_weston:imx-nxp-bsp ??= "14.0.1.imx"
556# i.MX 6 & 7 stay on weston 10.0 for fbdev 590# i.MX 6 & 7 stay on weston 10.0 for fbdev
557PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" 591PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx"
558PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" 592PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx"
559PREFERRED_VERSION_weston:imx-mainline-bsp = "" 593PREFERRED_VERSION_weston:imx-mainline-bsp = ""
560 594
561PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.32.imx" 595PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.37.imx"
562PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ??= "1.32.imx"
563PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.32.imx"
564PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.32.imx"
565 596
566PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" 597PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx"
567 598
568# Use i.MX libdrm Version 599# Use i.MX libdrm Version
569PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.116.imx" 600PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.123.imx"
570PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.116.imx" 601
571PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.116.imx" 602PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.275.0.imx"
572PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.116.imx" 603PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.275.0.imx"
573 604PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.275.0.imx"
574PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.261.1.imx" 605PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.275.0.imx"
575PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.261.1.imx" 606PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.275.0.imx"
576PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.261.1.imx" 607PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx"
577PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.261.1.imx"
578PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.261.1.imx"
579PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.261.1.imx"
580 608
581# Use i.MX optee Version 609# Use i.MX optee Version
582PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.0.0.imx" 610PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.4.0.imx"
583PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.0.0.imx" 611PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.4.0.imx"
584PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.0.0.imx" 612PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.4.0.imx"
585PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.0.0.imx" 613PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.4.0.imx"
586PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.0.0.imx" 614PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.4.0.imx"
587PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.0.0.imx" 615PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.4.0.imx"
588 616
589# Use i.MX opencv Version 617# Use i.MX opencv Version
590PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" 618PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"
591PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx" 619PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx"
592 620
593# Handle default kernel 621# Handle default kernel
594IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" 622IMX_DEFAULT_KERNEL:imx-mainline-bsp ??= "linux-fslc"
595IMX_DEFAULT_KERNEL:imx-nxp-bsp = "linux-fslc-imx" 623IMX_DEFAULT_KERNEL:imx-nxp-bsp ??= "linux-fslc-imx"
596 624
597PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" 625PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
598 626
@@ -611,7 +639,7 @@ IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
611 639
612IMAGE_BOOT_FILES ?= " \ 640IMAGE_BOOT_FILES ?= " \
613 ${KERNEL_IMAGETYPE} \ 641 ${KERNEL_IMAGETYPE} \
614 ${@make_dtb_boot_files(d)} \ 642 ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${@make_dtb_boot_files(d)}', d)} \
615 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_BOOT_IMAGE}', '', d)} \ 643 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_BOOT_IMAGE}', '', d)} \
616" 644"
617 645
@@ -645,9 +673,9 @@ WKS_FILE_DEPENDS:append:imx-generic-bsp:mx9-generic-bsp = " \
645 ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ 673 ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \
646" 674"
647 675
648SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" 676SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in"
649SOC_DEFAULT_WKS_FILE:mx8-generic-bsp ?= "imx-imx-boot-bootpart.wks.in"
650SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" 677SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in"
678SOC_DEFAULT_WKS_FILE:mx8-generic-bsp ?= "imx-imx-boot-bootpart.wks.in"
651SOC_DEFAULT_WKS_FILE:mx9-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" 679SOC_DEFAULT_WKS_FILE:mx9-generic-bsp ?= "imx-imx-boot-bootpart.wks.in"
652 680
653WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" 681WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc
index 0f9aa1f08..4f5d12986 100644
--- a/conf/machine/include/imx8dxl-evk.inc
+++ b/conf/machine/include/imx8dxl-evk.inc
@@ -6,7 +6,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc
6IMX_DEFAULT_BSP = "nxp" 6IMX_DEFAULT_BSP = "nxp"
7 7
8MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" 8MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
9MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" 9MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 dpdk nxpwifi-all-sdio"
10 10
11# Don't include kernels in standard images 11# Don't include kernels in standard images
12RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" 12RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 442f44778..516dd8a9d 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -16,7 +16,7 @@ MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8987-sdio"
16# and pin it to NXP BSP only 16# and pin it to NXP BSP only
17# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have 17# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
18# a full support for it yet. 18# a full support for it yet.
19MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" 19MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359 dpdk nxpwifi-all-sdio"
20 20
21KERNEL_DEVICETREE = " \ 21KERNEL_DEVICETREE = " \
22 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ 22 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
@@ -73,3 +73,13 @@ TEE_LOAD_ADDR = "0xbe000000"
73 73
74# Add additional firmware 74# Add additional firmware
75MACHINE_FIRMWARE:append = " linux-firmware-ath10k" 75MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
76
77WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos"
78IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
79 mcore-demos/imx8mm_m4_TCM_hello_world.bin \
80 mcore-demos/imx8mm_m4_TCM_low_power_wakeword.bin \
81 mcore-demos/imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
82 mcore-demos/imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin \
83 mcore-demos/imx8mm_m4_TCM_sai_low_power_audio.bin \
84 mcore-demos/imx8mm_m4_TCM_sai_low_power_audio_wm8524.bin \
85"
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 11657bcce..a51f11edb 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
9DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" 9DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
10 10
11MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356 nxp8987-sdio" 11MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356 nxp8987-sdio"
12MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio"
12 13
13# NXP BSP can consume proprietary jailhouse and Broadcom drivers 14# NXP BSP can consume proprietary jailhouse and Broadcom drivers
14# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have 15# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
@@ -82,3 +83,11 @@ TEE_LOAD_ADDR = "0x56000000"
82 83
83# Add additional firmware 84# Add additional firmware
84MACHINE_FIRMWARE:append = " linux-firmware-ath10k" 85MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
86
87WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos"
88IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
89 mcore-demos/imx8mn_m7_TCM_hello_world.bin \
90 mcore-demos/imx8mn_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
91 mcore-demos/imx8mn_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
92 mcore-demos/imx8mn_m7_TCM_sai_low_power_audio.bin \
93"
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index 24e5588f1..d6ae21d55 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -13,7 +13,7 @@ MACHINE_FEATURES += "pci wifi bluetooth nxp8997-pcie nxp8997-sdio nxp9098-pcie n
13# NXP BSP can consume proprietary jailhouse and Marvell drivers 13# NXP BSP can consume proprietary jailhouse and Marvell drivers
14# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have 14# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
15# a full support for it yet. 15# a full support for it yet.
16MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse mrvl8997" 16MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse mrvl8997 nxpwifi-all-pcie nxpwifi-all-sdio dpdk"
17 17
18# Mainline kernel contains only one DTB file for 18# Mainline kernel contains only one DTB file for
19# imx8mpevk machine 19# imx8mpevk machine
@@ -72,3 +72,12 @@ TEE_LOAD_ADDR = "0x56000000"
72 72
73# Add additional firmware 73# Add additional firmware
74MACHINE_FIRMWARE:append = " linux-firmware-ath10k" 74MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
75
76WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos"
77IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
78 mcore-demos/imx8mp_m7_TCM_hello_world.bin \
79 mcore-demos/imx8mp_m7_TCM_low_power_wakeword.bin \
80 mcore-demos/imx8mp_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
81 mcore-demos/imx8mp_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
82 mcore-demos/imx8mp_m7_TCM_sai_low_power_audio.bin \
83"
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index 9eaa77c53..e83085860 100644
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -4,7 +4,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc
4IMX_DEFAULT_BSP = "nxp" 4IMX_DEFAULT_BSP = "nxp"
5 5
6MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" 6MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
7MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" 7MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 nxpwifi-all-pcie nxpwifi-all-sdio"
8 8
9# Don't include kernels in standard images 9# Don't include kernels in standard images
10RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" 10RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
@@ -12,7 +12,7 @@ RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
12LOADADDR = "" 12LOADADDR = ""
13 13
14# We have to disable SERIAL_CONSOLE due to auto-serial-console 14# We have to disable SERIAL_CONSOLE due to auto-serial-console
15SERIAL_CONSOLES = "115200;ttyAMA0" 15SERIAL_CONSOLES = "115200;ttyLP0"
16 16
17# we do not want to have getty running on tty1 as we run 17# we do not want to have getty running on tty1 as we run
18# auto-serial-console there 18# auto-serial-console there
@@ -33,8 +33,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
33 freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \ 33 freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \
34 freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \ 34 freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \
35 freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \ 35 freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \
36 freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640.dtb \
37 freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-rpmsg.dtb \
38 freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ 36 freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
39" 37"
40 38
diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc
index 3a9222820..e5a3f0e22 100644
--- a/conf/machine/include/imx93-evk.inc
+++ b/conf/machine/include/imx93-evk.inc
@@ -4,7 +4,9 @@ require conf/machine/include/imx-base.inc
4require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc 4require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
5 5
6MACHINE_FEATURES += "pci wifi bluetooth" 6MACHINE_FEATURES += "pci wifi bluetooth"
7MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio" 7MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio dpdk nxpwifi-all-sdio"
8
9MACHINE_FIRMWARE:append:use-nxp-bsp = " ethos-u-firmware"
8 10
9KERNEL_DEVICETREE = " \ 11KERNEL_DEVICETREE = " \
10 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ 12 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
@@ -23,12 +25,24 @@ SPL_BINARY = "spl/u-boot-spl.bin"
23UBOOT_CONFIG ??= "sd" 25UBOOT_CONFIG ??= "sd"
24UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" 26UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
25UBOOT_CONFIG[ecc] = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig" 27UBOOT_CONFIG[ecc] = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig"
26UBOOT_CONFIG[ld] = "${UBOOT_CONFIG_BASENAME}_ld_defconfig" 28UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
27 29
28# Set ATF platform name 30# Set ATF platform name
29ATF_PLATFORM = "imx93" 31ATF_PLATFORM = "imx93"
30 32
31IMXBOOT_TARGETS = "flash_singleboot" 33IMXBOOT_TARGETS = \
34 "${@bb.utils.contains('UBOOT_CONFIG', 'sd', '${IMXBOOT_TARGETS_SD}', \
35 bb.utils.contains('UBOOT_CONFIG', 'ecc', '${IMXBOOT_TARGETS_ECC}', \
36 bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_FSPI}', \
37 'INVALID', d), d), d)}"
38# Note different SD targets for different Glitch Detection (GDET) modes:
39# | Target | Glitch Detection |
40# | flash_singleboot | None |
41# | flash_singleboot_gdet | Enabled |
42# | flash_singleboot_gdet_auto | Enabled during EdgeLock Secure Enclave API calls |
43IMXBOOT_TARGETS_SD = "flash_singleboot flash_singleboot_gdet flash_singleboot_gdet_auto"
44IMXBOOT_TARGETS_ECC = "flash_singleboot"
45IMXBOOT_TARGETS_FSPI = "flash_singleboot_flexspi"
32 46
33IMX_BOOT_SOC_TARGET = "iMX9" 47IMX_BOOT_SOC_TARGET = "iMX9"
34IMX_BOOT_SEEK = "32" 48IMX_BOOT_SEEK = "32"
diff --git a/conf/machine/include/imx95-evk.inc b/conf/machine/include/imx95-evk.inc
new file mode 100644
index 000000000..d78745cfc
--- /dev/null
+++ b/conf/machine/include/imx95-evk.inc
@@ -0,0 +1,58 @@
1require conf/machine/include/imx-base.inc
2require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
3
4MACHINE_FEATURES += "pci wifi bluetooth optee"
5MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-pcie nxpwifi-all-sdio jailhouse dpdk xen"
6
7KERNEL_DEVICETREE = " \
8 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
9"
10
11IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
12IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
13
14LOADADDR = ""
15UBOOT_SUFFIX = "bin"
16UBOOT_MAKE_TARGET = ""
17
18SPL_BINARY = "spl/u-boot-spl.bin"
19
20UBOOT_CONFIG ??= "sd"
21UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_evk_defconfig,sdcard"
22UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_evk_fspi_defconfig"
23
24ATF_PLATFORM = "imx95"
25OEI_CONFIGS = "ddr tcm"
26OEI_CORE = "m33"
27OEI_SOC = "mx95"
28OEI_BOARD ?= "mx95lp5"
29DDR_TYPE ?= "lpddr5"
30
31IMXBOOT_VARIANTS = "alt jailhouse netc sof"
32
33# Multiple system manager configs by IMXBOOT_VARIANT
34SYSTEM_MANAGER_CONFIG = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt', 'mx95alt', \
35 bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', 'mx95evkjailhouse', \
36 bb.utils.contains('IMXBOOT_VARIANT', 'netc', 'mx95netc', \
37 bb.utils.contains('IMXBOOT_VARIANT', 'sof', 'mx95evksof', \
38 'mx95evk', d), d), d), d)}"
39
40# imx-boot (flash.bin) targets based on UBOOT_CONFIG and IMXBOOT_VARIANT
41IMXBOOT_TARGETS_SD = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt', '${IMXBOOT_TARGETS_BASENAME}_alt', \
42 bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', '${IMXBOOT_TARGETS_BASENAME}_jailhouse', \
43 bb.utils.contains('IMXBOOT_VARIANT', 'netc', '${IMXBOOT_TARGETS_BASENAME}_netc', \
44 bb.utils.contains('IMXBOOT_VARIANT', 'sof', '${IMXBOOT_TARGETS_BASENAME}_a55', \
45 '${IMXBOOT_TARGETS_BASENAME}_all ${IMXBOOT_TARGETS_BASENAME}_a55', d), d), d), d)} \
46"
47
48IMXBOOT_TARGETS = " \
49 ${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_a55_flexspi', '${IMXBOOT_TARGETS_SD}', d)} \
50"
51
52IMX_BOOT_SOC_TARGET = "iMX95"
53IMX_BOOT_SEEK = "32"
54
55# We have to disable SERIAL_CONSOLE due to auto-serial-console
56SERIAL_CONSOLES = "115200;ttyLP0"
57
58IMX_DEFAULT_BSP = "nxp"
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index 4340c9423..4a42a8bd3 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -43,6 +43,8 @@ EXTRA_IMAGEDEPENDS += "u-boot qoriq-cst-native"
43 43
44MACHINEOVERRIDES =. "qoriq:" 44MACHINEOVERRIDES =. "qoriq:"
45 45
46INHERIT += "machine-overrides-extender"
47
46# Machines or distros can define which BSP it should use by default. We are 48# Machines or distros can define which BSP it should use by default. We are
47# intending to default for nxp BSP by default and specific machines or 49# intending to default for nxp BSP by default and specific machines or
48# DISTROs might change it if need. 50# DISTROs might change it if need.
@@ -51,6 +53,8 @@ MACHINEOVERRIDES =. "qoriq:"
51QORIQ_DEFAULT_BSP ?= "nxp" 53QORIQ_DEFAULT_BSP ?= "nxp"
52 54
53MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:" 55MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:"
56MACHINEOVERRIDES_EXTENDER:use-mainline-bsp = "qoriq-generic-bsp:qoriq-mainline-bsp"
57MACHINEOVERRIDES_EXTENDER:use-nxp-bsp = "qoriq-generic-bsp:qoriq-nxp-bsp"
54 58
55# Sub-architecture support 59# Sub-architecture support
56MACHINE_SOCARCH_SUFFIX ?= "" 60MACHINE_SOCARCH_SUFFIX ?= ""
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 17:45:54 +0000