summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2006-02-08 21:12:54 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-08 21:12:54 +0000
commitdcbbfc041e59a98c9d88f4972230c4610af7a96b (patch)
tree1523259d4c753f6b4cf639d69f871edb8545e1fd /conf
parent0aaff4f4186ce0a81dad184286c9d9c055505647 (diff)
parentcfaff848a572c4b1ca86857fef49f2b73823836d (diff)
merge of 72da6517a613608cf82abf0dfaac25e03fbf478b
and 81310a82efd8fa4b4ce7bd707ed734f3ce153c46
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/slugos-packages.conf3
-rw-r--r--conf/machine/ep93xx.conf18
-rw-r--r--conf/machine/include/ixp4xx.conf2
3 files changed, 22 insertions, 1 deletions
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 467b472db8..28b85cd57e 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -91,6 +91,8 @@ ${PKGDIR}/packages/libaal/*.bb \
${PKGDIR}/packages/libao/*.bb \
${PKGDIR}/packages/libdvb/*.bb \
${PKGDIR}/packages/libexif/*.bb \
+${PKGDIR}/packages/libgcrypt/*.bb \
+${PKGDIR}/packages/libgpg-error/*.bb \
${PKGDIR}/packages/libgphoto2/*.bb \
${PKGDIR}/packages/libgsm/*.bb \
${PKGDIR}/packages/libiconv/*.bb \
@@ -218,6 +220,7 @@ ${PKGDIR}/packages/usbutils/*.bb \
${PKGDIR}/packages/util-linux/*.bb \
${PKGDIR}/packages/vim/*.bb \
${PKGDIR}/packages/vlan/*.bb \
+${PKGDIR}/packages/vpnc/*.bb \
${PKGDIR}/packages/vsftpd/*.bb \
${PKGDIR}/packages/wakelan/*.bb \
${PKGDIR}/packages/wget/*.bb \
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
new file mode 100644
index 0000000000..7eed2b3748
--- /dev/null
+++ b/conf/machine/ep93xx.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@Name: Cirrus Logic EP-93xx Development Platform
+#@DESCRIPTION: Machine configuration for Cirrus Logic EP-93xx Development Platform
+
+TARGET_ARCH = "arm"
+
+IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+
+# used by some images
+ROOT_FLASH_SIZE = "8"
+
+
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 7239d59076..639bf4a74e 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -161,7 +161,7 @@ SRCDATE_irssi ?= "20050930"
CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
INHERIT += "nslu2-mirrors"
-PREFERRED_VERSION_ipkg ?= "0.99.155"
+PREFERRED_VERSION_ipkg ?= "0.99.154"
PREFERRED_VERSION_ipkg-native ?= "0.99.154"
#-------------------------------------------------------------------------------