From 867b32aea41d9b2ef2ba298d4da329b3e59adcd1 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 18 Oct 2016 13:11:25 -0200 Subject: [PATCH] imx-base: Add i.MX 6ULL base settings The i.MX 6ULL BSP base settings, this includes: - MACHINEOVERRIDES_EXTENDER for has PXP and EPDC display support; - UBOOT_ENTRYPOINT for uImage support; - DEFAULTTUNE so it uses cortexa7thf-neon by default; - MACHINE_SOCARCH_SUFFIX to share binaries with i.MX6UL; - Graphics preference to use software rendering; - MACHINE_FIRMWARE to include firmware-imx-epdc; - Default Linux kernel for linux-fslc-imx; Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 09ab4ad8..6eab64d8 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT_mx6 = "0x10008000" UBOOT_ENTRYPOINT_mx6sl = "0x80008000" UBOOT_ENTRYPOINT_mx6sx = "0x80008000" UBOOT_ENTRYPOINT_mx6ul = "0x10008000" +UBOOT_ENTRYPOINT_mx6ull = "0x10008000" UBOOT_ENTRYPOINT_mx7 = "0x80008000" UBOOT_ENTRYPOINT_vf = "0x80008000" @@ -45,6 +46,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" # handled by hardware DEFAULTTUNE_mx6 ?= "cortexa9thf-neon" DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon" +DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon" DEFAULTTUNE_mx7 ?= "cortexa7thf-neon" DEFAULTTUNE_vf ?= "cortexa5thf-neon" @@ -55,6 +57,7 @@ MACHINEOVERRIDES_EXTENDER_mx6dl = "imxpxp:imxipu:imxvpu:imxgpu2d:imxgpu3d:imxepd MACHINEOVERRIDES_EXTENDER_mx6sx = "imxpxp:imxgpu2d:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx6sl = "imxpxp:imxgpu2d:imxepdc" MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp" +MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc" MACHINEOVERRIDES_EXTENDER_mx7d = "imxpxp:imxepdc" # Sub-architecture support @@ -66,13 +69,15 @@ MACHINE_SOCARCH_SUFFIX_mx6sl = "-mx6sl" MACHINE_SOCARCH_SUFFIX_mx7d = "-mx7d" MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60" MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50" -MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" +MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" +MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul" MACHINE_ARCH_FILTER = "virtual/kernel" MACHINE_SOCARCH_FILTER_append_mx6 = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser" MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" MACHINE_SOCARCH_FILTER_append_mx6 = " cairo pango" MACHINE_SOCARCH_FILTER_append_mx6ul = " imx-codec imx-parser" +MACHINE_SOCARCH_FILTER_append_mx6ull = " imx-codec imx-parser" MACHINE_SOCARCH_FILTER_append_mx7 = " imx-codec imx-parser" INHERIT += "fsl-dynamic-packagearch" @@ -91,6 +96,7 @@ MACHINE_FIRMWARE_append_mx7 = " firmware-imx-epdc" MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc" MACHINE_FIRMWARE_append_mx6sl = " firmware-imx-epdc" +MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc" MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" @@ -131,27 +137,32 @@ PREFERRED_PROVIDER_virtual/egl_mx6dl ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/egl_mx6sx ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/egl_mx6sl ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/egl_mx6ul ?= "mesa" +PREFERRED_PROVIDER_virtual/egl_mx6ull ?= "mesa" PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles1_mx6sx ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles1_mx6sl ?= "mesa" PREFERRED_PROVIDER_virtual/libgles1_mx6ul ?= "mesa" +PREFERRED_PROVIDER_virtual/libgles1_mx6ull ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles2_mx6sx ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles2_mx6sl ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2_mx6ul ?= "mesa" +PREFERRED_PROVIDER_virtual/libgles2_mx6ull ?= "mesa" PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa" PREFERRED_PROVIDER_virtual/libgl_mx6ul ?= "mesa" +PREFERRED_PROVIDER_virtual/libgl_mx6ull ?= "mesa" PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libg2d_mx6ul = "" +PREFERRED_PROVIDER_virtual/libg2d_mx6ull = "" # Handle default kernel IMX_DEFAULT_KERNEL = "linux-imx" @@ -160,6 +171,7 @@ IMX_DEFAULT_KERNEL_mx5 = "linux-fslc" IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx" IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx" IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx" +IMX_DEFAULT_KERNEL_mx6ull = "linux-fslc-imx" PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" -- 2.40.1