diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2022-02-18 19:43:56 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2022-02-21 20:06:28 -0300 |
commit | 30f5ce1d2168389295b4813e01898c2fb0f9bab9 (patch) | |
tree | f6f78dbf8e5eef40510739dc1db79d60f05189fb /conf/machine/include | |
parent | a3b102a9ed12ea03e72f713ed40968da1776c6d3 (diff) | |
download | meta-freescale-30f5ce1d2168389295b4813e01898c2fb0f9bab9.tar.gz |
Generalize overrides subsystem for NXP and Mainline support
Essentially, we extend the overrides to a generic-bsp, nxp-bsp, and
mainline-bsp.
So, for example, the mx8mq override is split into:
- imx-generic-bsp: compatible with every i.MX SoC and both BSP variants
- imx-nxp-bsp: compatible with every i.MX SoC but specific to NXP BSP
- imx-mainline-bsp: compatible with every i.MX SoC but specific to Mainline BSP
- mx8-generic-bsp: compatible with every i.MX8 SoC and both BSP variants
- mx8-nxp-bsp: compatible with every i.MX8 SoC but specific to NXP BSP
- mx8-mainline-bsp: compatible with every i.MX8 SoC but specific to Mainline BSP
- mx8m-generic-bsp: compatible with every i.MX8M SoC and both BSP variants
- mx8m-nxp-bsp: compatible with every i.MX8M SoC but specific to NXP BSP
- mx8m-mainline-bsp: compatible with every i.MX8M SoC but specific to Mainline BSP
- mx8mq-generic-bsp: compatible with every i.MX8MQ SoC and both BSP variants
- mx8mq-nxp-bsp: compatible with every i.MX8MQ SoC8 but specific to NXP BSP
- mx8mq-mainline-bsp: compatible with every i.MX8MQ SoC but specific to Mainline BSP
The extender mechanism is responsible for extending the override list to
include the generic overrides. We can then use the three different
variants to handle the metadata correctly.
Generically speaking, the conversion mainly was automated (with a lot of
back and forth until getting it right).
To convert an existing layer, the following script can be used:
```sh
git ls-files classes recipes-* \
| xargs sed -i \
-e 's,:\(mx[6-8]\w*\),:\1-nxp-bsp,g' \
-e 's,(\(mx[6-8]\w*\)),(\1-nxp-bsp),g' \
-e 's,\(mx[6-8]\w*\)|,\1-nxp-bsp|,g' \
-e 's,|\(mx[6-8]\w*\)),|\1-nxp-bsp),g' \
\
-e 's,:\(mx[5s]\w*\),:\1-generic-bsp,g' \
-e 's,(\(mx[5s]\w*\)),(\1-generic-bsp),g' \
-e 's,\(mx[5s]\w*\)|,\1-generic-bsp|,g' \
-e 's,|\(mx[5s]\w*\)),|\1-generic-bsp),g' \
\
-e 's,:\(vf\w*\),:\1-generic-bsp,g' \
-e 's,:\(vf[56]0\w*\),:\1-generic-bsp,g' \
-e 's,\(vf\w*\)|,\1-generic-bsp|,g' \
-e 's,|\(vf\w*\)),|\1-generic-bsp),g' \
-e 's,\(vf[56]0\w*\)|,\1-generic-bsp|,g' \
-e 's,|\(vf[56]0\w*\)),|\1-generic-bsp),g' \
\
-e 's,:\(imx\) ,:\1-nxp-bsp ,g' \
-e 's,(\(imx\)),(\1-nxp-bsp),g' \
-e 's,\(imx\)|,\1-nxp-bsp|,g' \
-e 's,|\(imx\)),|\1-nxp-bsp),g'
for d in $(find -type d | egrep '/mx[6-8]w*'); do
git mv $d $d-nxp-bsp
done
for d in $(find -type d | egrep '/imx$'); do
git mv $d $d-nxp-bsp
done
for d in $(find -type d | egrep '/mx[5s]w*'); do
git mv $d $d-generic-bsp
done
```
Fixes: #791.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf/machine/include')
-rw-r--r-- | conf/machine/include/imx-base.inc | 336 |
1 files changed, 189 insertions, 147 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 6136713d..d49560e9 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -75,20 +75,20 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" | |||
75 | 75 | ||
76 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" | 76 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" |
77 | 77 | ||
78 | UBOOT_ENTRYPOINT:mxs = "0x40008000" | 78 | UBOOT_ENTRYPOINT:mxs-generic-bsp = "0x40008000" |
79 | UBOOT_ENTRYPOINT:mx51 = "0x90008000" | 79 | UBOOT_ENTRYPOINT:mx51-generic-bsp = "0x90008000" |
80 | UBOOT_ENTRYPOINT:mx53 = "0x70008000" | 80 | UBOOT_ENTRYPOINT:mx53-generic-bsp = "0x70008000" |
81 | UBOOT_ENTRYPOINT:mx6 = "0x10008000" | 81 | UBOOT_ENTRYPOINT:mx6-generic-bsp = "0x10008000" |
82 | UBOOT_ENTRYPOINT:mx6sl = "0x80008000" | 82 | UBOOT_ENTRYPOINT:mx6sl-generic-bsp = "0x80008000" |
83 | UBOOT_ENTRYPOINT:mx6sll = "0x80008000" | 83 | UBOOT_ENTRYPOINT:mx6sll-generic-bsp = "0x80008000" |
84 | UBOOT_ENTRYPOINT:mx6sx = "0x80008000" | 84 | UBOOT_ENTRYPOINT:mx6sx-generic-bsp = "0x80008000" |
85 | UBOOT_ENTRYPOINT:mx6ul = "0x80008000" | 85 | UBOOT_ENTRYPOINT:mx6ul-generic-bsp = "0x80008000" |
86 | UBOOT_ENTRYPOINT:mx6ull = "0x80008000" | 86 | UBOOT_ENTRYPOINT:mx6ull-generic-bsp = "0x80008000" |
87 | UBOOT_ENTRYPOINT:mx6ulz = "0x80008000" | 87 | UBOOT_ENTRYPOINT:mx6ulz-generic-bsp = "0x80008000" |
88 | UBOOT_ENTRYPOINT:mx7 = "0x80008000" | 88 | UBOOT_ENTRYPOINT:mx7-generic-bsp = "0x80008000" |
89 | UBOOT_ENTRYPOINT:mx7ulp = "0x60008000" | 89 | UBOOT_ENTRYPOINT:mx7ulp-generic-bsp = "0x60008000" |
90 | UBOOT_ENTRYPOINT:mx8m = "0x40480000" | 90 | UBOOT_ENTRYPOINT:mx8m-generic-bsp = "0x40480000" |
91 | UBOOT_ENTRYPOINT:vf = "0x80008000" | 91 | UBOOT_ENTRYPOINT:vf-generic-bsp = "0x80008000" |
92 | 92 | ||
93 | # Some derivates can utilize the boot container provided by U-Boot, | 93 | # Some derivates can utilize the boot container provided by U-Boot, |
94 | # below variable sets that those machines which have a imx-boot-container | 94 | # below variable sets that those machines which have a imx-boot-container |
@@ -96,11 +96,11 @@ UBOOT_ENTRYPOINT:vf = "0x80008000" | |||
96 | UBOOT_PROVIDES_BOOT_CONTAINER = "0" | 96 | UBOOT_PROVIDES_BOOT_CONTAINER = "0" |
97 | UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1" | 97 | UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1" |
98 | 98 | ||
99 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 99 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" |
100 | XSERVER_DRIVER = "xf86-video-fbdev" | 100 | XSERVER_DRIVER = "xf86-video-fbdev" |
101 | XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante" | 101 | XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante" |
102 | XSERVER_DRIVER:vf = "xf86-video-modesetting" | 102 | XSERVER_DRIVER:vf-generic-bsp = "xf86-video-modesetting" |
103 | XSERVER_DRIVER:append:mx8 = " xf86-video-modesetting" | 103 | XSERVER_DRIVER:append:mx8-generic-bsp = " xf86-video-modesetting" |
104 | XSERVER_DRIVER:use-mainline-bsp = " \ | 104 | XSERVER_DRIVER:use-mainline-bsp = " \ |
105 | xf86-video-fbdev \ | 105 | xf86-video-fbdev \ |
106 | xf86-video-modesetting \ | 106 | xf86-video-modesetting \ |
@@ -118,42 +118,87 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" | |||
118 | # ARM_INSTRUCTION_SET = "thumb" | 118 | # ARM_INSTRUCTION_SET = "thumb" |
119 | # | 119 | # |
120 | # handled by software | 120 | # handled by software |
121 | # DEFAULTTUNE:mx6 ?= "cortexa9t-neon" | 121 | # DEFAULTTUNE:mx6-generic-bsp ?= "cortexa9t-neon" |
122 | # handled by hardware | 122 | # handled by hardware |
123 | DEFAULTTUNE:mx6 ?= "cortexa9thf-neon" | 123 | DEFAULTTUNE:mx6-generic-bsp ?= "cortexa9thf-neon" |
124 | DEFAULTTUNE:mx6ul ?= "cortexa7thf-neon" | 124 | DEFAULTTUNE:mx6ul-generic-bsp ?= "cortexa7thf-neon" |
125 | DEFAULTTUNE:mx6ull ?= "cortexa7thf-neon" | 125 | DEFAULTTUNE:mx6ull-generic-bsp ?= "cortexa7thf-neon" |
126 | DEFAULTTUNE:mx6ulz ?= "cortexa7thf-neon" | 126 | DEFAULTTUNE:mx6ulz-generic-bsp ?= "cortexa7thf-neon" |
127 | DEFAULTTUNE:mx7 ?= "cortexa7thf-neon" | 127 | DEFAULTTUNE:mx7-generic-bsp ?= "cortexa7thf-neon" |
128 | DEFAULTTUNE:vf ?= "cortexa5thf-neon" | 128 | DEFAULTTUNE:vf-generic-bsp ?= "cortexa5thf-neon" |
129 | 129 | ||
130 | DEFAULTTUNE:mx8m ?= "cortexa53-crypto" | 130 | DEFAULTTUNE:mx8m-generic-bsp ?= "cortexa53-crypto" |
131 | DEFAULTTUNE:mx8qm ?= "cortexa72-cortexa53-crypto" | 131 | DEFAULTTUNE:mx8qm-generic-bsp ?= "cortexa72-cortexa53-crypto" |
132 | DEFAULTTUNE:mx8qxp ?= "cortexa35-crypto" | 132 | DEFAULTTUNE:mx8qxp-generic-bsp ?= "cortexa35-crypto" |
133 | 133 | ||
134 | INHERIT += "machine-overrides-extender" | 134 | INHERIT += "machine-overrides-extender" |
135 | 135 | ||
136 | MACHINEOVERRIDES_EXTENDER:mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d" | 136 | ####### |
137 | MACHINEOVERRIDES_EXTENDER:mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc" | 137 | ### NXP BSP specific overrides |
138 | MACHINEOVERRIDES_EXTENDER:mx6sx = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" | 138 | ####### |
139 | MACHINEOVERRIDES_EXTENDER:mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc" | 139 | |
140 | MACHINEOVERRIDES_EXTENDER:mx6sll = "imxfbdev:imxpxp:imxepdc" | 140 | MACHINEOVERRIDES_EXTENDER:mx6q:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6q-generic-bsp:mx6q-nxp-bsp:imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d" |
141 | MACHINEOVERRIDES_EXTENDER:mx6ul = "imxfbdev:imxpxp" | 141 | MACHINEOVERRIDES_EXTENDER:mx6dl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6dl-generic-bsp:mx6dl-nxp-bsp:imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc" |
142 | MACHINEOVERRIDES_EXTENDER:mx6ull = "imxfbdev:imxpxp:imxepdc" | 142 | |
143 | MACHINEOVERRIDES_EXTENDER:mx6ulz = "imxfbdev:imxpxp:imxepdc" | 143 | MACHINEOVERRIDES_EXTENDER:mx6sx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6sx-generic-bsp:mx6sx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" |
144 | MACHINEOVERRIDES_EXTENDER:mx7d = "imxfbdev:imxpxp:imxepdc" | 144 | |
145 | MACHINEOVERRIDES_EXTENDER:mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" | 145 | MACHINEOVERRIDES_EXTENDER:mx6sl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc" |
146 | MACHINEOVERRIDES_EXTENDER:mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" | 146 | MACHINEOVERRIDES_EXTENDER:mx6sll:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp:mx6sll-generic-bsp:mx6sll-nxp-bsp:imxfbdev:imxpxp:imxepdc" |
147 | MACHINEOVERRIDES_EXTENDER:mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" | 147 | |
148 | MACHINEOVERRIDES_EXTENDER:mx8mn = "imxdrm:imxgpu:imxgpu3d" | 148 | MACHINEOVERRIDES_EXTENDER:mx6ul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:imxfbdev:imxpxp" |
149 | MACHINEOVERRIDES_EXTENDER:mx8mp = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" | 149 | MACHINEOVERRIDES_EXTENDER:mx6ull:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp:imxfbdev:imxpxp:imxepdc" |
150 | MACHINEOVERRIDES_EXTENDER:mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d" | 150 | MACHINEOVERRIDES_EXTENDER:mx6ulz:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp:mx6ulz-generic-bsp:mx6ulz-nxp-bsp:imxfbdev:imxpxp:imxepdc" |
151 | MACHINEOVERRIDES_EXTENDER:mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" | 151 | |
152 | MACHINEOVERRIDES_EXTENDER:mx8dxl = "imxfbdev" | 152 | MACHINEOVERRIDES_EXTENDER:mx7d:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx7-generic-bsp:mx7-nxp-bsp:mx7d-generic-bsp:mx7d-nxp-bsp:imxfbdev:imxpxp:imxepdc" |
153 | 153 | MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx7-generic-bsp:mx7-nxp-bsp:mx7ulp-generic-bsp:mx7ulp-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" | |
154 | MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \ | 154 | |
155 | imx \ | 155 | MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" |
156 | \ | 156 | |
157 | MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" | ||
158 | MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp:imxdrm:imxgpu:imxgpu3d" | ||
159 | MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" | ||
160 | MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu3d" | ||
161 | |||
162 | MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" | ||
163 | MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8dxl-generic-bsp:mx8dxl-nxp-bsp:imxfbdev" | ||
164 | |||
165 | ####### | ||
166 | ### Mainline BSP specific overrides | ||
167 | ####### | ||
168 | |||
169 | MACHINEOVERRIDES_EXTENDER:mx27:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx27-generic-bsp:mx27-mainline-bsp" | ||
170 | |||
171 | MACHINEOVERRIDES_EXTENDER:mx28:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mxs-generic-bsp:mxs-mainline-bsp:mx28-generic-bsp:mx28-mainline-bsp" | ||
172 | |||
173 | MACHINEOVERRIDES_EXTENDER:mx51:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx51-generic-bsp:mx51-mainline-bsp" | ||
174 | MACHINEOVERRIDES_EXTENDER:mx53:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx53-generic-bsp:mx53-mainline-bsp" | ||
175 | |||
176 | MACHINEOVERRIDES_EXTENDER:mx6q:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6q-generic-bsp:mx6q-mainline-bsp" | ||
177 | MACHINEOVERRIDES_EXTENDER:mx6dl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6dl-generic-bsp:mx6dl-mainline-bsp" | ||
178 | |||
179 | MACHINEOVERRIDES_EXTENDER:mx6sx:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sx-generic-bsp:mx6sx-mainline-bsp" | ||
180 | |||
181 | MACHINEOVERRIDES_EXTENDER:mx6sl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sl-generic-bsp:mx6sl-mainline-bsp" | ||
182 | MACHINEOVERRIDES_EXTENDER:mx6sll:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sll-generic-bsp:mx6sll-mainline-bsp" | ||
183 | |||
184 | MACHINEOVERRIDES_EXTENDER:mx6ul:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6ul-generic-bsp:mx6ul-mainline-bsp" | ||
185 | MACHINEOVERRIDES_EXTENDER:mx6ull:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6ul-generic-bsp:mx6ul-mainline-bsp:mx6ull-generic-bsp:mx6ull-mainline-bsp" | ||
186 | MACHINEOVERRIDES_EXTENDER:mx6ulz:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6ul-generic-bsp:mx6ul-mainline-bsp:mx6ull-generic-bsp:mx6ull-mainline-bsp:mx6ulz-generic-bsp:mx6ulz-mainline-bsp" | ||
187 | |||
188 | MACHINEOVERRIDES_EXTENDER:mx7d:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx7-generic-bsp:mx7-mainline-bsp:mx7d-generic-bsp:mx7d-mainline-bsp" | ||
189 | MACHINEOVERRIDES_EXTENDER:mx7ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx7-generic-bsp:mx7-mainline-bsp:mx7ulp-generic-bsp:mx7ulp-mainline-bsp" | ||
190 | |||
191 | MACHINEOVERRIDES_EXTENDER:mx8qm:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8qm-generic-bsp:mx8qm-mainline-bsp" | ||
192 | |||
193 | MACHINEOVERRIDES_EXTENDER:mx8mm:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mm-generic-bsp:mx8mm-mainline-bsp" | ||
194 | MACHINEOVERRIDES_EXTENDER:mx8mn:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mn-generic-bsp:mx8mn-mainline-bsp" | ||
195 | MACHINEOVERRIDES_EXTENDER:mx8mp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mp-generic-bsp:mx8mp-mainline-bsp" | ||
196 | MACHINEOVERRIDES_EXTENDER:mx8mq:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mq-generic-bsp:mx8mq-mainline-bsp" | ||
197 | |||
198 | MACHINEOVERRIDES_EXTENDER:mx8qxp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8qxp-generic-bsp:mx8qxp-mainline-bsp" | ||
199 | MACHINEOVERRIDES_EXTENDER:mx8dxl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8dxl-generic-bsp:mx8dxl-mainline-bsp" | ||
200 | |||
201 | MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ | ||
157 | mx6 \ | 202 | mx6 \ |
158 | mx6q \ | 203 | mx6q \ |
159 | mx6dl \ | 204 | mx6dl \ |
@@ -181,29 +226,29 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \ | |||
181 | 226 | ||
182 | # Sub-architecture support | 227 | # Sub-architecture support |
183 | MACHINE_SOCARCH_SUFFIX ?= "" | 228 | MACHINE_SOCARCH_SUFFIX ?= "" |
184 | MACHINE_SOCARCH_SUFFIX:mx6q = "-mx6qdl" | 229 | MACHINE_SOCARCH_SUFFIX:mx6q-nxp-bsp = "-mx6qdl" |
185 | MACHINE_SOCARCH_SUFFIX:mx6dl = "-mx6qdl" | 230 | MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl" |
186 | MACHINE_SOCARCH_SUFFIX:mx6sx = "-mx6sx" | 231 | MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx" |
187 | MACHINE_SOCARCH_SUFFIX:mx6sl = "-mx6sl" | 232 | MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl" |
188 | MACHINE_SOCARCH_SUFFIX:mx6sll= "-mx6sll" | 233 | MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp= "-mx6sll" |
189 | MACHINE_SOCARCH_SUFFIX:mx7d = "-mx7d" | 234 | MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d" |
190 | MACHINE_SOCARCH_SUFFIX:mx7ulp = "-mx7ulp" | 235 | MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp" |
191 | MACHINE_SOCARCH_SUFFIX:vf60 = "-vf60" | 236 | MACHINE_SOCARCH_SUFFIX:vf60-nxp-bsp = "-vf60" |
192 | MACHINE_SOCARCH_SUFFIX:vf50 = "-vf50" | 237 | MACHINE_SOCARCH_SUFFIX:vf50-nxp-bsp = "-vf50" |
193 | MACHINE_SOCARCH_SUFFIX:mx6ul = "-mx6ul" | 238 | MACHINE_SOCARCH_SUFFIX:mx6ul-nxp-bsp = "-mx6ul" |
194 | MACHINE_SOCARCH_SUFFIX:mx6ull = "-mx6ul" | 239 | MACHINE_SOCARCH_SUFFIX:mx6ull-nxp-bsp = "-mx6ul" |
195 | MACHINE_SOCARCH_SUFFIX:mx6ulz = "-mx6ul" | 240 | MACHINE_SOCARCH_SUFFIX:mx6ulz-nxp-bsp = "-mx6ul" |
196 | MACHINE_SOCARCH_SUFFIX:mx8qm = "-mx8" | 241 | MACHINE_SOCARCH_SUFFIX:mx8qm-nxp-bsp = "-mx8" |
197 | MACHINE_SOCARCH_SUFFIX:mx8mm = "-mx8mm" | 242 | MACHINE_SOCARCH_SUFFIX:mx8mm-nxp-bsp = "-mx8mm" |
198 | MACHINE_SOCARCH_SUFFIX:mx8mn = "-mx8mn" | 243 | MACHINE_SOCARCH_SUFFIX:mx8mn-nxp-bsp = "-mx8mn" |
199 | MACHINE_SOCARCH_SUFFIX:mx8mp = "-mx8mp" | 244 | MACHINE_SOCARCH_SUFFIX:mx8mp-nxp-bsp = "-mx8mp" |
200 | MACHINE_SOCARCH_SUFFIX:mx8mq = "-mx8m" | 245 | MACHINE_SOCARCH_SUFFIX:mx8mq-nxp-bsp = "-mx8m" |
201 | MACHINE_SOCARCH_SUFFIX:mx8qxp = "-mx8" | 246 | MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8" |
202 | MACHINE_SOCARCH_SUFFIX:mx8dxl = "-mx8dxl" | 247 | MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8dxl" |
203 | MACHINE_SOCARCH_SUFFIX:use-mainline-bsp = "-imx" | 248 | MACHINE_SOCARCH_SUFFIX:use-mainline-bsp = "-imx" |
204 | 249 | ||
205 | MACHINE_ARCH_FILTER = "virtual/kernel" | 250 | MACHINE_ARCH_FILTER = "virtual/kernel" |
206 | MACHINE_SOCARCH_FILTER:append:imx = " \ | 251 | MACHINE_SOCARCH_FILTER:append:use-nxp-bsp = " \ |
207 | alsa-lib \ | 252 | alsa-lib \ |
208 | gstreamer1.0 \ | 253 | gstreamer1.0 \ |
209 | weston \ | 254 | weston \ |
@@ -244,17 +289,17 @@ MACHINE_SOCARCH_FILTER:append:use-mainline-bsp = " \ | |||
244 | pango \ | 289 | pango \ |
245 | qtbase \ | 290 | qtbase \ |
246 | " | 291 | " |
247 | MACHINE_SOCARCH_FILTER:append:mx6q = " \ | 292 | MACHINE_SOCARCH_FILTER:append:mx6q-nxp-bsp = " \ |
248 | opencl-icd-loader \ | 293 | opencl-icd-loader \ |
249 | opencl-clhpp \ | 294 | opencl-clhpp \ |
250 | opencl-headers \ | 295 | opencl-headers \ |
251 | " | 296 | " |
252 | MACHINE_SOCARCH_FILTER:append:mx8 = " \ | 297 | MACHINE_SOCARCH_FILTER:append:mx8-nxp-bsp = " \ |
253 | opencl-icd-loader \ | 298 | opencl-icd-loader \ |
254 | opencl-clhpp \ | 299 | opencl-clhpp \ |
255 | opencl-headers \ | 300 | opencl-headers \ |
256 | " | 301 | " |
257 | MACHINE_SOCARCH_FILTER:append:mx8qm = " \ | 302 | MACHINE_SOCARCH_FILTER:append:mx8qm-nxp-bsp = " \ |
258 | virtual/libopenvx \ | 303 | virtual/libopenvx \ |
259 | " | 304 | " |
260 | 305 | ||
@@ -270,32 +315,32 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \ | |||
270 | 315 | ||
271 | # Firmware | 316 | # Firmware |
272 | MACHINE_FIRMWARE ?= "" | 317 | MACHINE_FIRMWARE ?= "" |
273 | MACHINE_FIRMWARE:append:mx27 = " firmware-imx-vpu-imx27" | 318 | MACHINE_FIRMWARE:append:mx27-generic-bsp = " firmware-imx-vpu-imx27" |
274 | MACHINE_FIRMWARE:append:mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" | 319 | MACHINE_FIRMWARE:append:mx7d-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" |
275 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-imx-sdma-imx6q" | 320 | MACHINE_FIRMWARE:append:mx6-generic-bsp = " linux-firmware-imx-sdma-imx6q" |
276 | MACHINE_FIRMWARE:append:mx6q = " firmware-imx-vpu-imx6q" | 321 | MACHINE_FIRMWARE:append:mx6q-generic-bsp = " firmware-imx-vpu-imx6q" |
277 | MACHINE_FIRMWARE:append:mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc" | 322 | MACHINE_FIRMWARE:append:mx6dl-generic-bsp = " firmware-imx-vpu-imx6d firmware-imx-epdc" |
278 | MACHINE_FIRMWARE:append:mx6sl = " firmware-imx-epdc" | 323 | MACHINE_FIRMWARE:append:mx6sl-generic-bsp = " firmware-imx-epdc" |
279 | MACHINE_FIRMWARE:append:mx6sll = " firmware-imx-epdc" | 324 | MACHINE_FIRMWARE:append:mx6sll-generic-bsp = " firmware-imx-epdc" |
280 | MACHINE_FIRMWARE:append:mx6ull = " firmware-imx-epdc" | 325 | MACHINE_FIRMWARE:append:mx6ull-generic-bsp = " firmware-imx-epdc" |
281 | MACHINE_FIRMWARE:append:mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" | 326 | MACHINE_FIRMWARE:append:mx53-generic-bsp = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" |
282 | MACHINE_FIRMWARE:append:mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" | 327 | MACHINE_FIRMWARE:append:mx51-generic-bsp = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" |
283 | MACHINE_FIRMWARE:append:mx8mm = " linux-firmware-imx-sdma-imx7d" | 328 | MACHINE_FIRMWARE:append:mx8mm-generic-bsp = " linux-firmware-imx-sdma-imx7d" |
284 | MACHINE_FIRMWARE:append:mx8mn = " linux-firmware-imx-sdma-imx7d" | 329 | MACHINE_FIRMWARE:append:mx8mn-generic-bsp = " linux-firmware-imx-sdma-imx7d" |
285 | MACHINE_FIRMWARE:append:mx8mp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" | 330 | MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" |
286 | MACHINE_FIRMWARE:append:mx8mq = " linux-firmware-imx-sdma-imx7d" | 331 | MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" |
287 | MACHINE_FIRMWARE:append:mx8qm = " firmware-imx-vpu-imx8" | 332 | MACHINE_FIRMWARE:append:mx8qm-generic-bsp = " firmware-imx-vpu-imx8" |
288 | MACHINE_FIRMWARE:append:mx8qxp = " firmware-imx-vpu-imx8" | 333 | MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " firmware-imx-vpu-imx8" |
289 | MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" | 334 | MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" |
290 | 335 | ||
291 | MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" | 336 | MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" |
292 | 337 | ||
293 | # Extra audio support | 338 | # Extra audio support |
294 | IMX_ALSA_EXTRA = "" | 339 | IMX_ALSA_EXTRA = "" |
295 | IMX_ALSA_EXTRA:use-nxp-bsp = "imx-alsa-plugins" | 340 | IMX_ALSA_EXTRA:use-nxp-bsp = "imx-alsa-plugins" |
296 | MACHINE_EXTRA_RRECOMMENDS:append:mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" | 341 | MACHINE_EXTRA_RRECOMMENDS:append:mx6-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" |
297 | MACHINE_EXTRA_RRECOMMENDS:append:mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" | 342 | MACHINE_EXTRA_RRECOMMENDS:append:mx7-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" |
298 | MACHINE_EXTRA_RRECOMMENDS:append:mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" | 343 | MACHINE_EXTRA_RRECOMMENDS:append:mx8-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" |
299 | 344 | ||
300 | # Extra Cypress Wi-Fi and BTW firmware (Murata) | 345 | # Extra Cypress Wi-Fi and BTW firmware (Murata) |
301 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}" | 346 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}" |
@@ -320,28 +365,28 @@ MACHINE_EXTRA_RRECOMMENDS += " \ | |||
320 | " | 365 | " |
321 | 366 | ||
322 | # GStreamer 1.0 plugins | 367 | # GStreamer 1.0 plugins |
323 | MACHINE_GSTREAMER_1_0_PLUGIN ?= "" | 368 | MACHINE_GSTREAMER_1_0_PLUGIN ?= "" |
324 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl ?= "gstreamer1.0-plugins-imx-meta" | 369 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
325 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6q ?= "gstreamer1.0-plugins-imx-meta" | 370 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6q-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
326 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl ?= "gstreamer1.0-plugins-imx-meta" | 371 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
327 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx ?= "gstreamer1.0-plugins-imx-meta" | 372 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
328 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul ?= "gstreamer1.0-plugins-imx-meta" | 373 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
329 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull ?= "gstreamer1.0-plugins-imx-meta" | 374 | MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
330 | MACHINE_GSTREAMER_1_0_PLUGIN:mx7d ?= "gstreamer1.0-plugins-imx-meta" | 375 | MACHINE_GSTREAMER_1_0_PLUGIN:mx7d-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" |
331 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm ?= "imx-gst1.0-plugin" | 376 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm-nxp-bsp ?= "imx-gst1.0-plugin" |
332 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn ?= "imx-gst1.0-plugin" | 377 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn-nxp-bsp ?= "imx-gst1.0-plugin" |
333 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp ?= "imx-gst1.0-plugin" | 378 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp-nxp-bsp ?= "imx-gst1.0-plugin" |
334 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq ?= "imx-gst1.0-plugin" | 379 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq-nxp-bsp ?= "imx-gst1.0-plugin" |
335 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm ?= "imx-gst1.0-plugin" | 380 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm-nxp-bsp ?= "imx-gst1.0-plugin" |
336 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp ?= "imx-gst1.0-plugin" | 381 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin" |
337 | 382 | ||
338 | PREFERRED_VERSION_gstreamer1.0:mx8 ?= "1.18.0.imx" | 383 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ?= "1.18.0.imx" |
339 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8 ?= "1.18.0.imx" | 384 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ?= "1.18.0.imx" |
340 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8 ?= "1.18.0.imx" | 385 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ?= "1.18.0.imx" |
341 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8 ?= "1.18.0.imx" | 386 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ?= "1.18.0.imx" |
342 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8 ?= "1.18.0" | 387 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ?= "1.18.0" |
343 | PREFERRED_VERSION_gstreamer1.0-libav:mx8 ?= "1.18.0" | 388 | PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ?= "1.18.0" |
344 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8 ?= "1.18.0" | 389 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ?= "1.18.0" |
345 | 390 | ||
346 | # Determines if the SoC has support for Vivante kernel driver | 391 | # Determines if the SoC has support for Vivante kernel driver |
347 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" | 392 | SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" |
@@ -368,43 +413,43 @@ PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv" | |||
368 | PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" | 413 | PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" |
369 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" | 414 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" |
370 | 415 | ||
371 | PREFERRED_VERSION_weston:imx ?= "9.0.0.imx" | 416 | PREFERRED_VERSION_weston:use-nxp-bsp ?= "9.0.0.imx" |
372 | PREFERRED_VERSION_weston:use-mainline-bsp = "" | 417 | PREFERRED_VERSION_weston:use-mainline-bsp = "" |
373 | 418 | ||
374 | PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.22.imx" | 419 | PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ?= "1.22.imx" |
375 | PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.22.imx" | 420 | PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ?= "1.22.imx" |
376 | PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.22.imx" | 421 | PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ?= "1.22.imx" |
377 | 422 | ||
378 | # Use i.MX libdrm Version | 423 | # Use i.MX libdrm Version |
379 | PREFERRED_VERSION_libdrm:mx6 ?= "2.4.107.imx" | 424 | PREFERRED_VERSION_libdrm:mx6-nxp-bsp ?= "2.4.107.imx" |
380 | PREFERRED_VERSION_libdrm:mx7 ?= "2.4.107.imx" | 425 | PREFERRED_VERSION_libdrm:mx7-nxp-bsp ?= "2.4.107.imx" |
381 | PREFERRED_VERSION_libdrm:mx8 ?= "2.4.107.imx" | 426 | PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.107.imx" |
382 | 427 | ||
383 | # Use i.MX optee Version | 428 | # Use i.MX optee Version |
384 | PREFERRED_VERSION_optee-os:mx8 ?= "3.10.0.imx" | 429 | PREFERRED_VERSION_optee-os:mx8-nxp-bsp ?= "3.10.0.imx" |
385 | PREFERRED_VERSION_optee-client:mx8 ?= "3.10.0.imx" | 430 | PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.10.0.imx" |
386 | PREFERRED_VERSION_optee-test:mx8 ?= "3.10.0.imx" | 431 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ?= "3.10.0.imx" |
387 | 432 | ||
388 | #Use i.MX opencv Version for mx8 | 433 | #Use i.MX opencv Version for mx8 |
389 | PREFERRED_VERSION_opencv:mx8 ?= "4.5.2.imx" | 434 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ?= "4.5.2.imx" |
390 | 435 | ||
391 | # Handle default kernel | 436 | # Handle default kernel |
392 | IMX_DEFAULT_KERNEL = "linux-fslc-imx" | 437 | IMX_DEFAULT_KERNEL = "linux-fslc-imx" |
393 | IMX_DEFAULT_KERNEL:mxs = "linux-fslc" | 438 | IMX_DEFAULT_KERNEL:mxs-generic-bsp = "linux-fslc" |
394 | IMX_DEFAULT_KERNEL:mx5 = "linux-fslc" | 439 | IMX_DEFAULT_KERNEL:mx5-generic-bsp = "linux-fslc" |
395 | IMX_DEFAULT_KERNEL:mx6 = "linux-fslc-imx" | 440 | IMX_DEFAULT_KERNEL:mx6-nxp-bsp = "linux-fslc-imx" |
396 | IMX_DEFAULT_KERNEL:mx7 = "linux-fslc-imx" | 441 | IMX_DEFAULT_KERNEL:mx7-nxp-bsp = "linux-fslc-imx" |
397 | IMX_DEFAULT_KERNEL:mx8 = "linux-fslc-imx" | 442 | IMX_DEFAULT_KERNEL:mx8-nxp-bsp = "linux-fslc-imx" |
398 | IMX_DEFAULT_KERNEL:mx7ulp = "linux-fslc-imx" | 443 | IMX_DEFAULT_KERNEL:mx7ulp-nxp-bsp = "linux-fslc-imx" |
399 | IMX_DEFAULT_KERNEL:mx6sll = "linux-fslc-imx" | 444 | IMX_DEFAULT_KERNEL:mx6sll-nxp-bsp = "linux-fslc-imx" |
400 | IMX_DEFAULT_KERNEL:mx6ul = "linux-fslc-imx" | 445 | IMX_DEFAULT_KERNEL:mx6ul-nxp-bsp = "linux-fslc-imx" |
401 | IMX_DEFAULT_KERNEL:mx6ull = "linux-fslc-imx" | 446 | IMX_DEFAULT_KERNEL:mx6ull-nxp-bsp = "linux-fslc-imx" |
402 | IMX_DEFAULT_KERNEL:use-mainline-bsp = "linux-fslc" | 447 | IMX_DEFAULT_KERNEL:use-mainline-bsp = "linux-fslc" |
403 | 448 | ||
404 | PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" | 449 | PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" |
405 | 450 | ||
406 | SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz" | 451 | SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz" |
407 | SOC_DEFAULT_IMAGE_FSTYPES:mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz" | 452 | SOC_DEFAULT_IMAGE_FSTYPES:mxs-generic-bsp = "uboot-mxsboot-sdcard wic.bmap wic.gz" |
408 | 453 | ||
409 | # Do not update fstab file when using wic images | 454 | # Do not update fstab file when using wic images |
410 | WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" | 455 | WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" |
@@ -433,8 +478,8 @@ WKS_FILE_DEPENDS ?= " \ | |||
433 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ | 478 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ |
434 | " | 479 | " |
435 | 480 | ||
436 | WKS_FILE_DEPENDS:append:mx8 = " imx-boot" | 481 | WKS_FILE_DEPENDS:append:mx8-nxp-bsp = " imx-boot" |
437 | WKS_FILE_DEPENDS:append:mx8m = " imx-boot" | 482 | WKS_FILE_DEPENDS:append:mx8m-nxp-bsp = " imx-boot" |
438 | 483 | ||
439 | # We need to restrict the append so we don't add this for other i.MX SoC's. | 484 | # We need to restrict the append so we don't add this for other i.MX SoC's. |
440 | # Derivatives that are not yet adopted the usage of boot container provided | 485 | # Derivatives that are not yet adopted the usage of boot container provided |
@@ -453,10 +498,10 @@ WKS_FILE_DEPENDS:append:use-mainline-bsp:aarch64 = " \ | |||
453 | " | 498 | " |
454 | 499 | ||
455 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" | 500 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" |
456 | SOC_DEFAULT_WKS_FILE:mx8m ?= "imx-imx-boot-bootpart.wks.in" | 501 | SOC_DEFAULT_WKS_FILE:mx8m-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" |
457 | 502 | ||
458 | SOC_DEFAULT_WKS_FILE:mx8 ?= "imx-imx-boot-bootpart.wks.in" | 503 | SOC_DEFAULT_WKS_FILE:mx8-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" |
459 | SOC_DEFAULT_WKS_FILE:mxs ?= "imx-uboot-mxs-bootpart.wks.in" | 504 | SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" |
460 | 505 | ||
461 | # Boot container built as a part of mainline U-Boot uses different WKS | 506 | # Boot container built as a part of mainline U-Boot uses different WKS |
462 | # file as the entire mx8m series, as U-Boot versions later than 2021.04 are | 507 | # file as the entire mx8m series, as U-Boot versions later than 2021.04 are |
@@ -471,14 +516,11 @@ SOC_DEFAULT_WKS_FILE:imx-boot-container ?= "imx-boot-container-bootpart.wks.in" | |||
471 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | 516 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" |
472 | 517 | ||
473 | SERIAL_CONSOLES = "115200;ttymxc0" | 518 | SERIAL_CONSOLES = "115200;ttymxc0" |
474 | SERIAL_CONSOLES:mxs = "115200;ttyAMA0" | 519 | SERIAL_CONSOLES:mxs-generic-bsp = "115200;ttyAMA0" |
475 | 520 | ||
476 | KERNEL_IMAGETYPE = "zImage" | 521 | KERNEL_IMAGETYPE = "zImage" |
477 | KERNEL_IMAGETYPE:aarch64 = "Image" | 522 | KERNEL_IMAGETYPE:aarch64 = "Image" |
478 | 523 | ||
479 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" | 524 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" |
480 | 525 | ||
481 | # Add the ability to specify imx machines | 526 | HOSTTOOLS_NONFATAL:append:mx8-nxp-bsp = " sha384sum" |
482 | MACHINEOVERRIDES =. "imx:" | ||
483 | |||
484 | HOSTTOOLS_NONFATAL:append:mx8 = " sha384sum" | ||