[oe-commits] org.oe.dev magician.conf: remove deprecated kernel modules, enable jffs2 image building

[pH5 commit]

magician.conf: remove deprecated kernel modules, enable jffs2 image building

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 673818154cbb2b32a756188c27a827021f5d81f5
ViewMTN: http://monotone.openembedded.org/revision/info/673818154cbb2b32a756188c27a827021f5d81f5
Files:
1
conf/machine/magician.conf
Diffs:

#
# mt diff -rcdcf07c5eed2f5dd49ed50a7f5360ca467053ce9 -r673818154cbb2b32a756188c27a827021f5d81f5
#
# 
# 
# patch "conf/machine/magician.conf"
#  from [1ae98222e011e1527f45541f6e78db64c18e0824]
#    to [4260af3d8d3a880db6afad5b346400cd59e1fd77]
# 
============================================================
--- conf/machine/magician.conf	1ae98222e011e1527f45541f6e78db64c18e0824
+++ conf/machine/magician.conf	4260af3d8d3a880db6afad5b346400cd59e1fd77
@@ -24,13 +24,7 @@ MACHINE_FEATURES += "iwmmxt"
 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
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
@@ -44,17 +38,18 @@ 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_pxa27x_udc = "pxa27x_udc
 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"