From 2825d11f905b6dcf433c7829793b5a4f18f4dd78 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 10 Jul 2007 19:14:06 +0000 Subject: h4000, htcblueangel: Add pcmciautils to MACHINE_EXTRA. * These machines have ACX100 internally connected to PCMCIA, and now there's proper CardServices driver for it. At least while it is in debugging phase, it is beneficial to have pcmciautils around. Don't pcmcia to MACHINE_FEATURES, as the meaning of that is machine having full-fledges PCMCIA support, and leads to installation of several additiona packages which won't useful in this case. --- conf/machine/h4000.conf | 4 ++-- conf/machine/htcblueangel.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index cd6a6dd6a1..5aeab899b3 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -13,7 +13,7 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" # # Software/packages selection @@ -22,7 +22,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" +MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ kernel-module-i2c-pxa \ kernel-module-acx \ diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf index 77bb0b5639..5f2814844d 100644 --- a/conf/machine/htcblueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -23,7 +23,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -MACHINE_EXTRA_RDEPENDS = "acx-firmware" +MACHINE_EXTRA_RDEPENDS = "acx-firmware ${PCMCIA_MANAGER}" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-blueangel_pcmcia \ kernel-module-blueangel_audio \ kernel-module-blueangel_rom \ -- cgit v1.2.3 From 5bee16dc1ce3c3b02455b3e6d0c15cbb285d8361 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 10 Jul 2007 19:17:24 +0000 Subject: angstrom-2007.1.conf: Use 2.6.21-hh1 for linux-handhelds-2.6. --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index d4a40eddba..5fa414d2b4 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -127,7 +127,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh10" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh11" PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20" -- cgit v1.2.3