diff options
Diffstat (limited to 'conf/machine/include/imx-base.inc')
-rw-r--r-- | conf/machine/include/imx-base.inc | 168 |
1 files changed, 98 insertions, 70 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. |
76 | SPL_BINARY ??= "${@get_spl_binary(d)}" | 76 | SPL_BINARY ??= "${@get_spl_binary(d)}" |
77 | 77 | ||
78 | PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" | ||
79 | PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_BOOTLOADER}" | ||
80 | PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" | 78 | PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" |
79 | PREFERRED_PROVIDER_u-boot ??= "${PREFERRED_PROVIDER_virtual/bootloader}" | ||
80 | PREFERRED_PROVIDER_u-boot-mfgtool ??= "${PREFERRED_PROVIDER_virtual/bootloader}" | ||
81 | 81 | ||
82 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" | 82 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" |
83 | 83 | ||
@@ -94,6 +94,7 @@ UBOOT_ENTRYPOINT:mx6ulz-generic-bsp ?= "0x80008000" | |||
94 | UBOOT_ENTRYPOINT:mx7-generic-bsp ?= "0x80008000" | 94 | UBOOT_ENTRYPOINT:mx7-generic-bsp ?= "0x80008000" |
95 | UBOOT_ENTRYPOINT:mx7ulp-generic-bsp ?= "0x60008000" | 95 | UBOOT_ENTRYPOINT:mx7ulp-generic-bsp ?= "0x60008000" |
96 | UBOOT_ENTRYPOINT:mx8m-generic-bsp ?= "0x40480000" | 96 | UBOOT_ENTRYPOINT:mx8m-generic-bsp ?= "0x40480000" |
97 | UBOOT_ENTRYPOINT:mx93-generic-bsp ?= "0x80400000" | ||
97 | UBOOT_ENTRYPOINT:vf-generic-bsp ?= "0x80008000" | 98 | UBOOT_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" | |||
129 | SOC_ATF_BOOT_UART_BASE = "" | 130 | SOC_ATF_BOOT_UART_BASE = "" |
130 | 131 | ||
131 | SOC_ATF_BOOT_UART_BASE:mx8m-generic-bsp = "0x30890000" | 132 | SOC_ATF_BOOT_UART_BASE:mx8m-generic-bsp = "0x30890000" |
133 | SOC_ATF_BOOT_UART_BASE:mx8mq-generic-bsp = "0x30860000" | ||
132 | ATF_BOOT_UART_BASE ?= "${SOC_ATF_BOOT_UART_BASE}" | 134 | ATF_BOOT_UART_BASE ?= "${SOC_ATF_BOOT_UART_BASE}" |
133 | 135 | ||
134 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 136 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" |
@@ -165,7 +167,9 @@ DEFAULTTUNE:mx8m-generic-bsp ?= "cortexa53-crypto" | |||
165 | DEFAULTTUNE:mx8qm-generic-bsp ?= "cortexa72-cortexa53-crypto" | 167 | DEFAULTTUNE:mx8qm-generic-bsp ?= "cortexa72-cortexa53-crypto" |
166 | DEFAULTTUNE:mx8x-generic-bsp ?= "cortexa35-crypto" | 168 | DEFAULTTUNE:mx8x-generic-bsp ?= "cortexa35-crypto" |
167 | DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto" | 169 | DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto" |
170 | DEFAULTTUNE:mx91-generic-bsp ?= "cortexa55" | ||
168 | DEFAULTTUNE:mx93-generic-bsp ?= "cortexa55" | 171 | DEFAULTTUNE:mx93-generic-bsp ?= "cortexa55" |
172 | DEFAULTTUNE:mx95-generic-bsp ?= "cortexa55" | ||
169 | 173 | ||
170 | INHERIT += "machine-overrides-extender" | 174 | INHERIT += "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 | ||
192 | MACHINEOVERRIDES_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" | 196 | MACHINEOVERRIDES_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" |
193 | MACHINEOVERRIDES_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" | 197 | MACHINEOVERRIDES_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 | ||
195 | MACHINEOVERRIDES_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" | 199 | MACHINEOVERRIDES_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 | ||
197 | MACHINEOVERRIDES_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" | 201 | MACHINEOVERRIDES_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" |
198 | MACHINEOVERRIDES_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" | 202 | MACHINEOVERRIDES_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 | ||
200 | MACHINEOVERRIDES_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" | 204 | MACHINEOVERRIDES_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 | |||
202 | MACHINEOVERRIDES_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" | 206 | MACHINEOVERRIDES_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 | ||
204 | MACHINEOVERRIDES_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" | 208 | MACHINEOVERRIDES_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" |
205 | MACHINEOVERRIDES_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" | 209 | MACHINEOVERRIDES_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 | ||
207 | MACHINEOVERRIDES_EXTENDER:vf:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:vf-generic-bsp:vf-nxp-bsp" | 211 | MACHINEOVERRIDES_EXTENDER:vf:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:vf-generic-bsp:vf-nxp-bsp" |
208 | 212 | ||
209 | MACHINEOVERRIDES_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" | 213 | MACHINEOVERRIDES_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 | ||
211 | MACHINEOVERRIDES_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" | 215 | MACHINEOVERRIDES_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" |
212 | MACHINEOVERRIDES_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" | 216 | MACHINEOVERRIDES_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" |
213 | MACHINEOVERRIDES_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" | 217 | MACHINEOVERRIDES_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" |
214 | MACHINEOVERRIDES_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" | 218 | MACHINEOVERRIDES_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" |
215 | MACHINEOVERRIDES_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" | 219 | MACHINEOVERRIDES_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 | ||
217 | MACHINEOVERRIDES_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" | 221 | MACHINEOVERRIDES_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" |
218 | MACHINEOVERRIDES_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" | 222 | MACHINEOVERRIDES_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" |
219 | MACHINEOVERRIDES_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" | 223 | MACHINEOVERRIDES_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 | ||
221 | MACHINEOVERRIDES_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" | 225 | MACHINEOVERRIDES_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 | ||
227 | MACHINEOVERRIDES_EXTENDER:mx91:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:mx9-generic-bsp:mx9-nxp-bsp:mx91-generic-bsp:mx91-nxp-bsp" | ||
223 | MACHINEOVERRIDES_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" | 228 | MACHINEOVERRIDES_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" |
229 | MACHINEOVERRIDES_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 | ||
264 | MACHINEOVERRIDES_EXTENDER:mx8ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8ulp-generic-bsp:mx8ulp-mainline-bsp" | 270 | MACHINEOVERRIDES_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 | ||
272 | MACHINEOVERRIDES_EXTENDER:mx91:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx91-generic-bsp:mx91-mainline-bsp" | ||
266 | MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp" | 273 | MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp" |
274 | MACHINEOVERRIDES_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 | ||
268 | MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ | 276 | MACHINEOVERRIDES_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 | ||
300 | MACHINEOVERRIDES_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'." | 310 | MACHINEOVERRIDES_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" | |||
305 | MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl" | 315 | MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl" |
306 | MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx" | 316 | MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx" |
307 | MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl" | 317 | MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl" |
308 | MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp= "-mx6sll" | 318 | MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp = "-mx6sll" |
309 | MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d" | 319 | MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d" |
310 | MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp" | 320 | MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp" |
311 | MACHINE_SOCARCH_SUFFIX:vf-nxp-bsp = "-vf" | 321 | MACHINE_SOCARCH_SUFFIX:vf-nxp-bsp = "-vf" |
@@ -322,7 +332,9 @@ MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8" | |||
322 | MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp = "-mx8" | 332 | MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp = "-mx8" |
323 | MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8xl" | 333 | MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8xl" |
324 | MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp = "-mx8ulp" | 334 | MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp = "-mx8ulp" |
335 | MACHINE_SOCARCH_SUFFIX:mx91-nxp-bsp = "-mx91" | ||
325 | MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp = "-mx93" | 336 | MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp = "-mx93" |
337 | MACHINE_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 |
328 | MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx" | 340 | MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx" |
@@ -399,7 +411,11 @@ IMX_EXTRA_FIRMWARE:mx8-generic-bsp = "imx-boot-firmware-files imx-sc-firmware | |||
399 | IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "imx-boot-firmware-files" | 411 | IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "imx-boot-firmware-files" |
400 | IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco" | 412 | IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco" |
401 | IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx" | 413 | IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx" |
414 | IMX_EXTRA_FIRMWARE:mx91-generic-bsp = "imx-boot-firmware-files firmware-ele-imx" | ||
402 | IMX_EXTRA_FIRMWARE:mx93-generic-bsp = "imx-boot-firmware-files firmware-ele-imx" | 415 | IMX_EXTRA_FIRMWARE:mx93-generic-bsp = "imx-boot-firmware-files firmware-ele-imx" |
416 | PREFERRED_PROVIDER_virtual/imx-system-manager ??= "imx-system-manager" | ||
417 | PREFERRED_PROVIDER_virtual/imx-oei ??= "imx-oei" | ||
418 | IMX_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 |
405 | MACHINE_FIRMWARE ?= "" | 421 | MACHINE_FIRMWARE ?= "" |
@@ -420,6 +436,7 @@ MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d f | |||
420 | MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" | 436 | MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" |
421 | MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" | 437 | MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" |
422 | MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" | 438 | MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" |
439 | MACHINE_FIRMWARE:append:mx95-generic-bsp = " firmware-imx-vpu-wave" | ||
423 | MACHINE_FIRMWARE:append:imx-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" | 440 | MACHINE_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 | ||
425 | MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" | 442 | MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" |
@@ -510,14 +527,30 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin" | |||
510 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" | 527 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" |
511 | 528 | ||
512 | # GStreamer forked recipes | 529 | # GStreamer forked recipes |
513 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.22.5.imx" | 530 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.7.imx" |
514 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.22.5.imx" | 531 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.7.imx" |
515 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.22.5.imx" | 532 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx" |
516 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.22.5.imx" | 533 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx" |
517 | PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.22.5.imx" | 534 | PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.7.imx" |
518 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.22.5.imx" | 535 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.7.imx" |
519 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.22.5.imx" | 536 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx" |
520 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.22.5.imx" | 537 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx" |
538 | |||
539 | # GStreamer copied recipes | ||
540 | PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx" | ||
541 | PREFERRED_VERSION_gst-examples:mx8-nxp-bsp ??= "1.24.7.imx" | ||
542 | PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.7.imx" | ||
543 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx" | ||
544 | PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx" | ||
545 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx" | ||
546 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx" | ||
547 | PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.24.0.imx" | ||
548 | PREFERRED_VERSION_gst-examples:mx9-nxp-bsp ??= "1.24.7.imx" | ||
549 | PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.7.imx" | ||
550 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx" | ||
551 | PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.24.0.imx" | ||
552 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.24.0.imx" | ||
553 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp ??= "1.24.0.imx" | ||
521 | 554 | ||
522 | # GStreamer downgrade ffmpeg | 555 | # GStreamer downgrade ffmpeg |
523 | PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" | 556 | PREFERRED_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 |
533 | MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" | 566 | MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" |
534 | 567 | ||
535 | # Graphics libraries | 568 | # Override graphics for i.MX GPU |
536 | PREFERRED_PROVIDER_virtual/egl ?= "mesa" | 569 | IMXGPU_GRAPHICS_PROVIDER:imxviv ?= "imx-gpu-viv" |
537 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" | 570 | IMXGPU_GRAPHICS_PROVIDER:imxmali ?= "mali-imx" |
538 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | 571 | |
539 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | 572 | PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "${IMXGPU_GRAPHICS_PROVIDER}" |
540 | 573 | PREFERRED_PROVIDER_virtual/libgl:imxgpu ?= "mesa-gl" | |
541 | PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv" | 574 | PREFERRED_PROVIDER_virtual/mesa:imxgpu ?= "mesa-gl" |
542 | PREFERRED_PROVIDER_virtual/libgl:imxgpu ?= "mesa-gl" | 575 | PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}" |
543 | PREFERRED_PROVIDER_virtual/mesa:imxgpu ?= "mesa-gl" | 576 | PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}" |
544 | PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv" | 577 | PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}" |
545 | PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv" | 578 | |
546 | PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv" | 579 | # The Vivante OpenCL implementation doesn't work with the standard headers and loader |
547 | PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" | 580 | PREFERRED_PROVIDER_opencl-clhpp:imxviv ?= "imx-gpu-viv" |
548 | PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d" | 581 | PREFERRED_PROVIDER_opencl-headers:imxviv ?= "imx-gpu-viv" |
582 | PREFERRED_PROVIDER_opencl-icd-loader:imxviv ?= "imx-gpu-viv" | ||
583 | PREFERRED_PROVIDER_virtual/opencl-icd:imxviv ?= "imx-gpu-viv" | ||
584 | |||
585 | PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" | ||
586 | PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d" | ||
549 | PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d" | 587 | PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d" |
550 | PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv" | ||
551 | PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" | ||
552 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" | ||
553 | PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" | ||
554 | 588 | ||
555 | PREFERRED_VERSION_weston:imx-nxp-bsp ??= "12.0.3.imx" | 589 | PREFERRED_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 |
557 | PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" | 591 | PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" |
558 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" | 592 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" |
559 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" | 593 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" |
560 | 594 | ||
561 | PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.32.imx" | 595 | PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.37.imx" |
562 | PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ??= "1.32.imx" | ||
563 | PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.32.imx" | ||
564 | PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.32.imx" | ||
565 | 596 | ||
566 | PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" | 597 | PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx" |
567 | 598 | ||
568 | # Use i.MX libdrm Version | 599 | # Use i.MX libdrm Version |
569 | PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.116.imx" | 600 | PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.123.imx" |
570 | PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.116.imx" | 601 | |
571 | PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.116.imx" | 602 | PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.275.0.imx" |
572 | PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.116.imx" | 603 | PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.275.0.imx" |
573 | 604 | PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.275.0.imx" | |
574 | PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.261.1.imx" | 605 | PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.275.0.imx" |
575 | PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.261.1.imx" | 606 | PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.275.0.imx" |
576 | PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.261.1.imx" | 607 | PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx" |
577 | PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.261.1.imx" | ||
578 | PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.261.1.imx" | ||
579 | PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.261.1.imx" | ||
580 | 608 | ||
581 | # Use i.MX optee Version | 609 | # Use i.MX optee Version |
582 | PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.0.0.imx" | 610 | PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.4.0.imx" |
583 | PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.0.0.imx" | 611 | PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.4.0.imx" |
584 | PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.0.0.imx" | 612 | PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.4.0.imx" |
585 | PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.0.0.imx" | 613 | PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.4.0.imx" |
586 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.0.0.imx" | 614 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.4.0.imx" |
587 | PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.0.0.imx" | 615 | PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.4.0.imx" |
588 | 616 | ||
589 | # Use i.MX opencv Version | 617 | # Use i.MX opencv Version |
590 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" | 618 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" |
591 | PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx" | 619 | PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx" |
592 | 620 | ||
593 | # Handle default kernel | 621 | # Handle default kernel |
594 | IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" | 622 | IMX_DEFAULT_KERNEL:imx-mainline-bsp ??= "linux-fslc" |
595 | IMX_DEFAULT_KERNEL:imx-nxp-bsp = "linux-fslc-imx" | 623 | IMX_DEFAULT_KERNEL:imx-nxp-bsp ??= "linux-fslc-imx" |
596 | 624 | ||
597 | PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" | 625 | PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" |
598 | 626 | ||
@@ -611,7 +639,7 @@ IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" | |||
611 | 639 | ||
612 | IMAGE_BOOT_FILES ?= " \ | 640 | IMAGE_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 | ||
648 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" | 676 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" |
649 | SOC_DEFAULT_WKS_FILE:mx8-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" | ||
650 | SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" | 677 | SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" |
678 | SOC_DEFAULT_WKS_FILE:mx8-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" | ||
651 | SOC_DEFAULT_WKS_FILE:mx9-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" | 679 | SOC_DEFAULT_WKS_FILE:mx9-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" |
652 | 680 | ||
653 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | 681 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" |