summaryrefslogtreecommitdiff
path: root/buildconf
diff options
context:
space:
mode:
Diffstat (limited to 'buildconf')
-rw-r--r--buildconf/bblayers.conf3
-rw-r--r--buildconf/local.conf19
2 files changed, 12 insertions, 10 deletions
diff --git a/buildconf/bblayers.conf b/buildconf/bblayers.conf
index 0b1784f..66c3d39 100644
--- a/buildconf/bblayers.conf
+++ b/buildconf/bblayers.conf
@@ -1,6 +1,6 @@
# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
# changes incompatibly
-LCONF_VERSION = "5"
+LCONF_VERSION = "6"
BBPATH = "${TOPDIR}"
BBFILES ?= ""
@@ -23,6 +23,7 @@ BASELAYERS ?= " \
${TOPDIR}/../stuff/meta-fsl-arm \
${TOPDIR}/../stuff/meta-fsl-arm-extra \
${TOPDIR}/../stuff/meta-fsl-demos \
+ ${TOPDIR}/../stuff/meta-jetson-tk1 \
${TOPDIR}/../stuff/meta-qt5 \
"
diff --git a/buildconf/local.conf b/buildconf/local.conf
index d6101d7..d4f1b83 100644
--- a/buildconf/local.conf
+++ b/buildconf/local.conf
@@ -33,23 +33,24 @@ PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}"
# For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
# be appropriate for example.
+# Enable a serial console on the USB CDC ACM ttyGS0 too
+SERIAL_CONSOLES_colibri-vf = "115200;ttyLP0 115200;ttyGS0"
+
#
# Machine Selection
#
# You need to select a specific machine to target the build with. These are the
# machines which for the Toradex Colibri and Apalis computer on module families
#
+#MACHINE ?= "apalis-imx6"
+#MACHINE ?= "apalis-t30"
+#MACHINE ?= "apalis-tk1"
+#
+#MACHINE ?= "colibri-imx6"
+#MACHINE ?= "colibri-imx7"
MACHINE ?= "colibri-t20"
#MACHINE ?= "colibri-t30"
#MACHINE ?= "colibri-vf"
-#MACHINE ?= "colibri-imx6"
-#MACHINE ?= "colibri-imx7"
-
-#MACHINE ?= "apalis-t30"
-#MACHINE ?= "apalis-imx6"
-
-# Enable a serial console on the USB CDC ACM ttyGS0 too
-SERIAL_CONSOLES_colibri-vf = "115200;ttyLP0 115200;ttyGS0"
#
# There are also a selection of emulated machines available which can boot and run
@@ -248,7 +249,7 @@ INHERIT += "rm_work"
# Add Toradex source mirror
INHERIT += "toradex-mirrors"
-# Use this distro
+# Use this distro (filename from meta-angstrom/conf/distro/xx.conf)
DISTRO = "angstrom-v2015.12"
# What image type(s) are to be built?