summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-09-12 10:01:44 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-12-23 22:15:42 +0100
commit615dbd5b9042ef83cfa9141c6e57604c4bf58dc6 (patch)
tree80cb09fefe3daad572415c6c7daf89a7d21b8987
parent14888ee3ec620ab693773beca5b264d6b80357b0 (diff)
layer.conf: apply an include to machine.conf
Include a file to the machine configuration to amend to the upstream $MACHINE.conf file. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--conf/layer.conf4
1 files changed, 4 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index eec2324..a78de00 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -22,3 +22,7 @@ LAYERDEPENDS_toradex-nxp-layer = " \
fsl-arm-extra \
toradex-bsp-common-layer \
"
+
+# This file need not exist, if it does it can be used to change the machine
+# configuration
+include conf/machine/include/${MACHINE}.inc