From 7810352ab397b66e7c4f46bddd09bd68e7a0cadf Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 16 Oct 2006 13:57:41 +0000 Subject: conf/machine: remove -common stuff --- conf/machine/blueangel.conf | 2 -- conf/machine/collie.conf | 6 +++--- conf/machine/guinness.conf | 2 +- conf/machine/h3600.conf | 5 ----- conf/machine/h3900.conf | 2 -- conf/machine/include/handheld-common.conf | 23 ----------------------- conf/machine/include/ipaq-common.conf | 7 ------- conf/machine/include/poodle-2.4.conf | 8 ++++---- conf/machine/include/simpad-2.4.conf | 6 +++--- conf/machine/include/smartphone-common.conf | 21 --------------------- conf/machine/include/thinclient-common.conf | 19 ------------------- conf/machine/include/tosa-2.4.conf | 4 ++-- conf/machine/include/zaurus-clamshell-2.4.conf | 4 ++-- conf/machine/ipaq-pxa270.conf | 1 - conf/machine/jornada56x.conf | 1 - conf/machine/netvista.conf | 1 - conf/machine/poodle.conf | 2 -- conf/machine/simpad.conf | 3 +-- conf/machine/tosa.conf | 2 -- 19 files changed, 16 insertions(+), 103 deletions(-) delete mode 100644 conf/machine/include/handheld-common.conf delete mode 100644 conf/machine/include/ipaq-common.conf delete mode 100644 conf/machine/include/smartphone-common.conf delete mode 100644 conf/machine/include/thinclient-common.conf (limited to 'conf/machine') diff --git a/conf/machine/blueangel.conf b/conf/machine/blueangel.conf index 251dc8a806..979c002d11 100644 --- a/conf/machine/blueangel.conf +++ b/conf/machine/blueangel.conf @@ -36,8 +36,6 @@ SERIAL_CONSOLE = "115200 tts/2 vt100" USE_VT = "0" -include conf/machine/include/handheld-common.conf - GUI_MACHINE_CLASS = "smallscreen" ROOT_FLASH_SIZE = "32" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 0363f05e6b..fcaa2ff046 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -5,8 +5,9 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \ -sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \ +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs \ +sharp-sdmmc-support" +BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \ kernel-module-usbdcore kernel-module-usbdmonitor \ altboot" @@ -19,7 +20,6 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" IMAGE_LINGUAS = "" -include conf/machine/include/handheld-common.conf include conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index 12143edf63..4890f3cecd 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -19,5 +19,5 @@ GLIBC_EXTRA_OECONF = "--with-tls" MACHINE_FEATURES = "kernel26 usbhost ext2 pci" -require conf/machine/include/tune-athlonmp.conf +#require conf/machine/include/tune-athlonmp.conf diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index f14b9b24a5..e146860c76 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -15,9 +15,7 @@ ROOT_FLASH_SIZE = "16" H3600_MODULES = "\ h3600-asic \ h3600-micro \ -h3600-microkbd h3600-stowaway \ hwtimer \ -l3-backpaq \ nvrd \ sa1100-cs \ sa1100-ir \ @@ -33,10 +31,7 @@ usb-eth" USE_DEVFS = "1" USE_VT = "0" -IMAGE_LINGUAS = "" -require conf/machine/include/ipaq-common.conf -require conf/machine/include/handheld-common.conf require conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttySA0" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 849cdf8299..8c96ea71b8 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -30,8 +30,6 @@ SERIAL_CONSOLE = "115200 tts/0 vt100" USE_DEVFS_kernel24 = "1" USE_VT = "0" -require conf/machine/include/ipaq-common.conf -require conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf deleted file mode 100644 index d4cd4c1d79..0000000000 --- a/conf/machine/include/handheld-common.conf +++ /dev/null @@ -1,23 +0,0 @@ -HANDHELD_MODULES = "ipv6 \ -ipsec \ -nvrd \ -mip6-mn \ -tun \ -ide-cs ide-disk ide-probe-mod \ -loop \ -vfat ext2 \ -sunrpc nfs \ -btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart hidp \ -pcnet-cs serial-cs airo-cs \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty ircomm-tty \ -input uinput \ -" - -# Configuration bits for "generic handheld" -BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" - -INHERIT += "linux-kernel-base" diff --git a/conf/machine/include/ipaq-common.conf b/conf/machine/include/ipaq-common.conf deleted file mode 100644 index eb696cf9f9..0000000000 --- a/conf/machine/include/ipaq-common.conf +++ /dev/null @@ -1,7 +0,0 @@ -IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" - -BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}" -BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6" - -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - diff --git a/conf/machine/include/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf index 5453fda605..a897f7e174 100644 --- a/conf/machine/include/poodle-2.4.conf +++ b/conf/machine/include/poodle-2.4.conf @@ -1,10 +1,10 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" +PREFERRED_VERSION_ = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \ -kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor \ +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs sharp-sdmmc-support \ hostap-utils prism3-firmware prism3-support" +BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ +kernel-module-usbdcore kernel-module-usbdmonitor" diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf index b5fda186ca..483ead1398 100644 --- a/conf/machine/include/simpad-2.4.conf +++ b/conf/machine/include/simpad-2.4.conf @@ -1,7 +1,7 @@ PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0" # Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" +PREFERRED_VERSION_ = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules orinoco-modules \ -orinoco-modules-cs pcmcia-cs apm hostap-utils wpa-supplicant-nossl" +BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules \ + pcmcia-cs apm hostap-utils wpa-supplicant-nossl" diff --git a/conf/machine/include/smartphone-common.conf b/conf/machine/include/smartphone-common.conf deleted file mode 100644 index 70beba2562..0000000000 --- a/conf/machine/include/smartphone-common.conf +++ /dev/null @@ -1,21 +0,0 @@ -HANDHELD_MODULES = "ipv6 \ -ipsec \ -nvrd \ -mip6-mn \ -tun \ -nls-base nls-cp437 nls-iso8859-1 \ -fat vfat \ -loop \ -rfcomm bnep l2cap sco hci_uart hidp \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty ircomm-tty \ -input uinput \ -" - -# Configuration bits for "generic samrtphone" -BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" - -INHERIT += "linux-kernel-base" diff --git a/conf/machine/include/thinclient-common.conf b/conf/machine/include/thinclient-common.conf deleted file mode 100644 index 16f7702d91..0000000000 --- a/conf/machine/include/thinclient-common.conf +++ /dev/null @@ -1,19 +0,0 @@ -THINCLIENT_MODULES = "ipv6 \ -mip6-mn \ -tun \ -loop \ -vfat \ -sunrpc nfs \ -rfcomm bnep l2cap sco \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty \ -input uinput \ -" - -# Configuration bits for "generic thinclient" -BOOTSTRAP_EXTRA_RDEPENDS += "apm" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${THINCLIENT_MODULES}', d)}" - -INHERIT += "linux-kernel-base" diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf index 068d8c4677..dfa24d499b 100644 --- a/conf/machine/include/tosa-2.4.conf +++ b/conf/machine/include/tosa-2.4.conf @@ -2,14 +2,14 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" +PREFERRED_VERSION_ = "0.13e" BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils keymaps \ kernel-module-acm \ kernel-module-evdev kernel-module-net-fd \ kernel-module-pxa-bi kernel-module-registers \ kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel hostap-modules-cs orinoco-modules-cs \ + kernel hostap-modules-cs \ sharp-sdmmc-support kernel-module-pxa-bi \ kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \ kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage" diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index 5c8fce4398..3fbe43adbc 100644 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -7,9 +7,9 @@ PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x" # Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" +PREFERRED_VERSION_ = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ +BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs sharp-sdmmc-support \ pcmcia-cs apmd apm wireless-tools keymaps irda-utils hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin " diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index ad2120ef6c..0b2bef338a 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -33,7 +33,6 @@ PXA270_MODULES = "nls_cp437 nls_iso8859-1 nls_utf8 af_key" SERIAL_CONSOLE = "115200 ttyS0" -include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index c1f918f662..a4a6af1f71 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -12,5 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" SERIAL_CONSOLE = "115200 ttySA0" -include conf/machine/include/handheld-common.conf include conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 2b9b572024..f5787e6448 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -21,4 +21,3 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword" #udevdir = "/dev" -include conf/thinclient-common.conf diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 49eaf1ef4b..fc8fb718f2 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -14,8 +14,6 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE EXTRA_IMAGEDEPENDS += "zaurus-updater" -include conf/machine/include/handheld-common.conf - ROOT_FLASH_SIZE = "22" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 2777e688bb..13943bae39 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" BOOTSTRAP_EXTRA_RDEPENDS += "kernel" -BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs orinoco-modules-cs \ +BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ kernel-module-pcnet-cs kernel-module-8390" @@ -26,6 +26,5 @@ ROOT_FLASH_SIZE = "16" USE_VT = "0" GPE_EXTRA_INSTALL += "suspend-desktop" -require conf/machine/include/handheld-common.conf require conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index a6b4caf6fd..e7f2aa204a 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -18,8 +18,6 @@ GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_INSTALL += "gaim" ROOT_FLASH_SIZE = "28" -include conf/machine/include/handheld-common.conf - # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/include/tune-xscale.conf -- cgit 1.2.3-korg