summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-24 08:50:53 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2012-02-24 20:51:38 (GMT)
commitf89c24addde4f5d4a634a7be6a33bee91c1f1bc4 (patch)
tree15bc43203df5ea4d17a42521ec1442d24a3c0829
parent1ca68394faf33416f2aabee27323da7510ad6609 (diff)
downloadmeta-intel-f89c24addde4f5d4a634a7be6a33bee91c1f1bc4.tar.gz
meta-intel: replace "include" with "require"
We want a failure to occur if the files specified in these statements can't be found (e.g. when there is a misconfiguration), so use require instead of include. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-cedartrail/conf/machine/cedartrail.conf2
-rw-r--r--meta-crownbay/conf/machine/crownbay-noemgd.conf4
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf4
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf4
-rw-r--r--meta-fishriver/conf/machine/fishriver.conf2
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf4
-rw-r--r--meta-fri2/conf/machine/fri2.conf4
-rw-r--r--meta-n450/conf/machine/n450.conf4
-rw-r--r--meta-romley/conf/machine/romley.conf2
-rw-r--r--meta-sys940x/conf/machine/sys940x-noemgd.conf4
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf4
11 files changed, 19 insertions, 19 deletions
diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf
index ec84347..3bd5cf8 100644
--- a/meta-cedartrail/conf/machine/cedartrail.conf
+++ b/meta-cedartrail/conf/machine/cedartrail.conf
@@ -4,7 +4,7 @@
4#@DESCRIPTION: Machine configuration for Cedartrail systems 4#@DESCRIPTION: Machine configuration for Cedartrail systems
5# i.e. Cedarview processor + Tiger Point Chipset 5# i.e. Cedarview processor + Tiger Point Chipset
6 6
7include conf/machine/include/tune-atom.inc 7require conf/machine/include/tune-atom.inc
8require conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9 9
10XSERVER ?= "${XSERVER_IA32_BASE} \ 10XSERVER ?= "${XSERVER_IA32_BASE} \
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index 80fc2a6..2c80bd8 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -4,8 +4,8 @@
4#@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits 4#@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits
5# i.e. E660 + EG20T 5# i.e. E660 + EG20T
6 6
7include conf/machine/include/tune-atom.inc 7require conf/machine/include/tune-atom.inc
8include conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9 9
10XSERVER ?= "${XSERVER_IA32_BASE} \ 10XSERVER ?= "${XSERVER_IA32_BASE} \
11 ${XSERVER_IA32_EXT} \ 11 ${XSERVER_IA32_EXT} \
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 15bfd52..2c1ef3d 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -4,8 +4,8 @@
4#@DESCRIPTION: Machine configuration for Crown Bay systems 4#@DESCRIPTION: Machine configuration for Crown Bay systems
5# i.e. E660 + EG20T 5# i.e. E660 + EG20T
6 6
7include conf/machine/include/tune-atom.inc 7require conf/machine/include/tune-atom.inc
8include conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9 9
10XSERVER ?= "${XSERVER_IA32_BASE} \ 10XSERVER ?= "${XSERVER_IA32_BASE} \
11 ${XSERVER_IA32_EXT} \ 11 ${XSERVER_IA32_EXT} \
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index cf43d4f..78020ba 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -4,8 +4,8 @@
4#@DESCRIPTION: Machine configuration for eMenlow based systems, like the 4#@DESCRIPTION: Machine configuration for eMenlow based systems, like the
5# Webs-2120 box. 5# Webs-2120 box.
6 6
7include conf/machine/include/tune-atom.inc 7require conf/machine/include/tune-atom.inc
8include conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9 9
10PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo" 10PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo"
11PREFERRED_PROVIDER_drm = "libdrm-poulsbo" 11PREFERRED_PROVIDER_drm = "libdrm-poulsbo"
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index b43282e..aa066db 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -4,7 +4,7 @@
4#@DESCRIPTION: Machine configuration for Fish River Island systems 4#@DESCRIPTION: Machine configuration for Fish River Island systems
5# i.e. Z530/E660 + EG20T 5# i.e. Z530/E660 + EG20T
6 6
7include conf/machine/include/tune-atom.inc 7require conf/machine/include/tune-atom.inc
8require conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9 9
10XSERVER ?= "${XSERVER_IA32_BASE} \ 10XSERVER ?= "${XSERVER_IA32_BASE} \
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 911a449..a0eb8a0 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -4,8 +4,8 @@
4#@DESCRIPTION: Machine configuration for Fish River Island II systems 4#@DESCRIPTION: Machine configuration for Fish River Island II systems
5# i.e. E660 + EG20T 5# i.e. E660 + EG20T
6 6
7include conf/machine/include/tune-atom.inc 7require conf/machine/include/tune-atom.inc
8include conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9 9
10MACHINE_FEATURES += "wifi 3g pcbios efi" 10MACHINE_FEATURES += "wifi 3g pcbios efi"
11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" 11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index c69aa40..3947736 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -4,8 +4,8 @@
4#@DESCRIPTION: Machine configuration for Fish River Island II systems 4#@DESCRIPTION: Machine configuration for Fish River Island II systems
5# i.e. E660 + EG20T 5# i.e. E660 + EG20T
6 6
7include conf/machine/include/tune-atom.inc 7require conf/machine/include/tune-atom.inc
8include conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9 9
10MACHINE_FEATURES += "wifi 3g pcbios efi" 10MACHINE_FEATURES += "wifi 3g pcbios efi"
11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" 11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
diff --git a/meta-n450/conf/machine/n450.conf b/meta-n450/conf/machine/n450.conf
index 6ffdce9..dac63ed 100644
--- a/meta-n450/conf/machine/n450.conf
+++ b/meta-n450/conf/machine/n450.conf
@@ -3,8 +3,8 @@
3 3
4#@DESCRIPTION: Machine configuration for Intel 1-N450 based systems 4#@DESCRIPTION: Machine configuration for Intel 1-N450 based systems
5 5
6include conf/machine/include/tune-atom.inc 6require conf/machine/include/tune-atom.inc
7include conf/machine/include/ia32-base.inc 7require conf/machine/include/ia32-base.inc
8 8
9XSERVER ?= "${XSERVER_IA32_BASE} \ 9XSERVER ?= "${XSERVER_IA32_BASE} \
10 ${XSERVER_IA32_EXT} \ 10 ${XSERVER_IA32_EXT} \
diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf
index 7b6014c..aa334c0 100644
--- a/meta-romley/conf/machine/romley.conf
+++ b/meta-romley/conf/machine/romley.conf
@@ -5,7 +5,7 @@
5# i.e. Sandy Bridge + Patsburg Chipset 5# i.e. Sandy Bridge + Patsburg Chipset
6 6
7require conf/machine/include/tune-x86_64.inc 7require conf/machine/include/tune-x86_64.inc
8include conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9 9
10XSERVER ?= "${XSERVER_IA32_BASE} \ 10XSERVER ?= "${XSERVER_IA32_BASE} \
11 ${XSERVER_IA32_EXT} \ 11 ${XSERVER_IA32_EXT} \
diff --git a/meta-sys940x/conf/machine/sys940x-noemgd.conf b/meta-sys940x/conf/machine/sys940x-noemgd.conf
index 8a1c20f..537e419 100644
--- a/meta-sys940x/conf/machine/sys940x-noemgd.conf
+++ b/meta-sys940x/conf/machine/sys940x-noemgd.conf
@@ -4,8 +4,8 @@
4#@DESCRIPTION: Machine configuration for Inforce SYS940X systems 4#@DESCRIPTION: Machine configuration for Inforce SYS940X systems
5# i.e. E660 + EG20T 5# i.e. E660 + EG20T
6 6
7include conf/machine/include/tune-atom.inc 7require conf/machine/include/tune-atom.inc
8include conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9 9
10# Add "pcbios" if you have a non-efi version of the firmware 10# Add "pcbios" if you have a non-efi version of the firmware
11MACHINE_FEATURES += "efi pcbios" 11MACHINE_FEATURES += "efi pcbios"
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index ceb6e0f..2315564 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -4,8 +4,8 @@
4#@DESCRIPTION: Machine configuration for Inforce SYS940x systems 4#@DESCRIPTION: Machine configuration for Inforce SYS940x systems
5# i.e. E660 + EG20T 5# i.e. E660 + EG20T
6 6
7include conf/machine/include/tune-atom.inc 7require conf/machine/include/tune-atom.inc
8include conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9 9
10# Add "pcbios" if you have a non-efi version of the firmware 10# Add "pcbios" if you have a non-efi version of the firmware
11MACHINE_FEATURES += "efi pcbios" 11MACHINE_FEATURES += "efi pcbios"