summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2007-12-15 18:54:29 +0000
committerPhilipp Zabel <philipp.zabel@gmail.com>2007-12-15 18:54:29 +0000
commit4e8136255b37ef73e1e513edfee977e8d93db235 (patch)
tree55e3572e9a2d7ba1c03252b4740995aafc9e3ec4 /conf
parent2f833ae83653728fb8e370ab571f125e9935ccf3 (diff)
magician.conf: remove deprecated kernel modules, enable jffs2 image building
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/magician.conf17
1 files changed, 5 insertions, 12 deletions
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index e099825a40..e605001406 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -24,12 +24,6 @@ MACHINE_DISPLAY_PPI = "142"
MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost"
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"