diff options
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_cubox-i.inc | 5 | ||||
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc | 5 | ||||
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_nitrogen6x.inc | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/meta-agl-bsp/conf/include/agl_cubox-i.inc b/meta-agl-bsp/conf/include/agl_cubox-i.inc index a82c27cc1..b43ef47c8 100644 --- a/meta-agl-bsp/conf/include/agl_cubox-i.inc +++ b/meta-agl-bsp/conf/include/agl_cubox-i.inc @@ -4,6 +4,11 @@ DISTRO_FEATURES_append = " agl-medium-arm-compiler" # etnaviv support. MACHINEOVERRIDES .= ":use-mainline-bsp" +# Disable meta-freescale package architecure mangling, as it causes +# issues with AGL's explicit setting of DEFAULTTUNE. +INHERIT_remove = "fsl-dynamic-packagearch" +MACHINE_SOCARCH = "${TUNE_PKGARCH}" + # Include devicetrees for SOM 1.5 and Hummingboard 2 hardware KERNEL_DEVICETREE_append = " \ imx6dl-hummingboard-som-v15.dtb imx6q-hummingboard-som-v15.dtb \ diff --git a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc index b3658af3c..b56917781 100644 --- a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc +++ b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc @@ -4,6 +4,11 @@ DISTRO_FEATURES_append = " agl-medium-arm-compiler" # etnaviv support. MACHINEOVERRIDES .= ":use-mainline-bsp" +# Disable meta-freescale package architecure mangling, as it causes +# issues with AGL's explicit setting of DEFAULTTUNE. +INHERIT_remove = "fsl-dynamic-packagearch" +MACHINE_SOCARCH = "${TUNE_PKGARCH}" + # Disable the meta-freescale weston-init bbappend as it conflicts # with AGL's. BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init" diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc index 782e618a2..5864354b5 100644 --- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc +++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc @@ -4,6 +4,11 @@ DISTRO_FEATURES_append = " agl-medium-arm-compiler" # etnaviv support. MACHINEOVERRIDES .= ":use-mainline-bsp" +# Disable meta-freescale package architecure mangling, as it causes +# issues with AGL's explicit setting of DEFAULTTUNE. +INHERIT_remove = "fsl-dynamic-packagearch" +MACHINE_SOCARCH = "${TUNE_PKGARCH}" + # Disable the meta-freescale weston-init bbappend as it conflicts # with AGL's. BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init" |