diff options
| -rw-r--r-- | conf/machine/include/imx-base.inc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 09ab4ad88..6eab64d83 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT_mx6 = "0x10008000" | |||
| 22 | UBOOT_ENTRYPOINT_mx6sl = "0x80008000" | 22 | UBOOT_ENTRYPOINT_mx6sl = "0x80008000" |
| 23 | UBOOT_ENTRYPOINT_mx6sx = "0x80008000" | 23 | UBOOT_ENTRYPOINT_mx6sx = "0x80008000" |
| 24 | UBOOT_ENTRYPOINT_mx6ul = "0x10008000" | 24 | UBOOT_ENTRYPOINT_mx6ul = "0x10008000" |
| 25 | UBOOT_ENTRYPOINT_mx6ull = "0x10008000" | ||
| 25 | UBOOT_ENTRYPOINT_mx7 = "0x80008000" | 26 | UBOOT_ENTRYPOINT_mx7 = "0x80008000" |
| 26 | UBOOT_ENTRYPOINT_vf = "0x80008000" | 27 | UBOOT_ENTRYPOINT_vf = "0x80008000" |
| 27 | 28 | ||
| @@ -45,6 +46,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" | |||
| 45 | # handled by hardware | 46 | # handled by hardware |
| 46 | DEFAULTTUNE_mx6 ?= "cortexa9thf-neon" | 47 | DEFAULTTUNE_mx6 ?= "cortexa9thf-neon" |
| 47 | DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon" | 48 | DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon" |
| 49 | DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon" | ||
| 48 | DEFAULTTUNE_mx7 ?= "cortexa7thf-neon" | 50 | DEFAULTTUNE_mx7 ?= "cortexa7thf-neon" |
| 49 | DEFAULTTUNE_vf ?= "cortexa5thf-neon" | 51 | DEFAULTTUNE_vf ?= "cortexa5thf-neon" |
| 50 | 52 | ||
| @@ -55,6 +57,7 @@ MACHINEOVERRIDES_EXTENDER_mx6dl = "imxpxp:imxipu:imxvpu:imxgpu2d:imxgpu3d:imxepd | |||
| 55 | MACHINEOVERRIDES_EXTENDER_mx6sx = "imxpxp:imxgpu2d:imxgpu3d" | 57 | MACHINEOVERRIDES_EXTENDER_mx6sx = "imxpxp:imxgpu2d:imxgpu3d" |
| 56 | MACHINEOVERRIDES_EXTENDER_mx6sl = "imxpxp:imxgpu2d:imxepdc" | 58 | MACHINEOVERRIDES_EXTENDER_mx6sl = "imxpxp:imxgpu2d:imxepdc" |
| 57 | MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp" | 59 | MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp" |
| 60 | MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc" | ||
| 58 | MACHINEOVERRIDES_EXTENDER_mx7d = "imxpxp:imxepdc" | 61 | MACHINEOVERRIDES_EXTENDER_mx7d = "imxpxp:imxepdc" |
| 59 | 62 | ||
| 60 | # Sub-architecture support | 63 | # Sub-architecture support |
| @@ -66,13 +69,15 @@ MACHINE_SOCARCH_SUFFIX_mx6sl = "-mx6sl" | |||
| 66 | MACHINE_SOCARCH_SUFFIX_mx7d = "-mx7d" | 69 | MACHINE_SOCARCH_SUFFIX_mx7d = "-mx7d" |
| 67 | MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60" | 70 | MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60" |
| 68 | MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50" | 71 | MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50" |
| 69 | MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" | 72 | MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" |
| 73 | MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul" | ||
| 70 | 74 | ||
| 71 | MACHINE_ARCH_FILTER = "virtual/kernel" | 75 | MACHINE_ARCH_FILTER = "virtual/kernel" |
| 72 | MACHINE_SOCARCH_FILTER_append_mx6 = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser" | 76 | MACHINE_SOCARCH_FILTER_append_mx6 = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser" |
| 73 | MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" | 77 | MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" |
| 74 | MACHINE_SOCARCH_FILTER_append_mx6 = " cairo pango" | 78 | MACHINE_SOCARCH_FILTER_append_mx6 = " cairo pango" |
| 75 | MACHINE_SOCARCH_FILTER_append_mx6ul = " imx-codec imx-parser" | 79 | MACHINE_SOCARCH_FILTER_append_mx6ul = " imx-codec imx-parser" |
| 80 | MACHINE_SOCARCH_FILTER_append_mx6ull = " imx-codec imx-parser" | ||
| 76 | MACHINE_SOCARCH_FILTER_append_mx7 = " imx-codec imx-parser" | 81 | MACHINE_SOCARCH_FILTER_append_mx7 = " imx-codec imx-parser" |
| 77 | 82 | ||
| 78 | INHERIT += "fsl-dynamic-packagearch" | 83 | INHERIT += "fsl-dynamic-packagearch" |
| @@ -91,6 +96,7 @@ MACHINE_FIRMWARE_append_mx7 = " firmware-imx-epdc" | |||
| 91 | MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" | 96 | MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" |
| 92 | MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc" | 97 | MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc" |
| 93 | MACHINE_FIRMWARE_append_mx6sl = " firmware-imx-epdc" | 98 | MACHINE_FIRMWARE_append_mx6sl = " firmware-imx-epdc" |
| 99 | MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc" | ||
| 94 | MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" | 100 | MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" |
| 95 | MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" | 101 | MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" |
| 96 | 102 | ||
| @@ -131,27 +137,32 @@ PREFERRED_PROVIDER_virtual/egl_mx6dl ?= "imx-gpu-viv" | |||
| 131 | PREFERRED_PROVIDER_virtual/egl_mx6sx ?= "imx-gpu-viv" | 137 | PREFERRED_PROVIDER_virtual/egl_mx6sx ?= "imx-gpu-viv" |
| 132 | PREFERRED_PROVIDER_virtual/egl_mx6sl ?= "imx-gpu-viv" | 138 | PREFERRED_PROVIDER_virtual/egl_mx6sl ?= "imx-gpu-viv" |
| 133 | PREFERRED_PROVIDER_virtual/egl_mx6ul ?= "mesa" | 139 | PREFERRED_PROVIDER_virtual/egl_mx6ul ?= "mesa" |
| 140 | PREFERRED_PROVIDER_virtual/egl_mx6ull ?= "mesa" | ||
| 134 | 141 | ||
| 135 | PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "imx-gpu-viv" | 142 | PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "imx-gpu-viv" |
| 136 | PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "imx-gpu-viv" | 143 | PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "imx-gpu-viv" |
| 137 | PREFERRED_PROVIDER_virtual/libgles1_mx6sx ?= "imx-gpu-viv" | 144 | PREFERRED_PROVIDER_virtual/libgles1_mx6sx ?= "imx-gpu-viv" |
| 138 | PREFERRED_PROVIDER_virtual/libgles1_mx6sl ?= "mesa" | 145 | PREFERRED_PROVIDER_virtual/libgles1_mx6sl ?= "mesa" |
| 139 | PREFERRED_PROVIDER_virtual/libgles1_mx6ul ?= "mesa" | 146 | PREFERRED_PROVIDER_virtual/libgles1_mx6ul ?= "mesa" |
| 147 | PREFERRED_PROVIDER_virtual/libgles1_mx6ull ?= "mesa" | ||
| 140 | 148 | ||
| 141 | PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "imx-gpu-viv" | 149 | PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "imx-gpu-viv" |
| 142 | PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "imx-gpu-viv" | 150 | PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "imx-gpu-viv" |
| 143 | PREFERRED_PROVIDER_virtual/libgles2_mx6sx ?= "imx-gpu-viv" | 151 | PREFERRED_PROVIDER_virtual/libgles2_mx6sx ?= "imx-gpu-viv" |
| 144 | PREFERRED_PROVIDER_virtual/libgles2_mx6sl ?= "mesa" | 152 | PREFERRED_PROVIDER_virtual/libgles2_mx6sl ?= "mesa" |
| 145 | PREFERRED_PROVIDER_virtual/libgles2_mx6ul ?= "mesa" | 153 | PREFERRED_PROVIDER_virtual/libgles2_mx6ul ?= "mesa" |
| 154 | PREFERRED_PROVIDER_virtual/libgles2_mx6ull ?= "mesa" | ||
| 146 | 155 | ||
| 147 | PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "imx-gpu-viv" | 156 | PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "imx-gpu-viv" |
| 148 | PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "imx-gpu-viv" | 157 | PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "imx-gpu-viv" |
| 149 | PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "imx-gpu-viv" | 158 | PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "imx-gpu-viv" |
| 150 | PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa" | 159 | PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa" |
| 151 | PREFERRED_PROVIDER_virtual/libgl_mx6ul ?= "mesa" | 160 | PREFERRED_PROVIDER_virtual/libgl_mx6ul ?= "mesa" |
| 161 | PREFERRED_PROVIDER_virtual/libgl_mx6ull ?= "mesa" | ||
| 152 | 162 | ||
| 153 | PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv" | 163 | PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv" |
| 154 | PREFERRED_PROVIDER_virtual/libg2d_mx6ul = "" | 164 | PREFERRED_PROVIDER_virtual/libg2d_mx6ul = "" |
| 165 | PREFERRED_PROVIDER_virtual/libg2d_mx6ull = "" | ||
| 155 | 166 | ||
| 156 | # Handle default kernel | 167 | # Handle default kernel |
| 157 | IMX_DEFAULT_KERNEL = "linux-imx" | 168 | IMX_DEFAULT_KERNEL = "linux-imx" |
| @@ -160,6 +171,7 @@ IMX_DEFAULT_KERNEL_mx5 = "linux-fslc" | |||
| 160 | IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx" | 171 | IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx" |
| 161 | IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx" | 172 | IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx" |
| 162 | IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx" | 173 | IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx" |
| 174 | IMX_DEFAULT_KERNEL_mx6ull = "linux-fslc-imx" | ||
| 163 | 175 | ||
| 164 | PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" | 176 | PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" |
| 165 | 177 | ||
