h2200: machine and bootloader fixes

diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 533cd08..354e3a9 100644 (file)
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -19,7 +19,7 @@ BOOTSTRAP_EXTRA_RRECOMMENDS = " ${@linux_module_packages('${H2200_MODULES}', d)}
 BOOTSTRAP_EXTRA_RDEPENDS_append = " 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-pxa2xx-i2sound 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 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 "
 
 
 #autoload on boot:
@@ -31,10 +31,11 @@ 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-pxa2xx-i2sound= "snd-pxa2xx-i2sound"
+module_autoload_snd_h2200_audio = "snd-h2200_audio"
 module_autoload_snd-pcm-oss    = "snd-pcm-oss"
 
 SERIAL_CONSOLE = "115200 tts/0 vt100"

diff --git a/packages/h2200-bootloader/h2200-bootloader.bb b/packages/h2200-bootloader/h2200-bootloader.bb
index 9e97cd4..e0fbcac 100644 (file)
--- a/packages/h2200-bootloader/h2200-bootloader.bb
+++ b/packages/h2200-bootloader/h2200-bootloader.bb
@@ -2,9 +2,12 @@ DESCRIPTION = "Bootloader firmware extractor for the h2200 iPAQ"
 RRECOMMENDS = "kernel-module-mtdblock kernel-module-hamcop-nand"
 ALLOW_EMPTY = "1"
 MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-
+PR="r1"
 
 pkg_postinst() {
 #!/bin/sh
-modprobe mtdblock; mkdir -p /lib/firmware ; modprobe hamcop_nand ;  dd if=/dev/mtdblock0 of=/lib/firmware/hamcop_bootloader.bin
+modprobe mtdblock
+modprobe hamcop_nand
+mkdir -p /lib/firmware
+dd if=/dev/mtdblock0 of=/lib/firmware/hamcop_bootloader.bin
 }