[oe-commits] org.oe.dev conf/machine: remove <foo>-common stuff

koen commit openembedded-commits at lists.openembedded.org
Mon Oct 16 14:06:21 UTC 2006 

conf/machine: remove <foo>-common stuff

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 514b31d89c294ce11810ee76a2138d455216409b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=514b31d89c294ce11810ee76a2138d455216409b
Files:
1
conf/machine/include/handheld-common.conf
conf/machine/include/ipaq-common.conf
conf/machine/include/smartphone-common.conf
conf/machine/include/thinclient-common.conf
conf/machine/blueangel.conf
conf/machine/collie.conf
conf/machine/guinness.conf
conf/machine/h3600.conf
conf/machine/h3900.conf
conf/machine/include/poodle-2.4.conf
conf/machine/include/simpad-2.4.conf
conf/machine/include/tosa-2.4.conf
conf/machine/include/zaurus-clamshell-2.4.conf
conf/machine/ipaq-pxa270.conf
conf/machine/jornada56x.conf
conf/machine/netvista.conf
conf/machine/poodle.conf
conf/machine/simpad.conf
conf/machine/tosa.conf
Diffs:

#
# mt diff -rd278d85d5e8ebba0521212ff089ee6176a08a681 -r514b31d89c294ce11810ee76a2138d455216409b
#
# 
# 
# delete "conf/machine/include/handheld-common.conf"
# 
# delete "conf/machine/include/ipaq-common.conf"
# 
# delete "conf/machine/include/smartphone-common.conf"
# 
# delete "conf/machine/include/thinclient-common.conf"
# 
# patch "conf/machine/blueangel.conf"
#  from [0784cbfd13534689d54b52264a1925cef0d46c4a]
#    to [b40a0036dde4ee127c5bb43d54b0af254dbfca56]
# 
# patch "conf/machine/collie.conf"
#  from [3a73a3790075581ed0c56d6cb3eaadf3b18f914d]
#    to [2d477ae4e4a70d880bbc9531c98cdf9e59970417]
# 
# patch "conf/machine/guinness.conf"
#  from [d50ccd78f78bc695a2b86604a2c59ef3ad0af658]
#    to [c621ed898bc09cf24b6df3fb1a11da4e28380647]
# 
# patch "conf/machine/h3600.conf"
#  from [8c8bcdebc739eb793facbb48e95469c010f1cff7]
#    to [b2ce722dba78d204204af60c0bd867019c24d05a]
# 
# patch "conf/machine/h3900.conf"
#  from [cb64479a67f3ece19d679fce059014e11cd3e27e]
#    to [72efa9b466b05ce3245e1446319f570483986f88]
# 
# patch "conf/machine/include/poodle-2.4.conf"
#  from [5801555a072290161099434075946be7440e0ff1]
#    to [679b79617dd8cb1a1f6304219d8c52e690dcffc3]
# 
# patch "conf/machine/include/simpad-2.4.conf"
#  from [cf277febbd35608dc7ba0d88155d8774bfc2c9df]
#    to [3b0a759e9804fc78e6b4aa495f22b1be400c13e5]
# 
# patch "conf/machine/include/tosa-2.4.conf"
#  from [7e5e70ed3c697b77e6474180c5e509c9246dafc6]
#    to [541184ab7a7dae116c76575245069717a376f9b1]
# 
# patch "conf/machine/include/zaurus-clamshell-2.4.conf"
#  from [0008b4b64953f86b593b91babc208366f5f4fec6]
#    to [19af542cfc4791a67b2b6706ce85e22090335f16]
# 
# patch "conf/machine/ipaq-pxa270.conf"
#  from [6b2a3eaf6d5eedae1c5f058a8bc34fa795002699]
#    to [2b765f0fc2eb9c82d463236ce565a6097676f5b4]
# 
# patch "conf/machine/jornada56x.conf"
#  from [6712640fbff454b1a69e63d20770e8257f5e5dd9]
#    to [bbe77d751564068bc1d82ca3c412cec104239573]
# 
# patch "conf/machine/netvista.conf"
#  from [94a0990ddb7103bb03bd5e6eec79513414cd0df0]
#    to [f79ef3ffb420f380b7e9fb4f40d2897e7cc48686]
# 
# patch "conf/machine/poodle.conf"
#  from [bd88c3551372f8f33c6c4ff485218ce261982786]
#    to [e78d8e315ca2605548b18768ca836c210df048f9]
# 
# patch "conf/machine/simpad.conf"
#  from [6cc9817a7e653ef18b98eb33f3c895f7cf3f59a1]
#    to [0de209ed1cc80927435cbf4a744e4170c5abeb15]
# 
# patch "conf/machine/tosa.conf"
#  from [166c767f42ca0c881676aebf4507e4fa28571c4a]
#    to [966da8541b7b0142ec47b5243079b7685749ebef]
# 
============================================================
--- conf/machine/blueangel.conf	0784cbfd13534689d54b52264a1925cef0d46c4a
+++ conf/machine/blueangel.conf	b40a0036dde4ee127c5bb43d54b0af254dbfca56
@@ -36,8 +36,6 @@ USE_VT = "0"
 
 USE_VT = "0"
 
-include conf/machine/include/handheld-common.conf
-
 GUI_MACHINE_CLASS = "smallscreen"
 ROOT_FLASH_SIZE = "32"
 
============================================================
--- conf/machine/collie.conf	3a73a3790075581ed0c56d6cb3eaadf3b18f914d
+++ conf/machine/collie.conf	2d477ae4e4a70d880bbc9531c98cdf9e59970417
@@ -5,8 +5,9 @@ PREFERRED_PROVIDER_virtual/kernel ?= "co
 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 @@ IMAGE_LINGUAS = ""
 
 IMAGE_LINGUAS = ""
 
