summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-12-09 09:08:42 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-12-09 09:08:42 +0000
commit801b7c63e9e57b03a6179f0902dbeb9235616e49 (patch)
treea7c27f61bf8a218955fa3895888a1e2b7ac5c7a7
parent31d9d8471532cc74290dc070059b28c2a1ec2cdc (diff)
reimport cset 220f7f0972594c5100ce90b7936ced56b45d9664:
h2200.conf: adapt to changed module names
-rw-r--r--conf/machine/h2200.conf11
1 files changed, 6 insertions, 5 deletions
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 973364ebf7..4dc502209a 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -9,17 +9,18 @@ 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_jffs2 = "--pad --no-cleanmarkers --pagesize=4096 --eraseblock=16384"
+EXTRA_IMAGECMD_h2200_jffs2 = "--pad --no-cleanmarkers --pagesize=512 --eraseblock=16384"
ROOT_FLASH_SIZE = "32"
-BOOTSTRAP_EXTRA_DEPENDS_append = "h2200-bootloader handhelds-pxa-2.6 udev module-init-tools"
+BOOTSTRAP_EXTRA_DEPENDS_append = " h2200-bootloader handhelds-pxa-2.6 udev module-init-tools"
-BOOTSTRAP_EXTRA_RDEPENDS = "h2200-bootloader ${@linux_module_packages('${H2200_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS = " h2200-bootloader kernel ${@linux_module_packages('${H2200_MODULES}', d)}"
BOOTSTRAP_EXTRA_RDEPENDS_append = " 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-pxa-i2sound-h2200 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-pxa2xx-i2sound pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop "
+
#autoload on boot:
module_autoload_h2200_pm = "h2200_pm"
@@ -33,7 +34,7 @@ module_autoload_w1_ds2760 = "w1_ds2760"
module_autoload_h2200_battery = "h2200_battery"
module_autoload_hamcop_nand = "hamcop_nand"
module_autoload_pxa2xx_h2200 = "pxa2xx_h2200"
-module_autoload_snd_pxa_i2sound_h2200 = "snd-pxa-i2sound-h2200"
+module_autoload_snd-pxa2xx-i2sound= "snd-pxa2xx-i2sound"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
SERIAL_CONSOLE = "115200 tts/0 vt100"