From 696ad54999f0ff0e8f3a9ae291cf3b1f0c6e24b6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Sep 2006 12:28:34 +0000 Subject: guinness: add MACHINE_FEATURES --- conf/machine/guinness.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf/machine') diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index 8345ff5fd8..35cb1d2070 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -17,5 +17,7 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" +MACHINE_FEATURES = "kernel26 usbhost ext2" + require conf/machine/include/tune-athlonmp.conf -- cgit v1.2.3 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 From 69de8096736a271e00843833a55b6685148d31d9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 13:40:27 +0000 Subject: zaurus-2.6.conf: added keyboard, touchscreen into features, added tosa info --- conf/machine/include/zaurus-2.6.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf index e426011d77..ce9b44c9fe 100644 --- a/conf/machine/include/zaurus-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" -- cgit v1.2.3 From 2ff2762ae0cba93d544551958600246481d4c7b6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Sep 2006 14:02:09 +0000 Subject: h2200, h5xxx, ipaq-pxa270, netbook-pro: add MACHINE_FEATURES --- conf/machine/h2200.conf | 3 +++ conf/machine/h5xxx.conf | 2 +- conf/machine/ipaq-pxa270.conf | 2 +- conf/machine/netbook-pro.conf | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 45eda7251f..65f27085f4 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -14,6 +14,9 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" ROOT_FLASH_SIZE = "32" PCMCIA_MANAGER = "pcmciautils" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" + + BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${H2200_MODULES}', d)}" BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools" diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index 008bfb252f..2ab9775419 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -18,7 +18,7 @@ EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" ROOT_FLASH_SIZE = "32" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 84380a49d0..b361b2bf6d 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -22,7 +22,7 @@ IMAGE_FSTYPES ?= "jffs2" MODUTILS = "26" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget" PCMCIA_MANAGER = "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index fb8b521a3c..c480cf4ebf 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -15,6 +15,8 @@ USE_VT = "0" #use the epson xserver XSERVER = "xserver-kdrive-epson" +MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost" + #ship in rootfs: NBP_MODULES = " apm \ pcmcia-core \ -- cgit v1.2.3 From e682c920024719209a58509a0c84fd3914293cf5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Sep 2006 14:06:38 +0000 Subject: a780: add MACHINE_FEATURES, the 'keyboard' one might be a bit misplaced --- conf/machine/a780.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf/machine') diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf index aad664deea..6b6e5a8ea9 100644 --- a/conf/machine/a780.conf +++ b/conf/machine/a780.conf @@ -18,6 +18,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" #mtd2: 00580000 00020000 "VFM_Filesystem" #mtd3: 00020000 00020000 "Logo" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard" + ROOT_FLASH_SIZE = "24" EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" -- cgit v1.2.3 From 1adb774adc699c9e0700394325c27ae0e35480ab Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 27 Sep 2006 17:37:35 +0000 Subject: omap5912osk.conf : prepare for task-base stuff defconfig : Update defconfig to follow git and enable dsp gateway linux-omap1_2.6.x+git.bb : Fix problems in build process --- conf/machine/omap5912osk.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf/machine') diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index fc17985233..3ae0064c46 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -7,6 +7,8 @@ IPKG_EXTRA_ARCHS = "armv5te" HOTPLUG = "udev" +#MACHINE_TASK_PROVIDER = "task-bootstrap" + PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -- cgit v1.2.3 From 12ccaa08c41a76debd4f792db8d4704d3737ee5a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 20:35:23 +0000 Subject: omap5912osk.conf: transformed into task-base format (old config commented as part of it will probably need to be added into MACHINE_EXTRA_RRECOMMENDS) --- conf/machine/omap5912osk.conf | 46 ++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 16 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 3ae0064c46..ea86d0c5cc 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -7,8 +7,6 @@ IPKG_EXTRA_ARCHS = "armv5te" HOTPLUG = "udev" -#MACHINE_TASK_PROVIDER = "task-bootstrap" - PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" @@ -19,25 +17,41 @@ PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020" PREFERRED_VERSION_linux-omap1 = "2.6.x+git" #PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2" -BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" - SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" +MACHINE_FEATURES = "kernel26 pcmcia usbhost" + +MACHINE_TASK_PROVIDER = "task-base" + +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \ + kernel-module-ide-disk \ + kernel-module-ide-core \ + kernel-module-nls-iso8859-1 \ + kernel-module-nls-cp437 \ + kernel-module-nls-base \ + kernel-module-vfat" + +include conf/machine/include/tune-arm926ejs.conf + +# old modules setup - partially need to be added into MACHINE_EXTRA_RRECOMMENDS + # PCMCIA Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia" -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf" +##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia" +##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf" + # IDE modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core" + # DOS and VFAT modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat" + # Video er LCD Driver -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea" -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor" -# DSP Interface -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp" +##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea" +##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor" -include conf/machine/include/tune-arm926ejs.conf +# DSP Interface +##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp" -- cgit v1.2.3