summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf1
-rw-r--r--conf/machine/rokre6.conf8
2 files changed, 9 insertions, 0 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 3b2dcce756..017dc51cba 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -320,6 +320,7 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.5"
require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-xorg-versions.inc
+require conf/distro/include/preferred-openmoko-versions.inc
# Virtuals:
diff --git a/conf/machine/rokre6.conf b/conf/machine/rokre6.conf
new file mode 100644
index 0000000000..7b20091140
--- /dev/null
+++ b/conf/machine/rokre6.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: Motorola EZX ROKR E6
+#@DESCRIPTION: Machine configuration for the Motorola GSM Phone ROKR E6
+
+require conf/machine/include/motorola-ezx-base.inc
+
+# there is no touchscreen
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"