diff options
| author |   Mihail Grigorov <michael.grigorov@konsulko.com> | 2017-10-13 10:40:09 +0300 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-10-14 13:51:33 +0000 |
| commit | f64af244cccacbb7a4751f6fb7572c040d06db53 (patch) | |
| tree | 8bcd25f9caefa61a2fef6c5b4feb1ab3be489d59 | |
| parent | d9b0202fb41caa4de39feaa7a8f9f5abd627d735 (diff) | |
meta-agl-bsp: imx6: Update the imx6qsabrelite machine template
* Add include/agl_imx6qsabrelite.inc
* Change the FSL layer from meta-fsl-* to meta-freescale-*
* Rename 50_bblayers.conf.inc to 40_bblayers.conf.inc
Bug-AGL: SPEC-905
Change-Id: I29563fa7bc25240018383fba2b30e2171366282a
Signed-off-by: Mihail Grigorov <michael.grigorov@konsulko.com>
Signed-off-by: Georgi Vlaev <georgi.vlaev@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11307
Reviewed-by: Leon Anavi <leon.anavi@konsulko.com>
Reviewed-by: Thomas Rini <trini@konsulko.com>
Reviewed-by: Matt Ranostay <matt.ranostay@konsulko.com>
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
5 files changed, 41 insertions, 6 deletions
diff --git a/meta-agl-bsp/conf/include/agl_imx6qsabrelite.inc b/meta-agl-bsp/conf/include/agl_imx6qsabrelite.inc new file mode 100644 index 000000000..2e3633ef4 --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_imx6qsabrelite.inc @@ -0,0 +1,34 @@ +IMAGE_INSTALL_append = " \ + packagegroup-fsl-tools-gpu \ + packagegroup-fsl-gstreamer1.0 \ + packagegroup-imx-tools-audio \ + weston weston-init weston-examples \ +" + +# fsl-image-multimedia-full.bb + +IMAGE_INSTALL_append = " \ + packagegroup-fsl-gstreamer1.0-full \ +" + +# fix build error + +SECURITY_CFLAGS_pn-devil = "${SECURITY_NO_PIE_CFLAGS}" + +PREFERRED_PROVIDER_virtual/kernel = "linux-boundary" + +PREFERRED_PROVIDER_u-boot = "u-boot-boundary" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-boundary" +PREFERRED_PROVIDER_u-boot-mxsboot-native = "u-boot-boundary" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " u-boot-boundary" + +UBOOT_MACHINE = "nitrogen6q_config" +SPL_BINARY = "" +UBOOT_SUFFIX_SDCARD = "imx" +IMAGE_BOOTLOADER = "u-boot" + +# force generate sdcard image also +AGL_DEFAULT_IMAGE_FSTYPES := "sdcard.xz" +AGL_DEFAULT_INITRAMFS_FSTYPES := "" + +PREFERRED_VERSION_weston_mx6_forcevariable = "2.0.0" diff --git a/templates/machine/imx6qsabrelite/40_bblayers.conf.inc b/templates/machine/imx6qsabrelite/40_bblayers.conf.inc new file mode 100644 index 000000000..8adb0b9e5 --- /dev/null +++ b/templates/machine/imx6qsabrelite/40_bblayers.conf.inc @@ -0,0 +1,5 @@ +BBLAYERS =+ "\ + ${METADIR}/meta-freescale \ + ${METADIR}/meta-freescale-3rdparty \ + ${METADIR}/meta-freescale-distro \ + " diff --git a/templates/machine/imx6qsabrelite/50_bblayers.conf.inc b/templates/machine/imx6qsabrelite/50_bblayers.conf.inc deleted file mode 100644 index 0198eb464..000000000 --- a/templates/machine/imx6qsabrelite/50_bblayers.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -BBLAYERS =+ "\ - ${METADIR}/meta-fsl-arm \ - ${METADIR}/meta-fsl-arm-extra \ - " diff --git a/templates/machine/imx6qsabrelite/50_local.conf.inc b/templates/machine/imx6qsabrelite/50_local.conf.inc index 83754d860..72700ccc7 100644 --- a/templates/machine/imx6qsabrelite/50_local.conf.inc +++ b/templates/machine/imx6qsabrelite/50_local.conf.inc @@ -1,2 +1,2 @@ MACHINE = "imx6qsabrelite" - +require conf/include/agl_imx6qsabrelite.inc diff --git a/templates/machine/imx6qsabrelite/50_setup.sh b/templates/machine/imx6qsabrelite/50_setup.sh index ea340a763..bb22790dc 100644 --- a/templates/machine/imx6qsabrelite/50_setup.sh +++ b/templates/machine/imx6qsabrelite/50_setup.sh @@ -1,2 +1,2 @@ -find_and_ack_eula $METADIR/meta-fsl-arm EULA +find_and_ack_eula $METADIR/meta-freescale EULA export EULA_FLAG_NAME="ACCEPT_FSL_EULA" |