diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-12-25 13:46:47 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-12-25 13:46:47 +0000 |
| commit | 58d08348e701f6efb483546e39e029f3cb8df429 (patch) | |
| tree | 497d2d05fe75c3303145da0c487f508aa917ee26 /conf/machine | |
| parent | 28923e28feb20034efc37bb64132ed07679cc272 (diff) | |
| parent | d7f9aa1735c0b9d589c11638cdf60d56267d431e (diff) | |
merge of '8728ab154063ad389826d041d5c22bd3587f3372'
and 'acf2917a94a9bba36e944b0ad3ee532e3fc10eaf'
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/h2200.conf | 5 | ||||
| -rw-r--r-- | conf/machine/h5000.conf | 6 | ||||
| -rw-r--r-- | conf/machine/hx4700.conf | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 75ffc0d423..cad7d0393c 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -26,7 +26,8 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " h2200-bootloader " +MACHINE_EXTRA_RDEPENDS = " udev-hostap-cs-vcc-workaround " MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-snd-h2200-audio \ kernel-module-i2c-pxa \ @@ -39,7 +40,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" # module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" -module_autoload_snd-h2000-audio = "snd-h2000-audio" +module_autoload_snd-h2200-audio = "snd-h2200-audio" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index 62d3c21450..fcd6cfa0b9 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te h5xxx" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" require conf/machine/include/tune-xscale.inc @@ -31,5 +31,9 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ # # Modules autoload and other boot properties # +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_g_ether = "g_ether" + SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 1510cf8745..0d3a9bbcf0 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -21,7 +21,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "200" -MACHINE_FEATURES = "alsa apm bluetooth irda pcmcia screen touchscreen usbgadget wifi vfat" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 pcmcia screen touchscreen usbgadget wifi vfat" MACHINE_FEATURES += "iwmmxt" # |