diff options
| author |   Marcin Juszkiewicz <hrw@openembedded.org> | 2006-09-27 14:07:19 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-09-27 14:07:19 +0000 |
| commit | b01aed544f505814ec9cffcfd739111c207b615d (patch) | |
| tree | 9f8d9efb60b2e1538f2c6f5b19cede727e709e4a | |
| parent | 0731ae660f6d7ec3b74ed4c6b9de087e4c484367 (diff) | |
| parent | e682c920024719209a58509a0c84fd3914293cf5 (diff) | |
| download | openembedded-b01aed544f505814ec9cffcfd739111c207b615d.tar.gz | |
merge of '1e14a41a1a368acd06c76c94c9e67fd660fd6d0a'
and '2061d23a8305360c778930e17936cc30ce12b906'
| -rw-r--r-- | conf/machine/a780.conf | 2 | ||||
| -rw-r--r-- | conf/machine/h2200.conf | 3 | ||||
| -rw-r--r-- | conf/machine/h5xxx.conf | 2 | ||||
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 2 | ||||
| -rwxr-xr-x | conf/machine/netbook-pro.conf | 2 |
5 files changed, 9 insertions, 2 deletions
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf index aad664deea..6b6e5a8ea9 100644 --- a/conf/machine/a780.conf +++ b/conf/machine/a780.conf @@ -18,6 +18,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" #mtd2: 00580000 00020000 "VFM_Filesystem" #mtd3: 00020000 00020000 "Logo" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard" + ROOT_FLASH_SIZE = "24" EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 45eda7251f..65f27085f4 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -14,6 +14,9 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" ROOT_FLASH_SIZE = "32" PCMCIA_MANAGER = "pcmciautils" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" + + BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${H2200_MODULES}', d)}" BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools" diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index 008bfb252f..2ab9775419 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -18,7 +18,7 @@ EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" ROOT_FLASH_SIZE = "32" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 84380a49d0..b361b2bf6d 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -22,7 +22,7 @@ IMAGE_FSTYPES ?= "jffs2" MODUTILS = "26" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget" PCMCIA_MANAGER = "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index fb8b521a3c..c480cf4ebf 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -15,6 +15,8 @@ USE_VT = "0" #use the epson xserver XSERVER = "xserver-kdrive-epson" +MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost" + #ship in rootfs: NBP_MODULES = " apm \ pcmcia-core \ |