summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/akita.conf4
-rw-r--r--meta/conf/machine/bootcdx86.conf2
-rw-r--r--meta/conf/machine/c7x0.conf4
-rw-r--r--meta/conf/machine/cmx270.conf2
-rw-r--r--meta/conf/machine/fic-gta01.conf2
-rw-r--r--meta/conf/machine/hx2000.conf4
-rw-r--r--meta/conf/machine/include/ixp4xx.conf158
-rw-r--r--meta/conf/machine/include/poodle-2.6.conf1
-rw-r--r--meta/conf/machine/include/poodle-2.6.inc1
-rw-r--r--meta/conf/machine/include/qemu.inc (renamed from meta/conf/machine/include/qemu.conf)0
-rw-r--r--meta/conf/machine/include/tosa-2.6.inc (renamed from meta/conf/machine/include/tosa-2.6.conf)2
-rw-r--r--meta/conf/machine/include/tune-arm920t.inc (renamed from meta/conf/machine/include/tune-arm920t.conf)0
-rw-r--r--meta/conf/machine/include/tune-arm926ejs.inc (renamed from meta/conf/machine/include/tune-arm926ejs.conf)0
-rw-r--r--meta/conf/machine/include/tune-arm9tdmi.inc (renamed from meta/conf/machine/include/tune-arm9tdmi.conf)0
-rw-r--r--meta/conf/machine/include/tune-c3.inc (renamed from meta/conf/machine/include/tune-c3.conf)0
-rw-r--r--meta/conf/machine/include/tune-ep9312.inc (renamed from meta/conf/machine/include/tune-ep9312.conf)0
-rw-r--r--meta/conf/machine/include/tune-iwmmxt.inc (renamed from meta/conf/machine/include/tune-iwmmxt.conf)0
-rw-r--r--meta/conf/machine/include/tune-ppc603e.inc (renamed from meta/conf/machine/include/tune-ppc603e.conf)0
-rw-r--r--meta/conf/machine/include/tune-ppce500.inc (renamed from meta/conf/machine/include/tune-ppce500.conf)0
-rw-r--r--meta/conf/machine/include/tune-sh3.inc (renamed from meta/conf/machine/include/tune-sh3.conf)0
-rw-r--r--meta/conf/machine/include/tune-sh4.inc (renamed from meta/conf/machine/include/tune-sh4.conf)0
-rw-r--r--meta/conf/machine/include/tune-strongarm.inc (renamed from meta/conf/machine/include/tune-strongarm.conf)0
-rw-r--r--meta/conf/machine/include/tune-supersparc.inc (renamed from meta/conf/machine/include/tune-supersparc.conf)0
-rw-r--r--meta/conf/machine/include/tune-xscale.inc (renamed from meta/conf/machine/include/tune-xscale.conf)0
-rw-r--r--meta/conf/machine/include/zaurus-2.6.inc (renamed from meta/conf/machine/include/zaurus-2.6.conf)2
-rw-r--r--meta/conf/machine/include/zaurus-clamshell.inc (renamed from meta/conf/machine/include/zaurus-clamshell.conf)3
-rw-r--r--meta/conf/machine/nokia770.conf2
-rw-r--r--meta/conf/machine/nokia800.conf2
-rw-r--r--meta/conf/machine/qemuarm.conf4
-rw-r--r--meta/conf/machine/qemux86.conf2
-rw-r--r--meta/conf/machine/spitz.conf4
31 files changed, 21 insertions, 178 deletions
diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf
index 27695be4bb..b48b5a3e13 100644
--- a/meta/conf/machine/akita.conf
+++ b/meta/conf/machine/akita.conf
@@ -2,8 +2,8 @@
2#@NAME: Sharp Zaurus SL-C1000 2#@NAME: Sharp Zaurus SL-C1000
3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device 3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
4 4
5include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.inc
6include conf/machine/include/zaurus-2.6.conf 6include conf/machine/include/zaurus-2.6.inc
7 7
8PACKAGE_EXTRA_ARCHS += "iwmmxt" 8PACKAGE_EXTRA_ARCHS += "iwmmxt"
9IMAGE_FSTYPES ?= "jffs2" 9IMAGE_FSTYPES ?= "jffs2"
diff --git a/meta/conf/machine/bootcdx86.conf b/meta/conf/machine/bootcdx86.conf
index 8b59fa2969..b171d31e95 100644
--- a/meta/conf/machine/bootcdx86.conf
+++ b/meta/conf/machine/bootcdx86.conf
@@ -2,4 +2,4 @@
2#@NAME: Bootable CD x86 setup 2#@NAME: Bootable CD x86 setup
3#@DESCRIPTION: Machine configuration for running an x86 system from bootable CD 3#@DESCRIPTION: Machine configuration for running an x86 system from bootable CD
4 4
5require conf/machine/qemux86.conf 5require conf/machine/qemux86.inc
diff --git a/meta/conf/machine/c7x0.conf b/meta/conf/machine/c7x0.conf
index 893378f569..7f17d28510 100644
--- a/meta/conf/machine/c7x0.conf
+++ b/meta/conf/machine/c7x0.conf
@@ -2,8 +2,8 @@
2#@NAME: Sharp Zaurus SL-C7x0 2#@NAME: Sharp Zaurus SL-C7x0
3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices 3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
4 4
5include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.inc
6include conf/machine/include/zaurus-2.6.conf 6include conf/machine/include/zaurus-2.6.inc
7 7
8IMAGE_FSTYPES ?= "jffs2" 8IMAGE_FSTYPES ?= "jffs2"
9 9
diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf
index 37ea0f707f..d421de56ae 100644
--- a/meta/conf/machine/cmx270.conf
+++ b/meta/conf/machine/cmx270.conf
@@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/bootloader = ""
19# 800x480 is big enough for me 19# 800x480 is big enough for me
20GUI_MACHINE_CLASS = "bigscreen" 20GUI_MACHINE_CLASS = "bigscreen"
21 21
22include conf/machine/include/tune-xscale.conf 22include conf/machine/include/tune-xscale.inc
23 23
24#size of the root partition (yes, it is 123 MB) 24#size of the root partition (yes, it is 123 MB)
25ROOT_FLASH_SIZE = "128" 25ROOT_FLASH_SIZE = "128"
diff --git a/meta/conf/machine/fic-gta01.conf b/meta/conf/machine/fic-gta01.conf
index 437fa8cb40..38d2dbc9a2 100644
--- a/meta/conf/machine/fic-gta01.conf
+++ b/meta/conf/machine/fic-gta01.conf
@@ -30,4 +30,4 @@ ROOT_FLASH_SIZE = "60"
30EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n -x lzo" 30EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n -x lzo"
31 31
32# tune for S3C24x0 32# tune for S3C24x0
33include conf/machine/include/tune-arm920t.conf 33include conf/machine/include/tune-arm920t.inc
diff --git a/meta/conf/machine/hx2000.conf b/meta/conf/machine/hx2000.conf
index 5aa4f5c408..d7077af593 100644
--- a/meta/conf/machine/hx2000.conf
+++ b/meta/conf/machine/hx2000.conf
@@ -33,10 +33,10 @@ SERIAL_CONSOLE = "115200 ttyS0"
33GUI_MACHINE_CLASS = "bigscreen" 33GUI_MACHINE_CLASS = "bigscreen"
34 34
35# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. 35# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
36include conf/machine/include/tune-xscale.conf 36include conf/machine/include/tune-xscale.inc
37 37
38# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first 38# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
39#include conf/machine/include/tune-iwmmxt.conf 39#include conf/machine/include/tune-iwmmxt.inc
40 40
41BOOTSTRAP_EXTRA_RRECOMMENDS += "" 41BOOTSTRAP_EXTRA_RRECOMMENDS += ""
42#${@linux_module_packages('${HX4700_MODULES}', d)} 42#${@linux_module_packages('${HX4700_MODULES}', d)}
diff --git a/meta/conf/machine/include/ixp4xx.conf b/meta/conf/machine/include/ixp4xx.conf
deleted file mode 100644
index 190ebe1c8c..0000000000
--- a/meta/conf/machine/include/ixp4xx.conf
+++ /dev/null
@@ -1,158 +0,0 @@
1#@TYPE: Machine configuration
2#@NAME: ixp4xx
3#@DESCRIPTION: genric machine configuration for ixp4xx platforms
4
5#-------------------------------------------------------------------------------
6# INPUTS
7#-------------------------------------------------------------------------------
8# conf/${DISTRO}.conf is included after this file and should be used to modify
9# variables identified as 'INPUTS' to the required values for the DISTRO, this
10# will cause the board specific settings (which depend for the most part on the
11# exact CPU used) to be set correctly within this file. The results are the
12# variables identifies here as 'OUTPUTS'
13#
14#variable = "default"
15# <possible values>
16# description
17
18ARCH_BYTE_SEX = "be"
19# "be" "le"
20# The memory byte sex and (on correctly implemented hardware - the IXP4XX is
21# correct) the byte sex of the buses within the system. 'be' (big-endian)
22# means that the first byte is the most significant byte on a bus, 'le'
23# (little-endian) means that the first byte is the least significant byte.
24
25ARM_INSTRUCTION_SET = "arm"
26# "arm" "thumb"
27# The instruction set the compiler should use when generating application
28# code. The kernel is always compiled with arm code at present. arm code
29# is the original 32 bit ARM instruction set, thumb code is the 16 bit
30# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
31# but requires more instructions (140% for 70% smaller code) so may be
32# slower.
33
34THUMB_INTERWORK = "yes"
35# "yes" "no"
36# Whether to compile with code to allow interworking between the two
37# instruction sets. This allows thumb code to be executed on a primarily
38# arm system and vice versa. It is strongly recommended that DISTROs not
39# turn this off - the actual cost is very small.
40
41DISTRO_BASE = ""
42# "" ":<base>"
43# If given this must be the name of a 'distro' to add to the bitbake OVERRIDES
44# after ${DISTRO}, this allows different distros to share a common base of
45# overrides. The value given must include a leading ':' or chaos will result.
46
47IXP4XX_SUFFIX = "${MACHINE_ARCH}"
48# <string>
49# Kernel suffix - 'ixp4xxbe' or 'ixp4xxle' for a truely generic image, controls
50# the suffix on the name of the generated zImage, override in the DISTRO
51# configuration if patches or defconfig are changed for the DISTRO.
52
53#-------------------------------------------------------------------------------
54# OUTPUTS
55#-------------------------------------------------------------------------------
56
57#OVERRIDES
58# The standard ':' separated list of overrides used by bitbake - see the
59# basic setting in bitbake.conf. This list is based on that used for the
60# standard setting however :<base>, :thumb and :thumb-interwork will be
61# inserted at appropriate points if a base distro, default use of thumb or
62# arm/thumb interworking are enabled in the inputs.
63OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
64OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
65OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}:fail-fast"
66
67# TARGET_CC_ARCH
68# TARGET_CC_KERNEL_ARCH
69# TARGET_LD_ARCH
70# TARGET_LD_KERNEL_ARCH
71# Compiler and linker options for application code and kernel code. These
72# options ensure that the compiler has the correct settings for the selected
73# instruction set and interworking.
74ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
75ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
76#
77TARGET_CC_ARCH = "-march=armv5te -mtune=xscale ${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}"
78TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale -mno-thumb-interwork -mno-thumb"
79TARGET_LD_ARCH = ""
80TARGET_LD_KERNEL_ARCH = ""
81
82# FULL_OPTIMIZATION
83# Optimization settings. Os works fine and is significantly better than O2.
84# The other settings are somewhat arbitrary. The optimisations chosen here
85# include the ones which 'break' symbolic debugging (because the compiler does
86# not include enough information to allow the debugger to know where given
87# values are.) The -fno options are an attempt to cancel explicit use of space
88# consuming options found in some packages (this isn't a complete list, this is
89# just the ones which package writers seem to know about and abuse).
90FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \
91 -fno-unroll-loops -fno-inline-functions \
92 -fweb -funit-at-a-time"
93
94# TARGET_ARCH
95# The correct setting for the system endianness (ARCH_BYTE_SEX). This will
96# be arm (le) or armeb (be) - it is difficult to be more precise in the
97# setting because of the large number of ways it is used within OpenEmbedded.
98TARGET_ARCH = "${@['armeb', 'arm'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}"
99
100# TARGET_PACKAGE_ARCH [not used]
101# The correct setting for the generated packages. This corresponds to the
102# -march flag passed to the compiler because that limits the architectures
103# on which the generated code will run.
104BYTE_SEX_CHAR = "${@['b', 'l'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}"
105TARGET_PACKAGE_ARCH_BASE = "${@['armv5te', 'thumbv5t'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
106TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}"
107
108# MACHINE_ARCH
109# The correct setting for packages which are specific to the machine, this
110# defaults to ${MACHINE} in bitbake.conf, however it is set to ixp4xx here
111# because everything built here is no more specific than that.
112MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}"
113
114# PACKAGE_EXTRA_ARCHS
115# The full list of package architectures which should run on the system.
116# This takes into account both the board level issues and the INPUTS set
117# by the distro. The arm list is derived from the architecture settings
118# known to gcc, the thumb list is then derived from that (only the 't'
119# architectures of course).
120#[not used]: TARGET_ARCH is handled below because it is also currently
121# used for thumb packages.
122#ARM_ARCHITECTURES = "${TARGET_ARCH} armv2${BYTE_SEX_CHAR} armv2a${BYTE_SEX_CHAR} armv3${BYTE_SEX_CHAR} armv3m${BYTE_SEX_CHAR} armv4${BYTE_SEX_CHAR} armv4t${BYTE_SEX_CHAR} armv5${BYTE_SEX_CHAR} armv5t${BYTE_SEX_CHAR} armv5e${BYTE_SEX_CHAR} armv5te${BYTE_SEX_CHAR} xscale${BYTE_SEX_CHAR}"
123ARM_ARCHITECTURES = "armv2${BYTE_SEX_CHAR} armv2a${BYTE_SEX_CHAR} armv3${BYTE_SEX_CHAR} armv3m${BYTE_SEX_CHAR} armv4${BYTE_SEX_CHAR} armv4t${BYTE_SEX_CHAR} armv5${BYTE_SEX_CHAR} armv5t${BYTE_SEX_CHAR} armv5e${BYTE_SEX_CHAR} armv5te${BYTE_SEX_CHAR} xscale${BYTE_SEX_CHAR}"
124THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t${BYTE_SEX_CHAR}"
125
126# NOTE: this list contains just the things which rootfs_ipk.bbclass does
127# not add, rootfs_ipk.bbclass evaluates:
128#
129# ipkgarchs="all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
130#
131# This is a priority ordered list - most desireable architecture at the end,
132# so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if
133# THUMB_INTERWORK precede this with the other architectures.
134PACKAGE_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
135 ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \
136 (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \
137 + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \
138 (bb.data.getVar('THUMB_ARCHITECTURES', d, 1), \
139 bb.data.getVar('ARM_ARCHITECTURES', d, 1), \
140 bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'thumb', \
141 bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} \
142 ${MACHINE_ARCH} ${MACHINE}${ARCH_BYTE_SEX}"
143
144# IPKG_ARCH_LIST [not used]
145# This is used to override the ipkgarchs settings in rootfs_ipk.bbclass, allowing
146# the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and
147# ixp4xx are included at the start (lower priority) as the non-byte-sex specific
148# versions.
149IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${PACKAGE_EXTRA_ARCHS}"
150
151#-------------------------------------------------------------------------------
152# Board defaults
153#-------------------------------------------------------------------------------
154# These values are board specific but they seem to be common to a large number
155# of boards so are reasonable defaults.
156SERIAL_CONSOLE = "115200 ttyS0"
157KERNEL_CONSOLE = "ttyS0,115200n8"
158USE_VT = "0"
diff --git a/meta/conf/machine/include/poodle-2.6.conf b/meta/conf/machine/include/poodle-2.6.conf
deleted file mode 100644
index 01a06b7c27..0000000000
--- a/meta/conf/machine/include/poodle-2.6.conf
+++ /dev/null
@@ -1 +0,0 @@
1require conf/machine/include/zaurus-2.6.conf
diff --git a/meta/conf/machine/include/poodle-2.6.inc b/meta/conf/machine/include/poodle-2.6.inc
new file mode 100644
index 0000000000..fa24a3281b
--- /dev/null
+++ b/meta/conf/machine/include/poodle-2.6.inc
@@ -0,0 +1 @@
require conf/machine/include/zaurus-2.6.inc
diff --git a/meta/conf/machine/include/qemu.conf b/meta/conf/machine/include/qemu.inc
index 848709a5d5..848709a5d5 100644
--- a/meta/conf/machine/include/qemu.conf
+++ b/meta/conf/machine/include/qemu.inc
diff --git a/meta/conf/machine/include/tosa-2.6.conf b/meta/conf/machine/include/tosa-2.6.inc
index f3591b4b75..35dfb4d1b9 100644
--- a/meta/conf/machine/include/tosa-2.6.conf
+++ b/meta/conf/machine/include/tosa-2.6.inc
@@ -1,4 +1,4 @@
1include conf/machine/include/zaurus-2.6.conf 1include conf/machine/include/zaurus-2.6.inc
2# wlan-ng Modules 2# wlan-ng Modules
3MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb" 3MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
4 4
diff --git a/meta/conf/machine/include/tune-arm920t.conf b/meta/conf/machine/include/tune-arm920t.inc
index 373bf46727..373bf46727 100644
--- a/meta/conf/machine/include/tune-arm920t.conf
+++ b/meta/conf/machine/include/tune-arm920t.inc
diff --git a/meta/conf/machine/include/tune-arm926ejs.conf b/meta/conf/machine/include/tune-arm926ejs.inc
index 31fe8868ca..31fe8868ca 100644
--- a/meta/conf/machine/include/tune-arm926ejs.conf
+++ b/meta/conf/machine/include/tune-arm926ejs.inc
diff --git a/meta/conf/machine/include/tune-arm9tdmi.conf b/meta/conf/machine/include/tune-arm9tdmi.inc
index d097b07739..d097b07739 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.conf
+++ b/meta/conf/machine/include/tune-arm9tdmi.inc
diff --git a/meta/conf/machine/include/tune-c3.conf b/meta/conf/machine/include/tune-c3.inc
index e6a522af10..e6a522af10 100644
--- a/meta/conf/machine/include/tune-c3.conf
+++ b/meta/conf/machine/include/tune-c3.inc
diff --git a/meta/conf/machine/include/tune-ep9312.conf b/meta/conf/machine/include/tune-ep9312.inc
index 0982cf2a13..0982cf2a13 100644
--- a/meta/conf/machine/include/tune-ep9312.conf
+++ b/meta/conf/machine/include/tune-ep9312.inc
diff --git a/meta/conf/machine/include/tune-iwmmxt.conf b/meta/conf/machine/include/tune-iwmmxt.inc
index 8376faca74..8376faca74 100644
--- a/meta/conf/machine/include/tune-iwmmxt.conf
+++ b/meta/conf/machine/include/tune-iwmmxt.inc
diff --git a/meta/conf/machine/include/tune-ppc603e.conf b/meta/conf/machine/include/tune-ppc603e.inc
index 7c8714cfc2..7c8714cfc2 100644
--- a/meta/conf/machine/include/tune-ppc603e.conf
+++ b/meta/conf/machine/include/tune-ppc603e.inc
diff --git a/meta/conf/machine/include/tune-ppce500.conf b/meta/conf/machine/include/tune-ppce500.inc
index 11717eba70..11717eba70 100644
--- a/meta/conf/machine/include/tune-ppce500.conf
+++ b/meta/conf/machine/include/tune-ppce500.inc
diff --git a/meta/conf/machine/include/tune-sh3.conf b/meta/conf/machine/include/tune-sh3.inc
index 192dd8fd22..192dd8fd22 100644
--- a/meta/conf/machine/include/tune-sh3.conf
+++ b/meta/conf/machine/include/tune-sh3.inc
diff --git a/meta/conf/machine/include/tune-sh4.conf b/meta/conf/machine/include/tune-sh4.inc
index 866f7f89d5..866f7f89d5 100644
--- a/meta/conf/machine/include/tune-sh4.conf
+++ b/meta/conf/machine/include/tune-sh4.inc
diff --git a/meta/conf/machine/include/tune-strongarm.conf b/meta/conf/machine/include/tune-strongarm.inc
index 8654c996ef..8654c996ef 100644
--- a/meta/conf/machine/include/tune-strongarm.conf
+++ b/meta/conf/machine/include/tune-strongarm.inc
diff --git a/meta/conf/machine/include/tune-supersparc.conf b/meta/conf/machine/include/tune-supersparc.inc
index 1b1ec1207f..1b1ec1207f 100644
--- a/meta/conf/machine/include/tune-supersparc.conf
+++ b/meta/conf/machine/include/tune-supersparc.inc
diff --git a/meta/conf/machine/include/tune-xscale.conf b/meta/conf/machine/include/tune-xscale.inc
index 0b98f09fc8..0b98f09fc8 100644
--- a/meta/conf/machine/include/tune-xscale.conf
+++ b/meta/conf/machine/include/tune-xscale.inc
diff --git a/meta/conf/machine/include/zaurus-2.6.conf b/meta/conf/machine/include/zaurus-2.6.inc
index 9eaa6bb2df..681d38770b 100644
--- a/meta/conf/machine/include/zaurus-2.6.conf
+++ b/meta/conf/machine/include/zaurus-2.6.inc
@@ -1,5 +1,5 @@
1# Zaurus Clamshell specific configuration for kernel 2.6 1# Zaurus Clamshell specific configuration for kernel 2.6
2# Don't forget to include zaurus-clamshell.conf as well 2# Don't forget to include zaurus-clamshell.inc as well
3 3
4PREFERRED_PROVIDER_virtual/kernel = "linux-rp" 4PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
5PREFERRED_VERSION_wpa_supplicant = "0.4.7" 5PREFERRED_VERSION_wpa_supplicant = "0.4.7"
diff --git a/meta/conf/machine/include/zaurus-clamshell.conf b/meta/conf/machine/include/zaurus-clamshell.inc
index f585864c39..6c8bbfa5dd 100644
--- a/meta/conf/machine/include/zaurus-clamshell.conf
+++ b/meta/conf/machine/include/zaurus-clamshell.inc
@@ -24,6 +24,7 @@ GUI_MACHINE_CLASS = "bigscreen"
24GPE_EXTRA_INSTALL += "gaim sylpheed" 24GPE_EXTRA_INSTALL += "gaim sylpheed"
25 25
26# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. 26# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
27include conf/machine/include/tune-xscale.conf 27include conf/machine/include/tune-xscale.inc
28 28
29SERIAL_CONSOLE = "115200 ttyS0" 29SERIAL_CONSOLE = "115200 ttyS0"
30
diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf
index 3bcd32c9a1..b8f2d4089a 100644
--- a/meta/conf/machine/nokia770.conf
+++ b/meta/conf/machine/nokia770.conf
@@ -13,7 +13,7 @@ XSERVER = "xserver-kdrive-xomap"
13GUI_MACHINE_CLASS = "bigscreen" 13GUI_MACHINE_CLASS = "bigscreen"
14 14
15# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. 15# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
16include conf/machine/include/tune-arm926ejs.conf 16include conf/machine/include/tune-arm926ejs.inc
17 17
18#size of the root partition (yes, it is 123 MB) 18#size of the root partition (yes, it is 123 MB)
19ROOT_FLASH_SIZE = "123" 19ROOT_FLASH_SIZE = "123"
diff --git a/meta/conf/machine/nokia800.conf b/meta/conf/machine/nokia800.conf
index eb48b92ffa..3cd410545e 100644
--- a/meta/conf/machine/nokia800.conf
+++ b/meta/conf/machine/nokia800.conf
@@ -10,7 +10,7 @@ XSERVER = "xserver-kdrive-xomap"
10GUI_MACHINE_CLASS = "bigscreen" 10GUI_MACHINE_CLASS = "bigscreen"
11 11
12# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. 12# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
13include conf/machine/include/tune-arm926ejs.conf 13include conf/machine/include/tune-arm926ejs.inc
14 14
15ROOT_FLASH_SIZE = "174" 15ROOT_FLASH_SIZE = "174"
16EXTRA_IMAGECMD_jffs2_nokia800 = "--pad --little-endian --eraseblock=0x20000 -n" 16EXTRA_IMAGECMD_jffs2_nokia800 = "--pad --little-endian --eraseblock=0x20000 -n"
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 1742e1b1aa..745928b252 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -5,8 +5,8 @@
5TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
6PACKAGE_EXTRA_ARCHS = "armv4 armv5te" 6PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
7 7
8require conf/machine/include/qemu.conf 8require conf/machine/include/qemu.inc
9require conf/machine/include/tune-arm926ejs.conf 9require conf/machine/include/tune-arm926ejs.inc
10 10
11SERIAL_CONSOLE = "115200 ttyAMA0" 11SERIAL_CONSOLE = "115200 ttyAMA0"
12 12
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 60aa12ad7f..db0eb1a966 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -5,7 +5,7 @@
5TARGET_ARCH = "i586" 5TARGET_ARCH = "i586"
6PACKAGE_EXTRA_ARCHS = "x86" 6PACKAGE_EXTRA_ARCHS = "x86"
7 7
8require conf/machine/include/qemu.conf 8require conf/machine/include/qemu.inc
9 9
10SERIAL_CONSOLE = "115200 ttyS0" 10SERIAL_CONSOLE = "115200 ttyS0"
11 11
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf
index a8e25c7b75..4cfe5d7949 100644
--- a/meta/conf/machine/spitz.conf
+++ b/meta/conf/machine/spitz.conf
@@ -2,8 +2,8 @@
2#@NAME: Sharp Zaurus SL-C3000 2#@NAME: Sharp Zaurus SL-C3000
3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device 3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
4 4
5include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.inc
6include conf/machine/include/zaurus-2.6.conf 6include conf/machine/include/zaurus-2.6.inc
7 7
8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" 8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
9 9