diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-11-23 18:02:24 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-11-23 18:02:24 +0000 |
| commit | d6af3cc90d39dc330fd7049a0644c3cebc474bc2 (patch) | |
| tree | 376035a1638d358bd2d06f7718fd49526c82c68d | |
| parent | 13474f069fde92b8d5d2e57ea4c5fbd51cce2e91 (diff) | |
| parent | 7f35b9f9a7ca170a0357b608fa9a06507ecddc49 (diff) | |
merge of '9b981e31de2f83c6d7ec9a51a32fc7a6544d46ee'
and 'e4036213db7177a5bac452c75e26c5acaf49f353'
| -rw-r--r-- | conf/machine/h3600.conf | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 104d518ad3..6297e07500 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -6,45 +6,53 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "ipaqsa" +PACKAGE_EXTRA_ARCHS = "armv4 ipaqsa" require conf/machine/include/tune-strongarm.conf -# h3700, h3800 have 32, but let that be bonus +# h3700, h3800 have 32, but let that be the bonus ROOT_FLASH_SIZE = "16" # h3630 have 32Mb only VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget" # # Software/packages selection # +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa" -PREFERRED_VERSION_handhelds-sa ?= "2.4.19-rmk6-pxa1-hh42" -BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}" + +MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params" +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ + kernel-module-micro" + EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" -H3600_MODULES = "\ -h3600-asic \ -h3600-micro \ -hwtimer \ -nvrd \ -sa1100-cs \ -sa1100-ir \ -sa1100-wdt \ -sa1100-audio \ -sa1100-rtc \ -sa1100usb-core \ -sd-mod \ -serial-h3800 \ -usb-char \ -usb-eth" + + +# TODO: see if any of these modules have 2.6 counterparts +# and need to be RRECOMMENDED +# +#H3600_MODULES = "\ +#h3600-asic \ +#hwtimer \ +#nvrd \ +#sa1100-cs \ +#sa1100-ir \ +#sa1100-wdt \ +#sa1100-audio \ +#sa1100-rtc \ +#sa1100usb-core \ +#sd-mod \ +#serial-h3800 \ +#" + + # # Modules autoload and other boot properties # -USE_DEVFS = "1" +SERIAL_CONSOLE = "115200 ttySA0 vt100" USE_VT = "0" - -SERIAL_CONSOLE = "115200 ttySA0" |