-include conf/machine/include/handheld-common.conf
 include conf/machine/include/tune-strongarm.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/guinness.conf	d50ccd78f78bc695a2b86604a2c59ef3ad0af658
+++ conf/machine/guinness.conf	c621ed898bc09cf24b6df3fb1a11da4e28380647
@@ -19,5 +19,5 @@ MACHINE_FEATURES = "kernel26 usbhost ext
 
 MACHINE_FEATURES = "kernel26 usbhost ext2 pci"
 
-require conf/machine/include/tune-athlonmp.conf
+#require conf/machine/include/tune-athlonmp.conf
 
============================================================
--- conf/machine/h3600.conf	8c8bcdebc739eb793facbb48e95469c010f1cff7
+++ conf/machine/h3600.conf	b2ce722dba78d204204af60c0bd867019c24d05a
@@ -15,9 +15,7 @@ h3600-micro \
 H3600_MODULES = "\
 h3600-asic \
 h3600-micro \
-h3600-microkbd h3600-stowaway \
 hwtimer \
-l3-backpaq \
 nvrd \
 sa1100-cs \
 sa1100-ir \
@@ -33,10 +31,7 @@ USE_VT = "0"
 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"
============================================================
--- conf/machine/h3900.conf	cb64479a67f3ece19d679fce059014e11cd3e27e
+++ conf/machine/h3900.conf	72efa9b466b05ce3245e1446319f570483986f88
@@ -30,8 +30,6 @@ USE_VT = "0"
 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"
 
============================================================
--- conf/machine/include/poodle-2.4.conf	5801555a072290161099434075946be7440e0ff1
+++ conf/machine/include/poodle-2.4.conf	679b79617dd8cb1a1f6304219d8c52e690dcffc3
@@ -1,10 +1,10 @@ PREFERRED_PROVIDER_virtual/kernel = "ope
 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" 
 
============================================================
--- conf/machine/include/simpad-2.4.conf	cf277febbd35608dc7ba0d88155d8774bfc2c9df
+++ conf/machine/include/simpad-2.4.conf	3b0a759e9804fc78e6b4aa495f22b1be400c13e5
@@ -1,7 +1,7 @@ PREFERRED_PROVIDER_virtual/kernel = "ope
 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  \
+ pcmcia-cs apm hostap-utils wpa-supplicant-nossl"
-BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules orinoco-modules \
-orinoco-modules-cs pcmcia-cs apm hostap-utils wpa-supplicant-nossl"
============================================================
--- conf/machine/include/tosa-2.4.conf	7e5e70ed3c697b77e6474180c5e509c9246dafc6
+++ conf/machine/include/tosa-2.4.conf	541184ab7a7dae116c76575245069717a376f9b1
@@ -1,15 +1,15 @@ PREFERRED_PROVIDER_virtual/kernel = "ope
 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"
============================================================
--- conf/machine/include/zaurus-clamshell-2.4.conf	0008b4b64953f86b593b91babc208366f5f4fec6
+++ conf/machine/include/zaurus-clamshell-2.4.conf	19af542cfc4791a67b2b6706ce85e22090335f16
@@ -7,9 +7,9 @@ PREFERRED_PROVIDERS_append_borzoi = " vi
 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 "
 
============================================================
--- conf/machine/ipaq-pxa270.conf	6b2a3eaf6d5eedae1c5f058a8bc34fa795002699
+++ conf/machine/ipaq-pxa270.conf	2b765f0fc2eb9c82d463236ce565a6097676f5b4
@@ -33,7 +33,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
 
============================================================
--- conf/machine/jornada56x.conf	6712640fbff454b1a69e63d20770e8257f5e5dd9
+++ conf/machine/jornada56x.conf	bbe77d751564068bc1d82ca3c412cec104239573
@@ -12,5 +12,4 @@ SERIAL_CONSOLE = "115200 ttySA0"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
-include conf/machine/include/handheld-common.conf
 include conf/machine/include/tune-strongarm.conf
============================================================
--- conf/machine/netvista.conf	94a0990ddb7103bb03bd5e6eec79513414cd0df0
+++ conf/machine/netvista.conf	f79ef3ffb420f380b7e9fb4f40d2897e7cc48686
@@ -21,4 +21,3 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-
 #udevdir = "/dev"
 
 
-include conf/thinclient-common.conf
============================================================
--- conf/machine/poodle.conf	bd88c3551372f8f33c6c4ff485218ce261982786
+++ conf/machine/poodle.conf	e78d8e315ca2605548b18768ca836c210df048f9
@@ -14,8 +14,6 @@ EXTRA_IMAGEDEPENDS += "zaurus-updater"
 
 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.
============================================================
--- conf/machine/simpad.conf	6cc9817a7e653ef18b98eb33f3c895f7cf3f59a1
+++ conf/machine/simpad.conf	0de209ed1cc80927435cbf4a744e4170c5abeb15
@@ -9,7 +9,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel"
 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 @@ GPE_EXTRA_INSTALL += "suspend-desktop"
 USE_VT = "0"
 GPE_EXTRA_INSTALL += "suspend-desktop"
 
-require conf/machine/include/handheld-common.conf
 require conf/machine/include/tune-strongarm.conf
 
============================================================
--- conf/machine/tosa.conf	166c767f42ca0c881676aebf4507e4fa28571c4a
+++ conf/machine/tosa.conf	966da8541b7b0142ec47b5243079b7685749ebef
@@ -18,8 +18,6 @@ ROOT_FLASH_SIZE = "28"
 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

More information about the Openembedded-commits mailing list