diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-05 09:02:55 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-05 09:02:55 +0000 |
| commit | 4df8a4c61a36dee1830e1e52980e100c8f8cd5a1 (patch) | |
| tree | 07822969fa0915be192b319ec5c30e190a782d72 /conf | |
| parent | b19fbe04169b2eda4d8f833fbc548b183e4e9442 (diff) | |
| parent | b96de293f83c5860731e5a63ef27b1af2921a23c (diff) | |
merge of '93691535aba89a9ed8c657fdc80e62bf1e46e93d'
and 'dfdda7c548b2b8c023a5e9015f79c6f450c91fa3'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 10 | ||||
| -rw-r--r-- | conf/machine/h4000.conf | 1 | ||||
| -rw-r--r-- | conf/machine/htcuniversal.conf | 3 | ||||
| -rw-r--r-- | conf/machine/netvista.conf | 1 |
4 files changed, 10 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index ab5f3b8f72..e7f4fdc654 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -85,11 +85,13 @@ FEED_URIS += " \ # We will lock down a SRCDATE when we go into release mode #SRCDATE = "20070303" -#PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" -PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" +PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.20-hh6" +PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.20-hh6" +PREFERRED_VERSION_linux-handhelds-2.6_h5000 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13" -PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh5" -PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh5" +PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6" +PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh6" PREFERRED_VERSION_file = "4.18" PREFERRED_VERSION_file_native = "4.18" diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 9428b9ce11..61d473929a 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -22,6 +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_RRECOMMENDS = "kernel-module-snd-h4000-audio \ kernel-module-i2c-pxa" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 485d90df7f..dbe3a5a010 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -15,7 +15,8 @@ require conf/machine/include/tune-xscale.conf #require conf/machine/include/tune-iwmmxt.conf GUI_MACHINE_CLASS = "bigscreen" -MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth" +MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone" +MACHINE_TASK_PROVIDER = "task-base" # # Software/packages selection diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index b19558bd97..25bf6649bd 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -15,6 +15,7 @@ MACHINE_TASK_PROVIDER = "task-base" MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa" ROOT_FLASH_SIZE = "32" +GUI_MACHINE_CLASS = "bigscreen" udevdir = "/dev" OLDEST_KERNEL = "2.6.17" |