official ezx name for the ROKR E2 is rokre2 (yes it looks ugly... ;)

diff --git a/conf/machine/rokr-e2.conf b/conf/machine/rokr-e2.conf
deleted file mode 100644 (file)
index ccd496c..0000000
--- a/conf/machine/rokr-e2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: Motorola EZX rokr e2 
-#@DESCRIPTION: Machine configuration for the Motorola GSM phones rokr e2
-
-require conf/machine/include/motorola-ezx-base.inc
-
-#no touchscreen
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-

diff --git a/conf/machine/rokre2.conf b/conf/machine/rokre2.conf
new file mode 100644 (file)
index 0000000..621e95f
--- /dev/null
+++ b/conf/machine/rokre2.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: Motorola EZX ROKR E2
+#@DESCRIPTION: Machine configuration for the Motorola GSM Phone ROKR E2
+
+require conf/machine/include/motorola-ezx-base.inc
+
+# there is no touchscreen
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"

diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index f28589b..0ddf590 100644 (file)
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -77,13 +77,13 @@ RDEPENDS_task-openmoko-ui = "\
 # handle theming. FIXME: properly use machine database in a smart way,
 # taking into account not only size but also PPI! Ultimately this might
 # need recomputing some theme files and images on-the-fly :/ SVG and logical
-# theme description anyone?
-THEMES       = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
-THEMES_a780  = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_e680  = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_a1200 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokr2 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokr6 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+# theme description anyone? Or simply Edje to the rescue! :D
+THEMES        = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
+THEMES_a780   = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_e680   = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_a1200  = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_rokre2 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_rokre6 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
 
 RDEPENDS_task-openmoko-ui += "${THEMES}"