diff options
| author |   Nathan Illerbrun <nathani@validmanufacturing.com> | 2017-07-14 07:34:28 -0700 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-07-17 13:41:15 +0000 |
| commit | 8b237085593840dd846f2fea02c11cd1bd5ef7d6 (patch) | |
| tree | 7e8f5d36c0745bbfdcb0ddac0b49aa736358b944 | |
| parent | 59bdc8c1416176ba4f9f59031221e2c006a624ba (diff) | |
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/10207
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_nitrogen6x.inc | 6 | ||||
| -rw-r--r-- | templates/machine/nitrogen6x/50_bblayers.conf.inc | 5 | ||||
| -rw-r--r-- | templates/machine/nitrogen6x/50_local.conf.inc | 1 | ||||
| -rw-r--r-- | templates/machine/nitrogen6x/50_setup.sh | 2 |
4 files changed, 11 insertions, 3 deletions
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" |