h2200.conf: Fix EXTRA_IMAGECMD_jffs2 to generate a working jffs2 image on

h2200. Also remove unneeded module_autoload directives.

diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 37ae1a0..9aec686 100644 (file)
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -9,31 +9,17 @@ IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h2200"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
-EXTRA_IMAGECMD_h2200_jffs2 = "--pad --no-cleanmarkers --pagesize=512 --eraseblock=16384"
+EXTRA_IMAGECMD_jffs2_h2200 = "--pad --no-cleanmarkers --eraseblock=16384"
 
 ROOT_FLASH_SIZE = "32"
 
 BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append = " h2200-bootloader kernel udev module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools"
 
 #ship in rootfs:
-H2200_MODULES = "g_ether g_serial g_file_storage sa1100-rtc apm pcmcia-core snd-pcm-oss snd-h2200_audio pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop "
-
+H2200_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss"
 
 #autoload on boot:
-module_autoload_h2200_pm        = "h2200_pm"
-module_autoload_h2200_kbd       = "h2200_kbd"
-module_autoload_h2200_lcd       = "h2200_lcd"
-module_autoload_mq11xx_base     = "mq11xx_base"
-module_autoload_mq1100fb        = "mq1100fb"
-module_autoload_samcop_adcts    = "samcop_adcts"
-module_autoload_samcop_sdi      = "samcop_sdi"
-module_autoload_w1_ds2760       = "w1_ds2760"
-module_autoload_w1_samcop       = "w1_samcop"
-module_autoload_h2200_battery   = "h2200_battery"
-module_autoload_hamcop_nand     = "hamcop_nand"
-module_autoload_pxa2xx_h2200    = "pxa2xx_h2200"
-module_autoload_snd_h2200_audio = "snd-h2200_audio"
 module_autoload_snd-pcm-oss    = "snd-pcm-oss"
 
 SERIAL_CONSOLE = "115200 tts/0 vt100"