diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-18 10:05:53 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-18 13:51:55 +0200 |
| commit | 31a39f3502bb0b7c3012a2adc61442d3d2547557 (patch) | |
| tree | aa4f978501818b39097597384c50697bc5a538fa | |
| parent | 74bce843e8768e86494da19814bf52a4844b5db7 (diff) | |
images: replace soc overrides to also include use-mainline-bsp
With use-mainline-bsp the SoC overrides mx6/mx6q/mx6ull... are filtered out of
the overrides. Replace them with the specific machine name if the override
should also be active in the use-mainline-bsp case for that machine.
Related-to: ELB-2805
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | recipes-images/images/packagegroup-tdx-cli.bb | 10 | ||||
| -rw-r--r-- | recipes-images/images/packagegroup-tdx-graphical.bb | 10 |
2 files changed, 13 insertions, 7 deletions
diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb index 7f459d5..4c8b632 100644 --- a/recipes-images/images/packagegroup-tdx-cli.bb +++ b/recipes-images/images/packagegroup-tdx-cli.bb @@ -77,16 +77,20 @@ RRECOMMENDS_packagegroup-devel-tdx-cli = "\ SUMMARY_packagegroup-machine-tdx-cli = "Machine specific tools" RRECOMMENDS_packagegroup-machine-tdx-cli = "\ " -RRECOMMENDS_packagegroup-machine-tdx-cli_mx6 = "\ +RRECOMMENDS_packagegroup-machine-tdx-cli_apalis-imx6 = "\ bmode-usb \ gpio-export \ " -RRECOMMENDS_packagegroup-machine-tdx-cli_mx6ull = "\ +RRECOMMENDS_packagegroup-machine-tdx-cli_colibri-imx6 = "\ + bmode-usb \ + gpio-export \ +" +RRECOMMENDS_packagegroup-machine-tdx-cli_colibri-imx6ull = "\ bmode-usb \ mtd-utils-ubifs \ mwifiexap \ " -RRECOMMENDS_packagegroup-machine-tdx-cli_mx7 = "\ +RRECOMMENDS_packagegroup-machine-tdx-cli_colibri-imx7 = "\ mtd-utils-ubifs \ " RRECOMMENDS_packagegroup-machine-tdx-cli_mx8 = "\ diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb index fbff118..1054cb2 100644 --- a/recipes-images/images/packagegroup-tdx-graphical.bb +++ b/recipes-images/images/packagegroup-tdx-graphical.bb @@ -67,15 +67,17 @@ IMAGE_INSTALL_OPENCL_IMX = " \ RRECOMMENDS_packagegroup-gpu-tdx-graphical = " \ glmark2 \ " -IMAGE_INSTALL_MX6QDL = " \ +IMAGE_INSTALL_GPU_MX6QDL = " \ packagegroup-fsl-gpu-libs \ " -RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx6dl = " ${IMAGE_INSTALL_MX6QDL}" +RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx6dl = " \ + ${IMAGE_INSTALL_GPU_MX6QDL} \ +" RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx6q = " \ - ${IMAGE_INSTALL_MX6QDL} \ + ${IMAGE_INSTALL_GPU_MX6QDL} \ ${IMAGE_INSTALL_OPENCL_IMX} \ " -RRECOMMENDS_packagegroup-gpu-tdx-graphical_mx6ull = "" +RRECOMMENDS_packagegroup-gpu-tdx-graphical_colibri-imx6ull = "" RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx8 = " \ tinycompress \ libvdk-imx \ |