diff options
| author |   Matt Reimer <mattjreimer@gmail.com> | 2006-02-13 20:18:20 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-13 20:18:20 +0000 |
| commit | a5e977b62a380031579993527287dc3e2a5a4412 (patch) | |
| tree | 7d4a849c79d6c7079c5832cfa14a66ab61d7ff8f /conf | |
| parent | 35d023139b6252b559ed586a669d01bd96b7623a (diff) | |
| parent | 508ee5fae6db172999c134da078fe735d44c7844 (diff) | |
| download | openembedded-a5e977b62a380031579993527287dc3e2a5a4412.tar.gz | |
merge of 76c624877b5e17823feb3fe1ff60f7857f026ead
and fcd56811bebb5259ffaeb4702818ed9851f858fc
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/h2200.conf | 20 | ||||
| -rw-r--r-- | conf/machine/handheld-common.conf | 2 |
2 files changed, 4 insertions, 18 deletions
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index da9d9738ab..70cbe0ef09 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -9,7 +9,7 @@ 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" @@ -19,24 +19,10 @@ BOOTSTRAP_EXTRA_RRECOMMENDS = " ${@linux_module_packages('${H2200_MODULES}', d)} 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" +module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 tts/0 vt100" diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf index 1082457a41..cccd50fdeb 100644 --- a/conf/machine/handheld-common.conf +++ b/conf/machine/handheld-common.conf @@ -6,7 +6,7 @@ ide-cs ide-disk ide-probe-mod \ loop \ vfat ext2 \ sunrpc nfs \ -btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \ +btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart hidp \ pcnet-cs serial-cs airo-cs \ af_packet \ ppp-async ppp-deflate ppp-mppe \ |