summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf2
-rw-r--r--conf/distro/nylon.conf1
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index fa3e726853..ccb740ed0b 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -45,7 +45,7 @@ TARGET_PREFIX = "${TARGET_SYS}-"
TARGET_CC_ARCH = ""
PACKAGE_ARCH = "${HOST_ARCH}"
-MACHINE_ARCH = "${@[bb.data.getVar('PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
+MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
##################################################################
# Date/time variables.
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 4b651ff8af..df5ce3078e 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -30,6 +30,7 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7"
PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7"
PREFERRED_VERSION_binutils = "2.14.90.0.7"
+PREFERRED_VERSION_unik-olsrd = "0.4.8"
PREFERRED_VERSION_prism54-firmware = "1.0.3.0"
# use meshcub.org mirrors