From 66ce72fe9457ea462fe3b4c7f912e6691f451ded Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 13:38:12 +0000 Subject: zaurus machines: renamed zaurus-clamshell-2.6.conf into zaurus-2.6.conf as it is used in all 2.6 powered models --- conf/machine/akita.conf | 2 +- conf/machine/c7x0.conf | 2 +- conf/machine/include/poodle-2.6.conf | 2 +- conf/machine/include/tosa-2.6.conf | 2 +- conf/machine/include/zaurus-2.6.conf | 20 ++++++++++++++++++++ conf/machine/include/zaurus-clamshell-2.6.conf | 20 -------------------- conf/machine/spitz.conf | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 conf/machine/include/zaurus-2.6.conf delete mode 100644 conf/machine/include/zaurus-clamshell-2.6.conf (limited to 'conf/machine') 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-2.6.conf b/conf/machine/include/zaurus-2.6.conf new file mode 100644 index 0000000000..e426011d77 --- /dev/null +++ b/conf/machine/include/zaurus-2.6.conf @@ -0,0 +1,20 @@ +# Zaurus Clamshell specific configuration for kernel 2.6 +# Don't forget to include zaurus-clamshell.conf as well + +PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" +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_EXTRA_RDEPENDS = "zaurusd" +MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" +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" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf deleted file mode 100644 index e0a9e38e91..0000000000 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Zaurus Clamshell specific configuration for kernel 2.6 -# Don't forget to include zaurus-clamshell.conf as well - -PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -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_EXTRA_RDEPENDS = "zaurusd" -MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" -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 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}" -- cgit v1.2.3