From: Nathan Illerbrun <nathani@validmanufacturing.com>
Date: Fri, 14 Jul 2017 14:34:28 +0000 (-0700)
Subject: Update freescale layer names, add nitrogen inc file
X-Git-Tag: 4.99.1~83
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F10203%2F2;hp=31716c2d8f8d07e34aa48528bc0b123b1c70d351;p=AGL%2Fmeta-agl.git

Update freescale layer names, add nitrogen inc file

Change-Id: I1faf7ad14cc85cd12055f7e4c7e43ffe4ccf0671
Signed-off-by: Nathan Illerbrun <nathani@validmanufacturing.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10203
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>
---

diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
new file mode 100644
index 000000000..68ff82374
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
@@ -0,0 +1,6 @@
+PREFERRED_PROVIDER_u-boot = "u-boot-imx6"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx6"
+PREFERRED_PROVIDER_u-boot-mxsboot-native = "u-boot-imx6"
+
+AGL_DEFAULT_IMAGE_FSTYPES := "sdcard.gz"
+AGL_DEFAULT_INITRAMFS_FSTYPES := "cpio.gz"
\ No newline at end of file
diff --git a/templates/machine/nitrogen6x/50_bblayers.conf.inc b/templates/machine/nitrogen6x/50_bblayers.conf.inc
index 2852303b4..2377ff6bc 100644
--- a/templates/machine/nitrogen6x/50_bblayers.conf.inc
+++ b/templates/machine/nitrogen6x/50_bblayers.conf.inc
@@ -1,5 +1,6 @@
 BBLAYERS =+ "\
-  ${METADIR}/meta-fsl-arm \
-  ${METADIR}/meta-fsl-arm-extra \
+  ${METADIR}/meta-freescale \
+  ${METADIR}/meta-freescale-3rdparty \
+  ${METADIR}/meta-freescale-distro \
   ${METADIR}/meta-boundary \
   "
diff --git a/templates/machine/nitrogen6x/50_local.conf.inc b/templates/machine/nitrogen6x/50_local.conf.inc
index fec3a7f6d..e0133552d 100644
--- a/templates/machine/nitrogen6x/50_local.conf.inc
+++ b/templates/machine/nitrogen6x/50_local.conf.inc
@@ -1,2 +1,3 @@
 MACHINE = "nitrogen6x"
+require conf/include/agl_nitrogen6x.inc
 
diff --git a/templates/machine/nitrogen6x/50_setup.sh b/templates/machine/nitrogen6x/50_setup.sh
index ea340a763..bb22790dc 100644
--- a/templates/machine/nitrogen6x/50_setup.sh
+++ b/templates/machine/nitrogen6x/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"