From 30f5ce1d2168389295b4813e01898c2fb0f9bab9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 18 Feb 2022 19:43:56 -0300 Subject: 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 --- conf/machine/include/imx-base.inc | 336 +++++++++++++++++++++----------------- 1 file changed, 189 insertions(+), 147 deletions(-) (limited to 'conf/machine') 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}" PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" -UBOOT_ENTRYPOINT:mxs = "0x40008000" -UBOOT_ENTRYPOINT:mx51 = "0x90008000" -UBOOT_ENTRYPOINT:mx53 = "0x70008000" -UBOOT_ENTRYPOINT:mx6 = "0x10008000" -UBOOT_ENTRYPOINT:mx6sl = "0x80008000" -UBOOT_ENTRYPOINT:mx6sll = "0x80008000" -UBOOT_ENTRYPOINT:mx6sx = "0x80008000" -UBOOT_ENTRYPOINT:mx6ul = "0x80008000" -UBOOT_ENTRYPOINT:mx6ull = "0x80008000" -UBOOT_ENTRYPOINT:mx6ulz = "0x80008000" -UBOOT_ENTRYPOINT:mx7 = "0x80008000" -UBOOT_ENTRYPOINT:mx7ulp = "0x60008000" -UBOOT_ENTRYPOINT:mx8m = "0x40480000" -UBOOT_ENTRYPOINT:vf = "0x80008000" +UBOOT_ENTRYPOINT:mxs-generic-bsp = "0x40008000" +UBOOT_ENTRYPOINT:mx51-generic-bsp = "0x90008000" +UBOOT_ENTRYPOINT:mx53-generic-bsp = "0x70008000" +UBOOT_ENTRYPOINT:mx6-generic-bsp = "0x10008000" +UBOOT_ENTRYPOINT:mx6sl-generic-bsp = "0x80008000" +UBOOT_ENTRYPOINT:mx6sll-generic-bsp = "0x80008000" +UBOOT_ENTRYPOINT:mx6sx-generic-bsp = "0x80008000" +UBOOT_ENTRYPOINT:mx6ul-generic-bsp = "0x80008000" +UBOOT_ENTRYPOINT:mx6ull-generic-bsp = "0x80008000" +UBOOT_ENTRYPOINT:mx6ulz-generic-bsp = "0x80008000" +UBOOT_ENTRYPOINT:mx7-generic-bsp = "0x80008000" +UBOOT_ENTRYPOINT:mx7ulp-generic-bsp = "0x60008000" +UBOOT_ENTRYPOINT:mx8m-generic-bsp = "0x40480000" +UBOOT_ENTRYPOINT:vf-generic-bsp = "0x80008000" # Some derivates can utilize the boot container provided by U-Boot, # below variable sets that those machines which have a imx-boot-container @@ -96,11 +96,11 @@ UBOOT_ENTRYPOINT:vf = "0x80008000" UBOOT_PROVIDES_BOOT_CONTAINER = "0" UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1" -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -XSERVER_DRIVER = "xf86-video-fbdev" -XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante" -XSERVER_DRIVER:vf = "xf86-video-modesetting" -XSERVER_DRIVER:append:mx8 = " xf86-video-modesetting" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER_DRIVER = "xf86-video-fbdev" +XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante" +XSERVER_DRIVER:vf-generic-bsp = "xf86-video-modesetting" +XSERVER_DRIVER:append:mx8-generic-bsp = " xf86-video-modesetting" XSERVER_DRIVER:use-mainline-bsp = " \ xf86-video-fbdev \ xf86-video-modesetting \ @@ -118,42 +118,87 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" # ARM_INSTRUCTION_SET = "thumb" # # handled by software -# DEFAULTTUNE:mx6 ?= "cortexa9t-neon" +# DEFAULTTUNE:mx6-generic-bsp ?= "cortexa9t-neon" # handled by hardware -DEFAULTTUNE:mx6 ?= "cortexa9thf-neon" -DEFAULTTUNE:mx6ul ?= "cortexa7thf-neon" -DEFAULTTUNE:mx6ull ?= "cortexa7thf-neon" -DEFAULTTUNE:mx6ulz ?= "cortexa7thf-neon" -DEFAULTTUNE:mx7 ?= "cortexa7thf-neon" -DEFAULTTUNE:vf ?= "cortexa5thf-neon" +DEFAULTTUNE:mx6-generic-bsp ?= "cortexa9thf-neon" +DEFAULTTUNE:mx6ul-generic-bsp ?= "cortexa7thf-neon" +DEFAULTTUNE:mx6ull-generic-bsp ?= "cortexa7thf-neon" +DEFAULTTUNE:mx6ulz-generic-bsp ?= "cortexa7thf-neon" +DEFAULTTUNE:mx7-generic-bsp ?= "cortexa7thf-neon" +DEFAULTTUNE:vf-generic-bsp ?= "cortexa5thf-neon" -DEFAULTTUNE:mx8m ?= "cortexa53-crypto" -DEFAULTTUNE:mx8qm ?= "cortexa72-cortexa53-crypto" -DEFAULTTUNE:mx8qxp ?= "cortexa35-crypto" +DEFAULTTUNE:mx8m-generic-bsp ?= "cortexa53-crypto" +DEFAULTTUNE:mx8qm-generic-bsp ?= "cortexa72-cortexa53-crypto" +DEFAULTTUNE:mx8qxp-generic-bsp ?= "cortexa35-crypto" INHERIT += "machine-overrides-extender" -MACHINEOVERRIDES_EXTENDER:mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx6sx = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx6sll = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx6ul = "imxfbdev:imxpxp" -MACHINEOVERRIDES_EXTENDER:mx6ull = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx6ulz = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx7d = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER:mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8mn = "imxdrm:imxgpu:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8mp = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER:mx8dxl = "imxfbdev" - -MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \ - imx \ - \ +####### +### NXP BSP specific overrides +####### + +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" +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" + +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" + +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" +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" + +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" +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" +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" + +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" +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" + +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" + +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" +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" +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" +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" + +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" +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" + +####### +### Mainline BSP specific overrides +####### + +MACHINEOVERRIDES_EXTENDER:mx27:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx27-generic-bsp:mx27-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx28:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mxs-generic-bsp:mxs-mainline-bsp:mx28-generic-bsp:mx28-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx51:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx51-generic-bsp:mx51-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx53:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx53-generic-bsp:mx53-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx6q:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6q-generic-bsp:mx6q-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx6dl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6dl-generic-bsp:mx6dl-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx6sx:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sx-generic-bsp:mx6sx-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx6sl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sl-generic-bsp:mx6sl-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx6sll:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6sll-generic-bsp:mx6sll-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx6ul:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx6-generic-bsp:mx6-mainline-bsp:mx6ul-generic-bsp:mx6ul-mainline-bsp" +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" +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" + +MACHINEOVERRIDES_EXTENDER:mx7d:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx7-generic-bsp:mx7-mainline-bsp:mx7d-generic-bsp:mx7d-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx7ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx7-generic-bsp:mx7-mainline-bsp:mx7ulp-generic-bsp:mx7ulp-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER:mx8qm:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8qm-generic-bsp:mx8qm-mainline-bsp" + +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" +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" +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" +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" + +MACHINEOVERRIDES_EXTENDER:mx8qxp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8qxp-generic-bsp:mx8qxp-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx8dxl:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8dxl-generic-bsp:mx8dxl-mainline-bsp" + +MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ mx6 \ mx6q \ mx6dl \ @@ -181,29 +226,29 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \ # Sub-architecture support MACHINE_SOCARCH_SUFFIX ?= "" -MACHINE_SOCARCH_SUFFIX:mx6q = "-mx6qdl" -MACHINE_SOCARCH_SUFFIX:mx6dl = "-mx6qdl" -MACHINE_SOCARCH_SUFFIX:mx6sx = "-mx6sx" -MACHINE_SOCARCH_SUFFIX:mx6sl = "-mx6sl" -MACHINE_SOCARCH_SUFFIX:mx6sll= "-mx6sll" -MACHINE_SOCARCH_SUFFIX:mx7d = "-mx7d" -MACHINE_SOCARCH_SUFFIX:mx7ulp = "-mx7ulp" -MACHINE_SOCARCH_SUFFIX:vf60 = "-vf60" -MACHINE_SOCARCH_SUFFIX:vf50 = "-vf50" -MACHINE_SOCARCH_SUFFIX:mx6ul = "-mx6ul" -MACHINE_SOCARCH_SUFFIX:mx6ull = "-mx6ul" -MACHINE_SOCARCH_SUFFIX:mx6ulz = "-mx6ul" -MACHINE_SOCARCH_SUFFIX:mx8qm = "-mx8" -MACHINE_SOCARCH_SUFFIX:mx8mm = "-mx8mm" -MACHINE_SOCARCH_SUFFIX:mx8mn = "-mx8mn" -MACHINE_SOCARCH_SUFFIX:mx8mp = "-mx8mp" -MACHINE_SOCARCH_SUFFIX:mx8mq = "-mx8m" -MACHINE_SOCARCH_SUFFIX:mx8qxp = "-mx8" -MACHINE_SOCARCH_SUFFIX:mx8dxl = "-mx8dxl" +MACHINE_SOCARCH_SUFFIX:mx6q-nxp-bsp = "-mx6qdl" +MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl" +MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx" +MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl" +MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp= "-mx6sll" +MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d" +MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp" +MACHINE_SOCARCH_SUFFIX:vf60-nxp-bsp = "-vf60" +MACHINE_SOCARCH_SUFFIX:vf50-nxp-bsp = "-vf50" +MACHINE_SOCARCH_SUFFIX:mx6ul-nxp-bsp = "-mx6ul" +MACHINE_SOCARCH_SUFFIX:mx6ull-nxp-bsp = "-mx6ul" +MACHINE_SOCARCH_SUFFIX:mx6ulz-nxp-bsp = "-mx6ul" +MACHINE_SOCARCH_SUFFIX:mx8qm-nxp-bsp = "-mx8" +MACHINE_SOCARCH_SUFFIX:mx8mm-nxp-bsp = "-mx8mm" +MACHINE_SOCARCH_SUFFIX:mx8mn-nxp-bsp = "-mx8mn" +MACHINE_SOCARCH_SUFFIX:mx8mp-nxp-bsp = "-mx8mp" +MACHINE_SOCARCH_SUFFIX:mx8mq-nxp-bsp = "-mx8m" +MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8" +MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8dxl" MACHINE_SOCARCH_SUFFIX:use-mainline-bsp = "-imx" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_SOCARCH_FILTER:append:imx = " \ +MACHINE_SOCARCH_FILTER:append:use-nxp-bsp = " \ alsa-lib \ gstreamer1.0 \ weston \ @@ -244,17 +289,17 @@ MACHINE_SOCARCH_FILTER:append:use-mainline-bsp = " \ pango \ qtbase \ " -MACHINE_SOCARCH_FILTER:append:mx6q = " \ +MACHINE_SOCARCH_FILTER:append:mx6q-nxp-bsp = " \ opencl-icd-loader \ opencl-clhpp \ opencl-headers \ " -MACHINE_SOCARCH_FILTER:append:mx8 = " \ +MACHINE_SOCARCH_FILTER:append:mx8-nxp-bsp = " \ opencl-icd-loader \ opencl-clhpp \ opencl-headers \ " -MACHINE_SOCARCH_FILTER:append:mx8qm = " \ +MACHINE_SOCARCH_FILTER:append:mx8qm-nxp-bsp = " \ virtual/libopenvx \ " @@ -270,32 +315,32 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \ # Firmware MACHINE_FIRMWARE ?= "" -MACHINE_FIRMWARE:append:mx27 = " firmware-imx-vpu-imx27" -MACHINE_FIRMWARE:append:mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" -MACHINE_FIRMWARE:append:mx6 = " linux-firmware-imx-sdma-imx6q" -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:mx6sll = " 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" -MACHINE_FIRMWARE:append:mx8mm = " linux-firmware-imx-sdma-imx7d" -MACHINE_FIRMWARE:append:mx8mn = " linux-firmware-imx-sdma-imx7d" -MACHINE_FIRMWARE:append:mx8mp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" -MACHINE_FIRMWARE:append:mx8mq = " linux-firmware-imx-sdma-imx7d" -MACHINE_FIRMWARE:append:mx8qm = " firmware-imx-vpu-imx8" -MACHINE_FIRMWARE:append:mx8qxp = " firmware-imx-vpu-imx8" -MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" +MACHINE_FIRMWARE:append:mx27-generic-bsp = " firmware-imx-vpu-imx27" +MACHINE_FIRMWARE:append:mx7d-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx6-generic-bsp = " linux-firmware-imx-sdma-imx6q" +MACHINE_FIRMWARE:append:mx6q-generic-bsp = " firmware-imx-vpu-imx6q" +MACHINE_FIRMWARE:append:mx6dl-generic-bsp = " firmware-imx-vpu-imx6d firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx6sl-generic-bsp = " firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx6sll-generic-bsp = " firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx6ull-generic-bsp = " firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx53-generic-bsp = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" +MACHINE_FIRMWARE:append:mx51-generic-bsp = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" +MACHINE_FIRMWARE:append:mx8mm-generic-bsp = " linux-firmware-imx-sdma-imx7d" +MACHINE_FIRMWARE:append:mx8mn-generic-bsp = " linux-firmware-imx-sdma-imx7d" +MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" +MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" +MACHINE_FIRMWARE:append:mx8qm-generic-bsp = " firmware-imx-vpu-imx8" +MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " firmware-imx-vpu-imx8" +MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" # Extra audio support IMX_ALSA_EXTRA = "" IMX_ALSA_EXTRA:use-nxp-bsp = "imx-alsa-plugins" -MACHINE_EXTRA_RRECOMMENDS:append:mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" -MACHINE_EXTRA_RRECOMMENDS:append:mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" -MACHINE_EXTRA_RRECOMMENDS:append:mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append:mx6-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append:mx7-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append:mx8-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" # Extra Cypress Wi-Fi and BTW firmware (Murata) MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}" @@ -320,28 +365,28 @@ MACHINE_EXTRA_RRECOMMENDS += " \ " # GStreamer 1.0 plugins -MACHINE_GSTREAMER_1_0_PLUGIN ?= "" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6q ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx7d ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp ?= "imx-gst1.0-plugin" - -PREFERRED_VERSION_gstreamer1.0:mx8 ?= "1.18.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8 ?= "1.18.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8 ?= "1.18.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8 ?= "1.18.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8 ?= "1.18.0" -PREFERRED_VERSION_gstreamer1.0-libav:mx8 ?= "1.18.0" -PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8 ?= "1.18.0" +MACHINE_GSTREAMER_1_0_PLUGIN ?= "" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6q-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx7d-nxp-bsp ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm-nxp-bsp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn-nxp-bsp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp-nxp-bsp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq-nxp-bsp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm-nxp-bsp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin" + +PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ?= "1.18.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ?= "1.18.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ?= "1.18.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ?= "1.18.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ?= "1.18.0" +PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ?= "1.18.0" +PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ?= "1.18.0" # Determines if the SoC has support for Vivante kernel driver SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" @@ -368,43 +413,43 @@ PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" -PREFERRED_VERSION_weston:imx ?= "9.0.0.imx" +PREFERRED_VERSION_weston:use-nxp-bsp ?= "9.0.0.imx" PREFERRED_VERSION_weston:use-mainline-bsp = "" -PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.22.imx" -PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.22.imx" -PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.22.imx" +PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ?= "1.22.imx" +PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ?= "1.22.imx" +PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ?= "1.22.imx" # Use i.MX libdrm Version -PREFERRED_VERSION_libdrm:mx6 ?= "2.4.107.imx" -PREFERRED_VERSION_libdrm:mx7 ?= "2.4.107.imx" -PREFERRED_VERSION_libdrm:mx8 ?= "2.4.107.imx" +PREFERRED_VERSION_libdrm:mx6-nxp-bsp ?= "2.4.107.imx" +PREFERRED_VERSION_libdrm:mx7-nxp-bsp ?= "2.4.107.imx" +PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.107.imx" # Use i.MX optee Version -PREFERRED_VERSION_optee-os:mx8 ?= "3.10.0.imx" -PREFERRED_VERSION_optee-client:mx8 ?= "3.10.0.imx" -PREFERRED_VERSION_optee-test:mx8 ?= "3.10.0.imx" +PREFERRED_VERSION_optee-os:mx8-nxp-bsp ?= "3.10.0.imx" +PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.10.0.imx" +PREFERRED_VERSION_optee-test:mx8-nxp-bsp ?= "3.10.0.imx" #Use i.MX opencv Version for mx8 -PREFERRED_VERSION_opencv:mx8 ?= "4.5.2.imx" +PREFERRED_VERSION_opencv:mx8-nxp-bsp ?= "4.5.2.imx" # Handle default kernel -IMX_DEFAULT_KERNEL = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mxs = "linux-fslc" -IMX_DEFAULT_KERNEL:mx5 = "linux-fslc" -IMX_DEFAULT_KERNEL:mx6 = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx7 = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx8 = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx7ulp = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx6sll = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx6ul = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx6ull = "linux-fslc-imx" +IMX_DEFAULT_KERNEL = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mxs-generic-bsp = "linux-fslc" +IMX_DEFAULT_KERNEL:mx5-generic-bsp = "linux-fslc" +IMX_DEFAULT_KERNEL:mx6-nxp-bsp = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx7-nxp-bsp = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx8-nxp-bsp = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx7ulp-nxp-bsp = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx6sll-nxp-bsp = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx6ul-nxp-bsp = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx6ull-nxp-bsp = "linux-fslc-imx" IMX_DEFAULT_KERNEL:use-mainline-bsp = "linux-fslc" PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz" -SOC_DEFAULT_IMAGE_FSTYPES:mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz" +SOC_DEFAULT_IMAGE_FSTYPES:mxs-generic-bsp = "uboot-mxsboot-sdcard wic.bmap wic.gz" # Do not update fstab file when using wic images WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" @@ -433,8 +478,8 @@ WKS_FILE_DEPENDS ?= " \ ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ " -WKS_FILE_DEPENDS:append:mx8 = " imx-boot" -WKS_FILE_DEPENDS:append:mx8m = " imx-boot" +WKS_FILE_DEPENDS:append:mx8-nxp-bsp = " imx-boot" +WKS_FILE_DEPENDS:append:mx8m-nxp-bsp = " imx-boot" # We need to restrict the append so we don't add this for other i.MX SoC's. # Derivatives that are not yet adopted the usage of boot container provided @@ -453,10 +498,10 @@ WKS_FILE_DEPENDS:append:use-mainline-bsp:aarch64 = " \ " SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" -SOC_DEFAULT_WKS_FILE:mx8m ?= "imx-imx-boot-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:mx8m-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" -SOC_DEFAULT_WKS_FILE:mx8 ?= "imx-imx-boot-bootpart.wks.in" -SOC_DEFAULT_WKS_FILE:mxs ?= "imx-uboot-mxs-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:mx8-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" # Boot container built as a part of mainline U-Boot uses different WKS # 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" WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" SERIAL_CONSOLES = "115200;ttymxc0" -SERIAL_CONSOLES:mxs = "115200;ttyAMA0" +SERIAL_CONSOLES:mxs-generic-bsp = "115200;ttyAMA0" KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPE:aarch64 = "Image" MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" -# Add the ability to specify imx machines -MACHINEOVERRIDES =. "imx:" - -HOSTTOOLS_NONFATAL:append:mx8 = " sha384sum" +HOSTTOOLS_NONFATAL:append:mx8-nxp-bsp = " sha384sum" -- cgit v1.2.3-54-g00ecf From ffa71eb14691bc54c8ced7fbf4784fc5afbf3ed0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 20 Feb 2022 17:51:14 -0300 Subject: imx-base.inc: reduce code using imx-{mainline,nxp}-bsp overrides We reduce the code size using the new overrides to improve code clearness and reduce boilerplate. Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index d49560e9..ac9aba80 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -101,7 +101,7 @@ XSERVER_DRIVER = "xf86-video-fbdev" XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante" XSERVER_DRIVER:vf-generic-bsp = "xf86-video-modesetting" XSERVER_DRIVER:append:mx8-generic-bsp = " xf86-video-modesetting" -XSERVER_DRIVER:use-mainline-bsp = " \ +XSERVER_DRIVER:imx-mainline-bsp = " \ xf86-video-fbdev \ xf86-video-modesetting \ xserver-xorg-extension-glx \ @@ -245,10 +245,12 @@ MACHINE_SOCARCH_SUFFIX:mx8mp-nxp-bsp = "-mx8mp" MACHINE_SOCARCH_SUFFIX:mx8mq-nxp-bsp = "-mx8m" MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8" MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8dxl" -MACHINE_SOCARCH_SUFFIX:use-mainline-bsp = "-imx" + +# For Mainline we use a single SoC suffix as we don't have different build options +MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_SOCARCH_FILTER:append:use-nxp-bsp = " \ +MACHINE_SOCARCH_FILTER:append:imx-nxp-bsp = " \ alsa-lib \ gstreamer1.0 \ weston \ @@ -277,7 +279,7 @@ MACHINE_SOCARCH_FILTER:append:imxgpu3d = " \ virtual/libgles1 \ virtual/libgles2 \ " -MACHINE_SOCARCH_FILTER:append:use-mainline-bsp = " \ +MACHINE_SOCARCH_FILTER:append:imx-mainline-bsp = " \ virtual/egl \ virtual/libopenvg \ virtual/libg2d \ @@ -331,13 +333,13 @@ MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d fir MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" MACHINE_FIRMWARE:append:mx8qm-generic-bsp = " firmware-imx-vpu-imx8" MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " firmware-imx-vpu-imx8" -MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" +MACHINE_FIRMWARE:append:imx-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" # Extra audio support IMX_ALSA_EXTRA = "" -IMX_ALSA_EXTRA:use-nxp-bsp = "imx-alsa-plugins" +IMX_ALSA_EXTRA:imx-nxp-bsp = "imx-alsa-plugins" MACHINE_EXTRA_RRECOMMENDS:append:mx6-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" MACHINE_EXTRA_RRECOMMENDS:append:mx7-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" MACHINE_EXTRA_RRECOMMENDS:append:mx8-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" @@ -413,8 +415,8 @@ PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" -PREFERRED_VERSION_weston:use-nxp-bsp ?= "9.0.0.imx" -PREFERRED_VERSION_weston:use-mainline-bsp = "" +PREFERRED_VERSION_weston:imx-nxp-bsp ?= "9.0.0.imx" +PREFERRED_VERSION_weston:imx-mainline-bsp = "" PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ?= "1.22.imx" PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ?= "1.22.imx" @@ -434,17 +436,8 @@ PREFERRED_VERSION_optee-test:mx8-nxp-bsp ?= "3.10.0.imx" PREFERRED_VERSION_opencv:mx8-nxp-bsp ?= "4.5.2.imx" # Handle default kernel -IMX_DEFAULT_KERNEL = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mxs-generic-bsp = "linux-fslc" -IMX_DEFAULT_KERNEL:mx5-generic-bsp = "linux-fslc" -IMX_DEFAULT_KERNEL:mx6-nxp-bsp = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx7-nxp-bsp = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx8-nxp-bsp = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx7ulp-nxp-bsp = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx6sll-nxp-bsp = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx6ul-nxp-bsp = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:mx6ull-nxp-bsp = "linux-fslc-imx" -IMX_DEFAULT_KERNEL:use-mainline-bsp = "linux-fslc" +IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" +IMX_DEFAULT_KERNEL:imx-nxp-bsp = "linux-fslc-imx" PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" @@ -493,7 +486,7 @@ WKS_FILE_DEPENDS:append:mx8m-nxp-bsp = " imx-boot" # deployment task extesion execution defined in imx-boot-container class. # For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile # task. -WKS_FILE_DEPENDS:append:use-mainline-bsp:aarch64 = " \ +WKS_FILE_DEPENDS:append:imx-mainline-bsp:aarch64 = " \ ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ " -- cgit v1.2.3-54-g00ecf From 970c11bb0050e91262cf227ad7ef49fe01c1553f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 21 Feb 2022 19:55:41 -0300 Subject: Rework machine definitions to reduce duplication Signed-off-by: Otavio Salvador --- conf/machine/imx6qdlsabreauto.conf | 2 +- conf/machine/imx6qdlsabresd.conf | 2 +- conf/machine/imx6slevk.conf | 2 +- conf/machine/imx6sllevk.conf | 2 +- conf/machine/imx6sxsabreauto.conf | 2 +- conf/machine/imx6sxsabresd.conf | 2 +- conf/machine/imx6ulevk.conf | 2 +- conf/machine/imx6ullevk.conf | 2 +- conf/machine/imx6ulz-14x14-evk.conf | 2 +- conf/machine/imx8mq-evk.conf | 2 +- conf/machine/include/imx8mm-evk.inc | 2 +- conf/machine/include/imx8mn-evk.inc | 2 +- conf/machine/include/imx8mp-evk.inc | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 171b9f00..a5ec1249 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -11,7 +11,7 @@ # * imx6solosabreauto # and is able to work for all the machines. -MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" +MACHINEOVERRIDES =. "mx6q:mx6dl:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index a5133625..81d1c962 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -11,7 +11,7 @@ # * imx6solosabresd # and is able to work for all the machines. -MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" +MACHINEOVERRIDES =. "mx6q:mx6dl:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index b25182ba..a0048974 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6SL Evaluation Kit #@MAINTAINER: Otavio Salvador -MACHINEOVERRIDES =. "mx6:mx6sl:" +MACHINEOVERRIDES =. "mx6sl:" include conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index ea525845..19df28a4 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6SLL EVK #@MAINTAINER: Alexandru Palalau ioan-alexandru.palalau@nxp.com -MACHINEOVERRIDES =. "mx6:mx6sll:" +MACHINEOVERRIDES =. "mx6sll:" include conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf index 9e83c458..18f490f4 100644 --- a/conf/machine/imx6sxsabreauto.conf +++ b/conf/machine/imx6sxsabreauto.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre Automotive #@MAINTAINER: Lauren Post -MACHINEOVERRIDES =. "mx6:mx6sx:" +MACHINEOVERRIDES =. "mx6sx:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf index d0a89596..9f939ca7 100644 --- a/conf/machine/imx6sxsabresd.conf +++ b/conf/machine/imx6sxsabresd.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre SD #@MAINTAINER: Lauren Post -MACHINEOVERRIDES =. "mx6:mx6sx:" +MACHINEOVERRIDES =. "mx6sx:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 09d64b4e..70cb68e6 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6UL EVK #@MAINTAINER: Alexandru Palalau -MACHINEOVERRIDES =. "mx6:mx6ul:" +MACHINEOVERRIDES =. "mx6ul:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index e71e34e4..722e0757 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6ULL EVK #@MAINTAINER: Lauren Post -MACHINEOVERRIDES =. "mx6:mx6ull:" +MACHINEOVERRIDES =. "mx6ull:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf index a47c08f8..7775fde3 100644 --- a/conf/machine/imx6ulz-14x14-evk.conf +++ b/conf/machine/imx6ulz-14x14-evk.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for NXP i.MX6ULZ 14x14 EVK #@MAINTAINER: Jun Zhu -MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:mx6ulz:" +MACHINEOVERRIDES =. "mx6ulz:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf index cb63dceb..e20d3f2a 100644 --- a/conf/machine/imx8mq-evk.conf +++ b/conf/machine/imx8mq-evk.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit #@MAINTAINER: Jun Zhu -MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mq:" +MACHINEOVERRIDES =. "imx-boot-container:mx8mq:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index 85419a45..d6778caa 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc @@ -1,4 +1,4 @@ -MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mm:" +MACHINEOVERRIDES =. "imx-boot-container:mx8mm:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 4f897349..0f886c00 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc @@ -1,4 +1,4 @@ -MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:" +MACHINEOVERRIDES =. "imx-boot-container:mx8mn:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc index 7635d08c..fccfe0aa 100644 --- a/conf/machine/include/imx8mp-evk.inc +++ b/conf/machine/include/imx8mp-evk.inc @@ -1,4 +1,4 @@ -MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:" +MACHINEOVERRIDES =. "imx-boot-container:mx8mp:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc -- cgit v1.2.3-54-g00ecf