[oe-commits] org.oe.dev pocketpc-based machines: Consistently use "require" instead of "include" in confs.

[pfalcon commit]

pocketpc-based machines: Consistently use "require" instead of "include" in confs.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 8c180cdd04353fb978ee80dd7f8d89c386348b4a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8c180cdd04353fb978ee80dd7f8d89c386348b4a
Files:
1
conf/machine/h1910.conf
conf/machine/h3600.conf
conf/machine/h3900.conf
conf/machine/h5xxx.conf
conf/machine/h6300.conf
conf/machine/htcuniversal.conf
conf/machine/hx2000.conf
conf/machine/hx4700.conf
Diffs:

#
# mt diff -r66e89031d52c1b27eb48a89e6155eb9ed5dc352e -r8c180cdd04353fb978ee80dd7f8d89c386348b4a
#
# 
# 
# patch "conf/machine/h1910.conf"
#  from [556625e2ce6c47f455a4e05372c165a3f6ed0b1f]
#    to [26d6826a9da9fc18d721d51b23e46a8097e35432]
# 
# patch "conf/machine/h3600.conf"
#  from [b37b8fd1dcbc5b4ed5732be6cc84d57ce6f17f22]
#    to [8c8bcdebc739eb793facbb48e95469c010f1cff7]
# 
# patch "conf/machine/h3900.conf"
#  from [2fa9aff15013fabcd186e071e0623ee470b0c7f3]
#    to [cb64479a67f3ece19d679fce059014e11cd3e27e]
# 
# patch "conf/machine/h5xxx.conf"
#  from [b9ddbf80da2d5f2d566aaa81efa49f067e1e17c0]
#    to [d2034130e84587236bac58ecf9164ee0e2bba9eb]
# 
# patch "conf/machine/h6300.conf"
#  from [aa42f30411b2901f40e180273307108a1866e1f6]
#    to [5da7df8fa96466accbe78b8f269b00ba7056f6f2]
# 
# patch "conf/machine/htcuniversal.conf"
#  from [9767373802e55ee1564797329f5f06a1596b2235]
#    to [a64357273702edc26b97f99adf7557a8aa384864]
# 
# patch "conf/machine/hx2000.conf"
#  from [5492792b36cf42146a470422cc1735ca3ea18399]
#    to [63c3d8966c7ea3923a4cf881a49585c77f75041f]
# 
# patch "conf/machine/hx4700.conf"
#  from [035796c9c60efea3595d4d5217ff3549cb891726]
#    to [3a347fadefc4ae96f3dbe78262da3c86a5453c68]
# 
============================================================
--- conf/machine/h1910.conf	556625e2ce6c47f455a4e05372c165a3f6ed0b1f
+++ conf/machine/h1910.conf	26d6826a9da9fc18d721d51b23e46a8097e35432
@@ -8,7 +8,7 @@ IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e 
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
============================================================
--- conf/machine/h3600.conf	b37b8fd1dcbc5b4ed5732be6cc84d57ce6f17f22
+++ conf/machine/h3600.conf	8c8bcdebc739eb793facbb48e95469c010f1cff7
@@ -35,8 +35,8 @@ IMAGE_LINGUAS = ""
 
 IMAGE_LINGUAS = ""
 
-include conf/machine/include/ipaq-common.conf
-include conf/machine/include/handheld-common.conf
-include conf/machine/include/tune-strongarm.conf
+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	2fa9aff15013fabcd186e071e0623ee470b0c7f3
+++ conf/machine/h3900.conf	cb64479a67f3ece19d679fce059014e11cd3e27e
@@ -30,10 +30,10 @@ USE_VT = "0"
 USE_DEVFS_kernel24 = "1"
 USE_VT = "0"
 
-include conf/machine/include/ipaq-common.conf
-include conf/machine/include/handheld-common.conf
+require conf/machine/include/ipaq-common.conf
+require conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "smallscreen"
 
 # not using tune-xscale so as to retain backwards compatibility
+require conf/machine/tune-xscale.conf
-include conf/machine/tune-xscale.conf
============================================================
--- conf/machine/h5xxx.conf	b9ddbf80da2d5f2d566aaa81efa49f067e1e17c0
+++ conf/machine/h5xxx.conf	d2034130e84587236bac58ecf9164ee0e2bba9eb
@@ -28,4 +28,4 @@ GUI_MACHINE_CLASS = "smallscreen"
 
 GUI_MACHINE_CLASS = "smallscreen"
 
+require conf/machine/include/tune-xscale.conf
-include conf/machine/include/tune-xscale.conf
============================================================
--- conf/machine/h6300.conf	aa42f30411b2901f40e180273307108a1866e1f6
+++ conf/machine/h6300.conf	5da7df8fa96466accbe78b8f269b00ba7056f6f2
@@ -41,4 +41,4 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-e
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
+require conf/machine/include/tune-arm9tdmi.conf
-include conf/machine/include/tune-arm9tdmi.conf
============================================================
--- conf/machine/htcuniversal.conf	9767373802e55ee1564797329f5f06a1596b2235
+++ conf/machine/htcuniversal.conf	a64357273702edc26b97f99adf7557a8aa384864
@@ -30,10 +30,10 @@ GUI_MACHINE_CLASS = "bigscreen"
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#include conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.conf
 
 module_autoload_acx = "acx"
 module_autoload_htcuniversal_acx = "htcuniversal_acx"
============================================================
--- conf/machine/hx2000.conf	5492792b36cf42146a470422cc1735ca3ea18399
+++ conf/machine/hx2000.conf	63c3d8966c7ea3923a4cf881a49585c77f75041f
@@ -33,10 +33,10 @@ GUI_MACHINE_CLASS = "smallscreen"
 GUI_MACHINE_CLASS = "smallscreen"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#include conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.conf
 
 module_autoload_evdev = "evdev"
 module_autoload_pcmcia = "pcmcia"
============================================================
--- conf/machine/hx4700.conf	035796c9c60efea3595d4d5217ff3549cb891726
+++ conf/machine/hx4700.conf	3a347fadefc4ae96f3dbe78262da3c86a5453c68
@@ -39,10 +39,10 @@ GUI_MACHINE_CLASS = "bigscreen"
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#include conf/machine/include/tune-iwmmxt.conf
+#require conf/machine/include/tune-iwmmxt.conf
 
 
 #define which modules to load at boot