]> git.openpandora.org Git - openembedded.git/commitdiff
pocketpc-based machines: Consistently use "require" instead of "include" in confs.
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 13:47:55 +0000 (13:47 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 13:47:55 +0000 (13:47 +0000)
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

index 39ab571d1ef8b7dda5901a8f2e810365fded3a4f..2f21b4ee91726118f3585fce9ea1d987dd0e6af3 100644 (file)
@@ -8,7 +8,7 @@ OVERRIDES =. "${KERNEL}:"
 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"
 
index 5c7440403bf24f569c01c44d8b7843d2fabf36fe..f14b9b24a55f3efe43295960708c82b6c20932b2 100644 (file)
@@ -35,8 +35,8 @@ USE_VT = "0"
 
 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"
index 485bb88892562e07aa92b7ab8264fc129e587d45..849cdf8299bc15e594adb8b2e3fd9f40eb4e7eab 100644 (file)
@@ -30,10 +30,10 @@ SERIAL_CONSOLE = "115200 tts/0 vt100"
 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
-include conf/machine/tune-xscale.conf
+require conf/machine/tune-xscale.conf
index 6e9e9511323bd9256131f2cd97b06d7e4f697b2c..a7208209ebad13889951230c18738cb230d072dc 100644 (file)
@@ -28,4 +28,4 @@ USE_VT = "0"
 
 GUI_MACHINE_CLASS = "smallscreen"
 
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
index 42eabeb588b18807f54ec0a04f3267fa5fc23bdd..18d08ebfcca0a0d9a814f482837918aaa8993d62 100644 (file)
@@ -41,4 +41,4 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
-include conf/machine/include/tune-arm9tdmi.conf
+require conf/machine/include/tune-arm9tdmi.conf
index d7272c9ec7ede0200ae8f469b8c022a0cd8b88f5..58fb5c71668318c804ca727d332dea989b659281 100644 (file)
@@ -30,10 +30,10 @@ MACHINE_EXTRA__RRECOMMENDS = "  kernel-module-nls_cp437 \
 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"
index 0a88932e3ec571c9a535397b8454e7a5f1ba56fd..b0c962c1d04c89df2e1240ba358a6de2a05036a6 100644 (file)
@@ -33,10 +33,10 @@ SERIAL_CONSOLE = "115200 ttyS0"
 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"
index caaead2d934cec24f97ce3149b2e313fe352b613..fad812759bacc7d9a5b631c0321ffcc3cd1eab7c 100644 (file)
@@ -39,10 +39,10 @@ SERIAL_CONSOLE = "115200 ttyS0"
 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