diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/include/imx-base.inc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 4c7071b6..ba28ca37 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -65,6 +65,7 @@ MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc" | |||
65 | MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp" | 65 | MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp" |
66 | MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc" | 66 | MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc" |
67 | MACHINEOVERRIDES_EXTENDER_mx7d = "imxpxp:imxepdc" | 67 | MACHINEOVERRIDES_EXTENDER_mx7d = "imxpxp:imxepdc" |
68 | MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxgpu3d" | ||
68 | 69 | ||
69 | MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ | 70 | MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ |
70 | mx6 \ | 71 | mx6 \ |
@@ -91,6 +92,7 @@ MACHINE_SOCARCH_SUFFIX_mx6sx = "-mx6sx" | |||
91 | MACHINE_SOCARCH_SUFFIX_mx6sl = "-mx6sl" | 92 | MACHINE_SOCARCH_SUFFIX_mx6sl = "-mx6sl" |
92 | MACHINE_SOCARCH_SUFFIX_mx6sll= "-mx6sll" | 93 | MACHINE_SOCARCH_SUFFIX_mx6sll= "-mx6sll" |
93 | MACHINE_SOCARCH_SUFFIX_mx7d = "-mx7d" | 94 | MACHINE_SOCARCH_SUFFIX_mx7d = "-mx7d" |
95 | MACHINE_SOCARCH_SUFFIX_mx7ulp = "-mx7ulp" | ||
94 | MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60" | 96 | MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60" |
95 | MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50" | 97 | MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50" |
96 | MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" | 98 | MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" |
@@ -120,7 +122,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \ | |||
120 | # Firmware | 122 | # Firmware |
121 | MACHINE_FIRMWARE ?= "" | 123 | MACHINE_FIRMWARE ?= "" |
122 | MACHINE_FIRMWARE_append_mx25 = " firmware-imx-sdma-imx25" | 124 | MACHINE_FIRMWARE_append_mx25 = " firmware-imx-sdma-imx25" |
123 | MACHINE_FIRMWARE_append_mx7 = " firmware-imx-epdc" | 125 | MACHINE_FIRMWARE_append_mx7d = " firmware-imx-epdc" |
124 | MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" | 126 | MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" |
125 | MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc" | 127 | MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc" |
126 | MACHINE_FIRMWARE_append_mx6sl = " firmware-imx-epdc" | 128 | MACHINE_FIRMWARE_append_mx6sl = " firmware-imx-epdc" |
@@ -145,6 +147,7 @@ MACHINE_EXTRA_RRECOMMENDS_append_mx6sx = " ${@bb.utils.contains('DISTRO_FEATURES | |||
145 | MACHINE_EXTRA_RRECOMMENDS_append_mx6ul = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" | 147 | MACHINE_EXTRA_RRECOMMENDS_append_mx6ul = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" |
146 | MACHINE_EXTRA_RRECOMMENDS_append_mx6ull = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" | 148 | MACHINE_EXTRA_RRECOMMENDS_append_mx6ull = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" |
147 | MACHINE_EXTRA_RRECOMMENDS_append_mx7d = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" | 149 | MACHINE_EXTRA_RRECOMMENDS_append_mx7d = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" |
150 | MACHINE_EXTRA_RRECOMMENDS_append_mx7ulp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" | ||
148 | 151 | ||
149 | # Extra udev rules | 152 | # Extra udev rules |
150 | MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx" | 153 | MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx" |
@@ -165,6 +168,7 @@ SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6q = "1" | |||
165 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6dl = "1" | 168 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6dl = "1" |
166 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sx = "1" | 169 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sx = "1" |
167 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sl = "1" | 170 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sl = "1" |
171 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx7ulp = "1" | ||
168 | 172 | ||
169 | # Handle Vivante kernel driver setting: | 173 | # Handle Vivante kernel driver setting: |
170 | # 0 - machine does not have Vivante GPU driver support | 174 | # 0 - machine does not have Vivante GPU driver support |
@@ -179,6 +183,7 @@ PREFERRED_PROVIDER_virtual/egl_mx6sl ?= "imx-gpu-viv" | |||
179 | PREFERRED_PROVIDER_virtual/egl_mx6sll ?= "mesa" | 183 | PREFERRED_PROVIDER_virtual/egl_mx6sll ?= "mesa" |
180 | PREFERRED_PROVIDER_virtual/egl_mx6ul ?= "mesa" | 184 | PREFERRED_PROVIDER_virtual/egl_mx6ul ?= "mesa" |
181 | PREFERRED_PROVIDER_virtual/egl_mx6ull ?= "mesa" | 185 | PREFERRED_PROVIDER_virtual/egl_mx6ull ?= "mesa" |
186 | PREFERRED_PROVIDER_virtual/egl_mx7ulp ?= "imx-gpu-viv" | ||
182 | 187 | ||
183 | PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "imx-gpu-viv" | 188 | PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "imx-gpu-viv" |
184 | PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "imx-gpu-viv" | 189 | PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "imx-gpu-viv" |
@@ -187,6 +192,7 @@ PREFERRED_PROVIDER_virtual/libgles1_mx6sl ?= "mesa" | |||
187 | PREFERRED_PROVIDER_virtual/libgles1_mx6sll ?= "mesa" | 192 | PREFERRED_PROVIDER_virtual/libgles1_mx6sll ?= "mesa" |
188 | PREFERRED_PROVIDER_virtual/libgles1_mx6ul ?= "mesa" | 193 | PREFERRED_PROVIDER_virtual/libgles1_mx6ul ?= "mesa" |
189 | PREFERRED_PROVIDER_virtual/libgles1_mx6ull ?= "mesa" | 194 | PREFERRED_PROVIDER_virtual/libgles1_mx6ull ?= "mesa" |
195 | PREFERRED_PROVIDER_virtual/libgles1_mx7ulp ?= "imx-gpu-viv" | ||
190 | 196 | ||
191 | PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "imx-gpu-viv" | 197 | PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "imx-gpu-viv" |
192 | PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "imx-gpu-viv" | 198 | PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "imx-gpu-viv" |
@@ -195,6 +201,7 @@ PREFERRED_PROVIDER_virtual/libgles2_mx6sl ?= "mesa" | |||
195 | PREFERRED_PROVIDER_virtual/libgles2_mx6sll ?= "mesa" | 201 | PREFERRED_PROVIDER_virtual/libgles2_mx6sll ?= "mesa" |
196 | PREFERRED_PROVIDER_virtual/libgles2_mx6ul ?= "mesa" | 202 | PREFERRED_PROVIDER_virtual/libgles2_mx6ul ?= "mesa" |
197 | PREFERRED_PROVIDER_virtual/libgles2_mx6ull ?= "mesa" | 203 | PREFERRED_PROVIDER_virtual/libgles2_mx6ull ?= "mesa" |
204 | PREFERRED_PROVIDER_virtual/libgles2_mx7ulp ?= "imx-gpu-viv" | ||
198 | 205 | ||
199 | PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "imx-gpu-viv" | 206 | PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "imx-gpu-viv" |
200 | PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "imx-gpu-viv" | 207 | PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "imx-gpu-viv" |
@@ -203,11 +210,13 @@ PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa" | |||
203 | PREFERRED_PROVIDER_virtual/libgl_mx6sll ?= "mesa" | 210 | PREFERRED_PROVIDER_virtual/libgl_mx6sll ?= "mesa" |
204 | PREFERRED_PROVIDER_virtual/libgl_mx6ul ?= "mesa" | 211 | PREFERRED_PROVIDER_virtual/libgl_mx6ul ?= "mesa" |
205 | PREFERRED_PROVIDER_virtual/libgl_mx6ull ?= "mesa" | 212 | PREFERRED_PROVIDER_virtual/libgl_mx6ull ?= "mesa" |
213 | PREFERRED_PROVIDER_virtual/libgl_mx7ulp ?= "imx-gpu-viv" | ||
206 | 214 | ||
207 | PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv" | 215 | PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv" |
208 | PREFERRED_PROVIDER_virtual/libg2d_mx6sll ?= "" | 216 | PREFERRED_PROVIDER_virtual/libg2d_mx6sll ?= "" |
209 | PREFERRED_PROVIDER_virtual/libg2d_mx6ul = "" | 217 | PREFERRED_PROVIDER_virtual/libg2d_mx6ul = "" |
210 | PREFERRED_PROVIDER_virtual/libg2d_mx6ull = "" | 218 | PREFERRED_PROVIDER_virtual/libg2d_mx6ull = "" |
219 | PREFERRED_PROVIDER_virtual/libg2d_mx7ulp ?= "imx-gpu-viv" | ||
211 | 220 | ||
212 | # Handle default kernel | 221 | # Handle default kernel |
213 | IMX_DEFAULT_KERNEL = "linux-imx" | 222 | IMX_DEFAULT_KERNEL = "linux-imx" |
@@ -215,6 +224,7 @@ IMX_DEFAULT_KERNEL_mxs = "linux-fslc" | |||
215 | IMX_DEFAULT_KERNEL_mx5 = "linux-fslc" | 224 | IMX_DEFAULT_KERNEL_mx5 = "linux-fslc" |
216 | IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx" | 225 | IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx" |
217 | IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx" | 226 | IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx" |
227 | IMX_DEFAULT_KERNEL_mx7ulp = "linux-imx" | ||
218 | IMX_DEFAULT_KERNEL_mx6sll = "linux-imx" | 228 | IMX_DEFAULT_KERNEL_mx6sll = "linux-imx" |
219 | IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx" | 229 | IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx" |
220 | IMX_DEFAULT_KERNEL_mx6ull = "linux-fslc-imx" | 230 | IMX_DEFAULT_KERNEL_mx6ull = "linux-fslc-imx" |