diff options
39 files changed, 44 insertions, 44 deletions
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf index 1c3ae63025..8c3f768e8c 100644 --- a/conf/machine/a780.conf +++ b/conf/machine/a780.conf @@ -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" diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 2682fb300f..fad73c53bf 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -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" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index d1afb882e3..098d0526f0 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -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" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index e7e867e539..bfa8ace376 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -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 diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index 78bcf6a6f8..3968bcb6f2 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -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" diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf index 7d19d02439..029246a8c2 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -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" diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf index ffd114ace4..244a89a6b3 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -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 diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf index 5b2c87b55c..7c277d3d73 100644 --- a/conf/machine/efika.conf +++ b/conf/machine/efika.conf @@ -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 diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 5e9917ffaf..0951056710 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -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 diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 08f12a0ac6..189021747a 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -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 diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf index 0fccf05b3b..36ed04e67b 100644 --- a/conf/machine/gumstix.conf +++ b/conf/machine/gumstix.conf @@ -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" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index e105360b96..1a63643868 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -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 diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf index 6d7fd11a05..f955215f31 100644 --- a/conf/machine/ixp4xx.conf +++ b/conf/machine/ixp4xx.conf @@ -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}" diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf index 700f7995fb..f303454cbb 100644 --- a/conf/machine/ixp4xxbe.conf +++ b/conf/machine/ixp4xxbe.conf @@ -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" diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index d6b3c70454..385af0864a 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -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 diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index aa6631a524..a12328b993 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -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" diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index 811ea6a3e8..74a94bdfcf 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -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" diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 3cbc44485d..f47e773717 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -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 diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index 8fd58bb5ed..dacee830b7 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -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" diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index 914022c7bc..6303a8e96a 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -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" diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf index 77961714eb..160b9fd207 100644 --- a/conf/machine/mx21ads.conf +++ b/conf/machine/mx21ads.conf @@ -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" diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf index 33456a4b03..07976f7dbd 100644 --- a/conf/machine/mx31ads.conf +++ b/conf/machine/mx31ads.conf @@ -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" diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index f83de23786..3baf1c2878 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -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 diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index de53f3c3bc..f7e05e768b 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -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" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index b00f8a520c..304018baea 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -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 diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index 51d5b12f9d..0b26436bf5 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -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 diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index 51d5b12f9d..0b26436bf5 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -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 diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 51d5b12f9d..0b26436bf5 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -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 diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index 70a3082956..a9e1a00cc5 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -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 diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 6e704a1f4e..8369789f1b 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -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 diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index bfb2afe69f..ba67f473b2 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -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" diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf index ebfd72de7f..0a58defa69 100644 --- a/conf/machine/palmtx.conf +++ b/conf/machine/palmtx.conf @@ -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" diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf index c0324c887d..40b13667b6 100644 --- a/conf/machine/rx3000.conf +++ b/conf/machine/rx3000.conf @@ -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" diff --git a/conf/machine/smdk2440.conf b/conf/machine/smdk2440.conf index 6a8deb9176..f2064175fd 100644 --- a/conf/machine/smdk2440.conf +++ b/conf/machine/smdk2440.conf @@ -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 diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 455ae56677..84c340f66e 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -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}" diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index a36684b758..511d200deb 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -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 diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index e893cf8ed0..e9ab7dd34a 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -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" diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index 685dcd91fb..d79c23e4ac 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -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 diff --git a/conf/machine/x86-uml.conf b/conf/machine/x86-uml.conf index 34a6b89ab5..e90333836e 100644 --- a/conf/machine/x86-uml.conf +++ b/conf/machine/x86-uml.conf @@ -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" |