diff options
-rw-r--r-- | conf/machine/include/imx-base.inc | 12 | ||||
-rw-r--r-- | recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index b95bee9e..59dd41ae 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -313,10 +313,14 @@ WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | |||
313 | # Certain machines override the default fsl u-boot with the | 313 | # Certain machines override the default fsl u-boot with the |
314 | # fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: | 314 | # fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: |
315 | # MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" | 315 | # MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" |
316 | UBOOT_MAKE_TARGET_use-fsl-bsp = "u-boot.imx" | 316 | UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" |
317 | UBOOT_SUFFIX_use-fsl-bsp = "imx" | 317 | UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" |
318 | SPL_BINARY_use-fsl-bsp = "" | 318 | SPL_BINARY_use-fsl-bsp_mx6 = "" |
319 | WKS_FILE_use-fsl-bsp = "imx-uboot-bootpart.wks" | 319 | WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks" |
320 | UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" | ||
321 | UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" | ||
322 | SPL_BINARY_use-fsl-bsp_mx7 = "" | ||
323 | WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks" | ||
320 | 324 | ||
321 | SERIAL_CONSOLES = "115200;ttymxc0" | 325 | SERIAL_CONSOLES = "115200;ttymxc0" |
322 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" | 326 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" |
diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb index fd7f8610..a5a9cdfe 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb | |||
@@ -26,7 +26,7 @@ PACKAGECONFIG_append_imxgpu3d = "${PACKAGECONFIG_IMXGPU3D}" | |||
26 | 26 | ||
27 | PACKAGECONFIG[multiarch] = "-DENABLE_MULTIARCH=ON,-DENABLE_MULTIARCH=OFF" | 27 | PACKAGECONFIG[multiarch] = "-DENABLE_MULTIARCH=ON,-DENABLE_MULTIARCH=OFF" |
28 | PACKAGECONFIG[waffle] = "-DENABLE_WAFFLE=ON,-DENABLE_WAFFLE=OFF,waffle" | 28 | PACKAGECONFIG[waffle] = "-DENABLE_WAFFLE=ON,-DENABLE_WAFFLE=OFF,waffle" |
29 | PACKAGECONFIG[x11] = "-DDISABLE_X11=OFF,-DDISABLE_X11=ON" | 29 | PACKAGECONFIG[x11] = "-DENABLE_X11=ON,-DENABLE_X11=OFF" |
30 | PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=ON,-Dwaffle_has_x11_egl=OFF" | 30 | PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=ON,-Dwaffle_has_x11_egl=OFF" |
31 | PACKAGECONFIG[vivante] = "-DENABLE_VIVANTE=ON,-DENABLE_VIVANTE=OFF,virtual/libg2d" | 31 | PACKAGECONFIG[vivante] = "-DENABLE_VIVANTE=ON,-DENABLE_VIVANTE=OFF,virtual/libg2d" |
32 | 32 | ||