summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorBruno Randolf <br1@subnet.at>2004-12-07 16:34:22 +0000
committerBruno Randolf <br1@subnet.at>2004-12-07 16:34:22 +0000
commit1c18d42cd19fb7da25d82361591739171b0c2003 (patch)
tree3ca6eca726f7f4a2bd5106e0d5546bda9df11ba0 /conf
parent75a7aa490302cab3d1403c7bc401d9393a8cd235 (diff)
small ntp license and prism54 updates
BKrev: 41b5db8e0TzVvO2BRROxro5uHygauA
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/nylon.conf2
-rw-r--r--conf/licenses.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 89c3b332cc..4b651ff8af 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -30,6 +30,8 @@ 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_prism54-firmware = "1.0.3.0"
+
# use meshcub.org mirrors
CVS_TARBALL_STASH = "http://meshcube.org/nylon/unstable/sources/"
INHERIT += "nylon-mirrors"
diff --git a/conf/licenses.conf b/conf/licenses.conf
index 1ba1e2eace..a72d9b8af7 100644
--- a/conf/licenses.conf
+++ b/conf/licenses.conf
@@ -1,4 +1,4 @@
-SRC_DISTRIBUTE_LICENSES = "GPL GPLv2 BSD LGPL Apache-2.0 QPL AFL"
+SRC_DISTRIBUTE_LICENSES += "GPL GPLv2 BSD LGPL Apache-2.0 QPL AFL"
SRC_DISTRIBUTE_LICENSES += "MIT Sleepycat Classpath Perl PSF PD Artistic"
SRC_DISTRIBUTE_LICENSES += "bzip2 zlib ntp cron libpng netperf openssl"