summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2006-12-29 19:43:51 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2006-12-29 19:43:51 +0000
commita237fdd3a91d4dd99d4d6a36dbffd9ac5f76a222 (patch)
treed93806dbfa6242c6539e3633bb3a27636d5aa72f /conf
parentf83fcfa62f5267235115429a3178e490c9494d72 (diff)
parentd91baaa377d2b7b630bfc41fa7ec90aae60d191b (diff)
merge of '2bd0126d08de7a847d1206078cb5735489c7a443'
and '421bc59a69ee9e86be6150500d3b25466a9b730b'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1-oabi.conf20
-rw-r--r--conf/machine/include/tosa-2.6.conf6
2 files changed, 20 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf
new file mode 100644
index 0000000000..e63dc61a48
--- /dev/null
+++ b/conf/distro/angstrom-2007.1-oabi.conf
@@ -0,0 +1,20 @@
+require conf/distro/angstrom-2007.1.conf
+
+#this is a special version of angstrom for armv4 based machines that can't do EABI
+#see http://wiki.debian.org/ArmEabiPort for details on that
+
+#set compatible machine so people don't 'accidentally' use this
+COMPATIBLE_MACHINE = "(collie|h3600|h3800|simpad)"
+
+#only glibc based builds are supported ATM
+TARGET_OS = "linux"
+
+FEED_ARCH_collie = "arm"
+FEED_ARCH_h3600 = "arm"
+FEED_ARCH_h3800 = "arm"
+FEED_ARCH_simpad = "arm"
+
+
+
+
+
diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf
deleted file mode 100644
index f3591b4b75..0000000000
--- a/conf/machine/include/tosa-2.6.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-include conf/machine/include/zaurus-2.6.conf
-# wlan-ng Modules
-MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
-
-# WM97xx Modules
-#MACHINE_EXTRA_RRECOMMENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"