summaryrefslogtreecommitdiff
path: root/recipes-bsp
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-03-06 14:19:35 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2019-03-06 16:15:45 +0100
commit66c22f7afe8cca8e7107f8940f831f5d3073758b (patch)
treeed87169eea6fcdd6c0d0de60000752eacd4fedd4 /recipes-bsp
parent0680d4fbd8f543861549c66cf9602edd29447b66 (diff)
u-boot-toradex: drop include tdx_version.conf
Variables from tdx_version.conf are now provided by the distro. Add defaults in case someone doesn't use our distro. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-bsp')
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex-fw-utils_2016.11.bbappend4
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend3
2 files changed, 4 insertions, 3 deletions
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_2016.11.bbappend b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_2016.11.bbappend
index 00bc9de..560f4c8 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_2016.11.bbappend
+++ b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_2016.11.bbappend
@@ -1,7 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-include conf/tdx_version.conf
-
SRCREV = "02735f400478c6e9afc432fda1149abef630657c"
SRCREV_use-head-next = "${AUTOREV}"
SRCBRANCH_use-head-next = "2016.11-toradex-next"
@@ -29,3 +27,5 @@ do_install_append_colibri-imx7-emmc() {
install_unlock_emmc
}
+# defaults
+TDX_VER_ITEM ??= "0"
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend
index 62366cc..d2d1ffd 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend
+++ b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend
@@ -1,5 +1,4 @@
require recipes-bsp/u-boot/u-boot-toradex-env.inc
-include conf/tdx_version.conf
LOCALVERSION = "-${TDX_VER_ITEM}"
@@ -8,3 +7,5 @@ SRCBRANCH = "2016.11-toradex"
SRCREV_use-head-next = "${AUTOREV}"
SRCBRANCH_use-head-next = "2016.11-toradex-next"
+# defaults
+TDX_VER_ITEM ??= "0"