summaryrefslogtreecommitdiff
path: root/conf/machine/magician.conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-12-23 10:39:46 +0000
committerKoen Kooi <koen@openembedded.org>2007-12-23 10:39:46 +0000
commita5ab4c1e92a80b977b53072b349e05ab0f097dd1 (patch)
treec93cf04d86827b31ee317cdf0a2796be2db80175 /conf/machine/magician.conf
parent9030208546561970a18f0eb4be401b4d837aa310 (diff)
parent20e5fbe217c05900868741ec16b09092eaf0830a (diff)
propagate from branch 'org.openembedded.dev' (head d8bfa63aa913e7227790ba2d02253cfbecce61ab)
to branch 'org.openembedded.dev.avr32' (head bb1b18fc3fa0562c4c7bd85bb0d9617c62261f2e)
Diffstat (limited to 'conf/machine/magician.conf')
-rw-r--r--conf/machine/magician.conf19
1 files changed, 6 insertions, 13 deletions
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index e099825a40..1c1d08afb1 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -21,15 +21,9 @@ 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"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost vfat"
MACHINE_FEATURES += "iwmmxt"
-
-#
-# We don't support jffs2 installations (yet).
-#
-IMAGE_FSTYPES = "tar.bz2"
-
#
# Software/packages selection
#
@@ -44,16 +38,17 @@ MACHINE_EXTRA_RRECOMMENDS = " \
kernel-module-i2c-pxa \
kernel-module-pxa27x-voltage \
kernel-module-pxa27x-voltage-max158xx \
- kernel-module-leds-magician \
kernel-module-magician-ts \
- 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
@@ -63,8 +58,6 @@ module_autoload_leds-magician = "leds-magician"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
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"