]> git.openpandora.org Git - openembedded.git/commitdiff
conf/machine/*.conf: require everything which needs to be included
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:24:09 +0000 (11:24 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:24:09 +0000 (11:24 +0000)
39 files changed:
conf/machine/a780.conf
conf/machine/akita.conf
conf/machine/c7x0.conf
conf/machine/collie.conf
conf/machine/compulab-pxa270.conf
conf/machine/devkitidp-pxa255.conf
conf/machine/dht-walnut.conf
conf/machine/efika.conf
conf/machine/ep93xx.conf
conf/machine/epia.conf
conf/machine/gumstix.conf
conf/machine/h1940.conf
conf/machine/ixp4xx.conf
conf/machine/ixp4xxbe.conf
conf/machine/jornada56x.conf
conf/machine/jornada6xx.conf
conf/machine/jornada7xx.conf
conf/machine/lite5200.conf
conf/machine/logicpd-pxa270.conf
conf/machine/mainstone.conf
conf/machine/mx21ads.conf
conf/machine/mx31ads.conf
conf/machine/netbook-pro.conf
conf/machine/nokia770.conf
conf/machine/nslu2.conf
conf/machine/omap1510inn.conf
conf/machine/omap1610h2.conf
conf/machine/omap1710h3.conf
conf/machine/omap2420h4.conf
conf/machine/omap5912osk.conf
conf/machine/palmld.conf
conf/machine/palmtx.conf
conf/machine/rx3000.conf
conf/machine/smdk2440.conf
conf/machine/spitz.conf
conf/machine/storcenter.conf
conf/machine/tosa.conf
conf/machine/triton.conf
conf/machine/x86-uml.conf

index 1c3ae630252b669626387095531c86306ffa5160..8c3f768e8c42e5dc3d20ab6ad00cf26ba78ed5fd 100644 (file)
@@ -28,6 +28,6 @@ ROOT_FLASH_SIZE = "24"
 EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
 
 # 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
 
 SERIAL_CONSOLE = "115200 ttyS0"
index 2682fb300f0eba009d2864c02131824b9188ec71..fad73c53bf8877d2cc94a3cb590ed2597cc533c2 100644 (file)
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-include conf/machine/include/zaurus-2.6.conf
-include conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-clamshell.conf
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 
index d1afb882e3f56834b8fa6f2bf49ed82ef2428f44..098d0526f0ef36c8792acdc78011070b997da0e4 100644 (file)
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C7x0
 #@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-2.6.conf
-include conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-clamshell.conf
 
 IMAGE_FSTYPES ?= "jffs2"
 
index e7e867e5396c8188dabfd4755fd1ba633d36442a..bfa8ace376fd01192fdf81b85e2f5ee15db37ce5 100644 (file)
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 
 MACHINE_KERNEL_VERSION ?= "2.4"
-include conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
+require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
@@ -18,7 +18,7 @@ IMAGE_LINGUAS = ""
 
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-include conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.conf
 
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
index 78bcf6a6f89bc10029df6daac9b32de232dc94f8..3968bcb6f230e567bd3a501551f82521338917a1 100644 (file)
@@ -9,7 +9,7 @@ GUI_MACHINE_CLASS = "bigscreen"
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttySA0"
index 7d19d0243939eff5a3c650fa34d7b9e208398f9c..029246a8c28139a643bc30e1c49c5785ab86a6ef 100644 (file)
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MACHINE} ${MACHINE}-kernel"
 
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
index ffd114ace42f7f287a1a7b5003fb409723146a50..244a89a6b3cbc1275c059ded22e5913e55c81297 100644 (file)
@@ -11,5 +11,5 @@ TARGET_CPU = "405"
 OLDEST_KERNEL = "2.6.9"
 
 #tune for the 405 cpu
-include conf/machine/include/tune-ppc405.conf
+require conf/machine/include/tune-ppc405.conf
 
index 5b2c87b55c92883650a730000d5917670ec4023c..7c277d3d7391efbac2e28b099dfa79d8c6706181 100644 (file)
@@ -14,4 +14,4 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 USE_VT = "0"
 
 #tune for the MPC5200B cpu
-include conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.conf
index 5e9917ffaf74df7e27d67d6f4548dc43bcec9ee8..09510567105c3afb398d7d5cd15ea46e0b915f29 100644 (file)
@@ -23,7 +23,7 @@ EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
 
 #tune for ep93xx cpus
 #can be used for crunch support later on
-#include conf/machine/include/tune-ep9312.conf
+#require conf/machine/include/tune-ep9312.conf
 
 
-include conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.conf
index 08f12a0ac669d6e87e342a9f305c2e8ad52d33ae..189021747a5ff4d389bd319a7c042f8d8e79bee9 100644 (file)
@@ -9,5 +9,5 @@ GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 PACKAGE_EXTRA_ARCHS = "i386"
 
-include conf/machine/include/tune-c3.conf
+require conf/machine/include/tune-c3.conf
 
index 0fccf05b3b1d41f1e098564e1bc6c3aaab7f45dd..36ed04e67b21f5bf0e35fe1444f652c26b6fb4f9 100644 (file)
@@ -4,7 +4,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-gumstix"
 OLDEST_KERNEL = "2.6.15"
 MODUTILS = "26"
 
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 TARGET_CC_ARCH = "-Os -pipe -Os -march=armv5te -mtune=xscale -Wa,-mcpu=xscale"
 
 PACKAGE_ARCH = "arm"
index e105360b967ceff43b1639e55eae9f22f6387dc0..1a63643868359b3b035bb238ca2b70522925add5 100644 (file)
@@ -21,5 +21,5 @@ SERIAL_CONSOLE = "115200 ttySAC2 vt100"
 USE_VT = "0"
 
 # tune for armv4t
-include conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.conf
 
index 6d7fd11a050fcf8c6e7e34bf313f3def34078983..f955215f3160bc7f3353e378e3cc03f143641b18 100644 (file)
@@ -4,7 +4,7 @@
 
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
-include conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.conf
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
 
index 700f7995fb8f4e05dae7e522b616ccf3b15eac14..f303454cbb6ae99acf5ef1b1b9328f281c88bdc6 100644 (file)
@@ -5,7 +5,7 @@
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
 ARCH_BYTE_SEX = "be"
-include conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.conf
 
 PACKAGE_EXTRA_ARCHS = "armv4eb armv4teb armv5eb armv5teb ixp4xxeb"
 
index d6b3c704547c875fab6f1bdfcbcaec94bb392cff..385af0864a06d04f411d2909a8c475dea79ca1f7 100644 (file)
@@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
-include conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.conf
index aa6631a524df313383d92249848f82c051b8975b..a12328b9935a1f57877e82c3a6b578410b7acbc9 100644 (file)
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "sh3"
 
-include conf/machine/include/tune-sh3.conf
+require conf/machine/include/tune-sh3.conf
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
 PCMCIA_MANAGER = "pcmciautils"
index 811ea6a3e89fbd9ee16534a00a07d142c13596be..74a94bdfcf70feac6ee143e1777cbe1a01645184 100644 (file)
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "arm"
 
-include conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.conf
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
index 3cbc44485d314ef8df7a82f92def689096df5ac3..f47e77371726a9be26c77db7efb458f83c919c06 100644 (file)
@@ -8,4 +8,4 @@ TARGET_PREFIX = "powerpc-603e-linux-gnu-"
 
 IMAGE_FSTYPES = "jffs2 tar.bz2"
 
-include conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.conf
index 8fd58bb5ed87a8497c299b154f04c91b0d752189..dacee830b74c120e3557396bd39847c2f518fffa 100644 (file)
@@ -9,7 +9,7 @@ GUI_MACHINE_CLASS = "smallscreen"
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
index 914022c7bc2f8bc948d2ec481e2e434cda2b0e90..6303a8e96aea7c018952b383ae0d5dee69fbf459 100644 (file)
@@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
index 77961714ebc848c9da7aac29d2556fff659a84f0..160b9fd20762f02af8b0ebe0e19868551c1c0164 100644 (file)
@@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
-include conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.conf
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttymxc0"
index 33456a4b0358d6a2ef211649ff2acbb0a9a1cabc..07976f7dbdf7b9c0434d4968f5ec6508b0534c0b 100644 (file)
@@ -12,7 +12,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
-include conf/machine/include/tune-arm1136jf-s.conf
+require conf/machine/include/tune-arm1136jf-s.conf
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttymxc0"
index f83de2378624fff4641c189b00b8c79dc97483b6..3baf1c2878c5dec63f25b37efd5aa7bb421e2e73 100755 (executable)
@@ -31,4 +31,4 @@ GUI_MACHINE_CLASS = "bigscreen"
 #The initrd needs /initrd present to be able to do pivot_root 
 ROOTFS_POSTPROCESS_COMMAND += " mkdir -p ${IMAGE_ROOTFS}/initrd; "
 
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
index de53f3c3bc9aa22c724326495bc00e72ed296ae7..f7e05e768b62e5e8290a2ba6115985dff8212fa8 100644 (file)
@@ -14,7 +14,7 @@ XSERVER = "xserver-kdrive-omap"
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.conf
 
 #size of the root partition (yes, it is 123 MB)
 ROOT_FLASH_SIZE = "123"
index b00f8a520c73043000e51d173bc5d78e9cb1fe78..304018baea25e2cb898a6c345efe8e1dd5ebd4e2 100644 (file)
@@ -2,4 +2,4 @@
 #@NAME: Linksys NSLU2
 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product
 
-include conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.conf
index 51d5b12f9d2d99161a3979cfa1ea62ce44acc680..0b26436bf53d9acfde3fce5bce557cc822e485c0 100644 (file)
@@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-include conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.conf
index 51d5b12f9d2d99161a3979cfa1ea62ce44acc680..0b26436bf53d9acfde3fce5bce557cc822e485c0 100644 (file)
@@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-include conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.conf
index 51d5b12f9d2d99161a3979cfa1ea62ce44acc680..0b26436bf53d9acfde3fce5bce557cc822e485c0 100644 (file)
@@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-include conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.conf
index 70a3082956cbe4f96303c1cc735a71e16b829b82..a9e1a00cc5263dda0fb889bebb7a9a80ee05fda1 100644 (file)
@@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-include conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.conf
index 6e704a1f4e7ca70e8a3afd63f185bf31379b2ee4..8369789f1b2032d925660a0ed7e860794fa0f710 100644 (file)
@@ -28,7 +28,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \
                           kernel-module-nls-base \
                           kernel-module-vfat"
 
-include conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.conf
 
 # old modules setup - partially need to be added into MACHINE_EXTRA_RRECOMMENDS
 
index bfb2afe69f7a7d6e61bf13881a3c396eaae49885..ba67f473b2df34da6ecc50a9852b73727df8f89d 100644 (file)
@@ -18,6 +18,6 @@ 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
 
 module_autoload_sa1100-rtc = "sa1100-rtc"
index ebfd72de7f615e56cbab6b837c583c49b3d640f6..0a58defa693517d5c375756b25b467f8efe1ef0d 100644 (file)
@@ -18,6 +18,6 @@ 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
 
 module_autoload_sa1100-rtc = "sa1100-rtc"
index c0324c887d8c774acc95cd8f5de2fe8faa2e82e2..40b13667b647342bd03253f55662ef258b1b5928 100644 (file)
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 # Samsung S3C2xxx CPU
-include conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
index 6a8deb9176401ab7f4f6a6068f12944d6f6c4eaf..f2064175fd4ee4bb4821395b9bd1edcd4ceb390e 100644 (file)
@@ -16,4 +16,4 @@ IMAGE_FSTYPES = "tar.gz"
 MACHINE_TASK_PROVIDER = "task-base"
 MACHINE_FEATURES = "kernel26 apm screen"
 
-include conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.conf
index 455ae56677f9dda2709de4c0a85732fb2c69c3ab..84c340f66e73582af5d1a7888332543cb62b788b 100644 (file)
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-include conf/machine/include/zaurus-2.6.conf
-include conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-clamshell.conf
 
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 
index a36684b7583af7128850b60af118b162cc24b209..511d200deb167e367b3cb76b04451931b0531b3d 100644 (file)
@@ -14,4 +14,4 @@ MACHINE_FEATURES= "kernel26 usbhost"
 BOOTSTRAP_EXTRA_RDEPENDS = "mdadm"
 PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter"
 
-include conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.conf
index e893cf8ed060c54ba5aaa011b9721bda9ff34be6..e9ab7dd34a3d4e03c5c1e6ed0f0d9ebbd6d4f78d 100644 (file)
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-6000
 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
 
-include conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.conf
 
 # wlan-ng Modules
 MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb"
index 685dcd91fbaca24c40d8a7123e1684cb92e0aada..d79c23e4ac82ac2501d5c4f5c44f9ca33f535562 100644 (file)
@@ -14,5 +14,5 @@ SERIAL_CONSOLE = "38400 ttyS0"
 KERNEL_CONSOLE = "ttys0,38400"
 USE_VT = "0"
 
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
 
index 34a6b89ab5dac629504bf12f37b56ac58854c2d0..e90333836ecc5c76f892e36d8552067004f8252a 100644 (file)
@@ -2,7 +2,7 @@
 #@NAME: X86 User Mode Linux
 #@DESCRIPTION: Machine configuration for a User Mode Linux running on an x86 compatible PC
 
-include conf/machine/x86.conf
+require conf/machine/x86.conf
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-uml"