summaryrefslogtreecommitdiff
path: root/conf/machine/magician.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/magician.conf')
-rw-r--r--conf/machine/magician.conf23
1 files changed, 18 insertions, 5 deletions
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 3d1b602def..fab936707b 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -16,8 +16,15 @@ require conf/machine/include/tune-xscale.conf
ROOT_FLASH_SIZE = "80"
VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost"
+
+#
+# We don't support jffs2 installations (yet).
+#
+IMAGE_FSTYPES = "tar.bz2"
#
# Software/packages selection
@@ -29,17 +36,21 @@ XSERVER = "xserver-kdrive-fbdev"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
MACHINE_EXTRA_RRECOMMENDS = " \
+ kernel-module-af-key \
+ kernel-module-i2c-pxa \
+ kernel-module-pxa27x-voltage \
+ kernel-module-pxa27x-voltage-max158xx \
kernel-module-leds-magician \
kernel-module-magician-ts \
- kernel-module-pxaficp-ir \
- kernel-module-uinput \
- kernel-module-hci-usb \
kernel-module-magician-flash \
kernel-module-magician-ds1wm \
kernel-module-magician-battery \
kernel-module-magician-phone \
+ kernel-module-magician-pm \
+ kernel-module-n-tihtc \
kernel-module-snd-soc-magician"
+
#
# Modules autoload and other boot properties
#
@@ -51,6 +62,8 @@ module_autoload_pxa27x_udc = "pxa27x_udc"
module_autoload_magician_ds1wm = "magician_ds1wm"
module_autoload_magician-battery = "magician-battery"
module_autoload_magician_phone = "magician_phone"
+module_autoload_magician_pm = "magician_pm"
+module_autoload_n_tihtc = "n_tihtc"
module_autoload_snd-soc-magician = "snd-soc-magician"
module_autoload_hci_usb = "hci_usb"