increase dvbapp PR.

[vuplus_openembedded] / conf / machine / magician.conf

diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 3d1b602..66b1f96 100644 (file)
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -6,18 +6,22 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#require conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.inc
 
-ROOT_FLASH_SIZE = "80"
+ROOT_FLASH_SIZE = "60"
 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_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "142"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost vfat"
+MACHINE_FEATURES += "iwmmxt"
 
 #
 # Software/packages selection
@@ -25,34 +29,39 @@ MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen us
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 MODUTILS = "26"        
 XSERVER = "xserver-kdrive-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 MACHINE_EXTRA_RRECOMMENDS = " \
-       kernel-module-leds-magician \
+       kernel-module-i2c-pxa \
+       kernel-module-pxa27x-voltage \
+       kernel-module-pxa27x-voltage-max158xx \
        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"
 
+#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there
+EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+                         -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+                         -e 256KiB -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
+
+
 #
 # Modules autoload and other boot properties
 #
-module_autoload_magician_ts = "magician_ts"
-module_autoload_leds-magician = "leds-magician"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_hci_usb = "hci_usb"
 module_autoload_pxa27x_udc = "pxa27x_udc"
-module_autoload_magician_ds1wm = "magician_ds1wm"
-module_autoload_magician-battery = "magician-battery"
+module_autoload_magician_ts = "magician_ts"
+module_autoload_leds-magician = "leds-magician"
 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"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"