diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-09-27 13:52:52 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-09-27 13:52:52 +0000 |
| commit | 7171e115d170392689aeb662c5c4381b3275f69d (patch) | |
| tree | 84cabe27cf519c5fb283e2e2e00f8d1b5407dd1a | |
| parent | 194e9539227c960636ef5b6332aede195c32b2c9 (diff) | |
| parent | c0539a99fb0c369c128a6c471248160cf5fa375a (diff) | |
merge of '5a91122748a2eff5f19fc8d9fdd0d6d0b748f3d8'
and 'c594e84e99724db9f4ac0766c2e20018944b0ebe'
| -rw-r--r-- | conf/machine/akita.conf | 2 | ||||
| -rw-r--r-- | conf/machine/c7x0.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/poodle-2.6.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/tosa-2.6.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-2.6.conf (renamed from conf/machine/include/zaurus-clamshell-2.6.conf) | 10 | ||||
| -rw-r--r-- | conf/machine/spitz.conf | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 0358864c70..e14efa76a0 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf IPKG_EXTRA_ARCHS += "iwmmxt" IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 4b1d8edb80..893378f569 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index eff0ad4c7c..01a06b7c27 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -1 +1 @@ -require conf/machine/include/zaurus-clamshell-2.6.conf +require conf/machine/include/zaurus-2.6.conf diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf index 6831b0ea91..f3591b4b75 100644 --- a/conf/machine/include/tosa-2.6.conf +++ b/conf/machine/include/tosa-2.6.conf @@ -1,4 +1,4 @@ -include conf/machine/include/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf # wlan-ng Modules MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-2.6.conf index e0a9e38e91..ce9b44c9fe 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-2.6.conf @@ -6,10 +6,10 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7" PCMCIA_MANAGER ?= "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" -MACHINE_FEATURES_akita = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost" -MACHINE_FEATURES_spitz = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost ext2" - +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen" +MACHINE_FEATURES_append_tosa = " usbhost usbwlanng " +MACHINE_FEATURES_append_akita = " usbhost " +MACHINE_FEATURES_append_spitz = " usbhost ext2 " MACHINE_EXTRA_RDEPENDS = "zaurusd" MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" @@ -17,4 +17,4 @@ MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" -MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index af50217e0f..5434efbaf6 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" |