diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-05-30 14:58:49 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-06-01 08:38:04 +0000 |
| commit | 48cc1b37dc363f4c59630d2307fd0d4f5d93780d (patch) | |
| tree | 0263a5867948eae88b01d2de4618974b545f5edd /meta-agl-bsp/conf/include/agl_cubox-i.inc | |
| parent | ff827503f54f4b1a9aad35c244b6585edc0eb41c (diff) | |
Update i.MX machine configurations
Changes:
- Add new i.MX and i.MX6 common inc files and shift duplicated
configuration to them.
- Switch to using the newer IMX_BSP_DEFAULT variable mechanism for
selecting mainline vs NXP bits, instead of adding use-mainline-bsp
to MACHINEOVERRIDES.
- Remove the accidental addition of agl-medium-arm-compiler to
DISTRO_FEATURES for the imx8mqevk configurations.
- Remove some other stale variable definitions.
- Update BSP layer path in i.MX6 template 50_setup.sh files, these
were missed on a previous update.
Bug-AGL: SPEC-3933
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I0145e3c8b73b4d53706fda4237ab10f181fd16f7
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26377
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-bsp/conf/include/agl_cubox-i.inc')
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_cubox-i.inc | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/meta-agl-bsp/conf/include/agl_cubox-i.inc b/meta-agl-bsp/conf/include/agl_cubox-i.inc index 46464325b..c3ba5fc17 100644 --- a/meta-agl-bsp/conf/include/agl_cubox-i.inc +++ b/meta-agl-bsp/conf/include/agl_cubox-i.inc @@ -1,24 +1,11 @@ -DISTRO_FEATURES_append = " agl-medium-arm-compiler" - -# This disables the Freescale/NXP Vivante GPU driver and enables -# 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}" +require agl_imx6-common.inc # Include devicetrees for SOM 1.5 and Hummingboard 2 hardware KERNEL_DEVICETREE_append = " \ - imx6dl-hummingboard-som-v15.dtb imx6q-hummingboard-som-v15.dtb \ - imx6dl-hummingboard2.dtb imx6q-hummingboard2.dtb \ - imx6dl-hummingboard2-som-v15.dtb imx6q-hummingboard2-som-v15.dtb \ + imx6dl-hummingboard-som-v15.dtb \ + imx6q-hummingboard-som-v15.dtb \ + imx6dl-hummingboard2.dtb \ + imx6q-hummingboard2.dtb \ + imx6dl-hummingboard2-som-v15.dtb \ + imx6q-hummingboard2-som-v15.dtb \ " - -# Disable the meta-freescale weston-init bbappend as it conflicts -# with AGL's. -BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init" - -# Set CMA size large enough to work with AGL -UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M" |