summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-09-02 17:00:54 +0000
committerRichard Purdie <richard@openedhand.com>2007-09-02 17:00:54 +0000
commit65f6428521a6721b94a9c3f90a229ef06179ab51 (patch)
treedf9dcda77e0bacb2f7d496e272ea13df649a83dd /meta/conf
parentd20e041f2f9c27bd3fc8f0f266c1e6a1f286eb3f (diff)
downloadpoky-65f6428521a6721b94a9c3f90a229ef06179ab51.tar.gz
conf/machine: Sync various changes with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2656 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/akita.conf4
-rw-r--r--meta/conf/machine/c7x0.conf7
-rw-r--r--meta/conf/machine/include/tune-arm920t.inc1
-rw-r--r--meta/conf/machine/include/tune-arm926ejs.inc2
-rw-r--r--meta/conf/machine/include/tune-ppc603e.inc2
-rw-r--r--meta/conf/machine/include/tune-xscale.inc6
-rw-r--r--meta/conf/machine/include/zaurus-2.6.inc35
-rw-r--r--meta/conf/machine/include/zaurus-clamshell.inc33
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/spitz.conf6
10 files changed, 55 insertions, 43 deletions
diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf
index b48b5a3e13..06d5946523 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.inc 5require conf/machine/include/zaurus-2.6.inc
6include conf/machine/include/zaurus-2.6.inc 6require conf/machine/include/zaurus-clamshell.inc
7 7
8PACKAGE_EXTRA_ARCHS += "iwmmxt" 8PACKAGE_EXTRA_ARCHS += "iwmmxt"
9IMAGE_FSTYPES ?= "jffs2" 9IMAGE_FSTYPES ?= "jffs2"
diff --git a/meta/conf/machine/c7x0.conf b/meta/conf/machine/c7x0.conf
index 7f17d28510..2b2f1a4355 100644
--- a/meta/conf/machine/c7x0.conf
+++ b/meta/conf/machine/c7x0.conf
@@ -2,10 +2,13 @@
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.inc 5require conf/machine/include/zaurus-2.6.inc
6include conf/machine/include/zaurus-2.6.inc 6require conf/machine/include/zaurus-clamshell.inc
7 7
8IMAGE_FSTYPES ?= "jffs2" 8IMAGE_FSTYPES ?= "jffs2"
9 9
10ROOT_FLASH_SIZE = "25" 10ROOT_FLASH_SIZE = "25"
11# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. 11# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
12
13#XSERVER = "xserver-kdrive-imageon"
14
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc
index 373bf46727..b142d3325a 100644
--- a/meta/conf/machine/include/tune-arm920t.inc
+++ b/meta/conf/machine/include/tune-arm920t.inc
@@ -1,3 +1,4 @@
1FEED_ARCH = "armv4t"
1PACKAGE_ARCH = "armv4t" 2PACKAGE_ARCH = "armv4t"
2TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" 3TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
3 4
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc
index 31fe8868ca..c3e8d7aefc 100644
--- a/meta/conf/machine/include/tune-arm926ejs.inc
+++ b/meta/conf/machine/include/tune-arm926ejs.inc
@@ -1,3 +1,5 @@
1FEED_ARCH = "armv5te"
2
1# For gcc 3.x you need: 3# For gcc 3.x you need:
2#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" 4#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
3# For gcc 4.x you need: 5# For gcc 4.x you need:
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index 7c8714cfc2..1a004d30b5 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -1,2 +1,2 @@
1TARGET_CC_ARCH = "-mcpu=603e" 1TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
2PACKAGE_ARCH = "ppc603e" 2PACKAGE_ARCH = "ppc603e"
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc
index 0b98f09fc8..f14aee9aed 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/tune-xscale.inc
@@ -1,3 +1,5 @@
1TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" 1FEED_ARCH = "armv5te"
2PACKAGE_ARCH = "armv5te"
3 2
3TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
4TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
5PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
diff --git a/meta/conf/machine/include/zaurus-2.6.inc b/meta/conf/machine/include/zaurus-2.6.inc
index efa1704642..979a6bd484 100644
--- a/meta/conf/machine/include/zaurus-2.6.inc
+++ b/meta/conf/machine/include/zaurus-2.6.inc
@@ -1,22 +1,45 @@
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.inc as well 2# Don't forget to include zaurus-clamshell.inc as well
3 3
4TARGET_ARCH = "arm"
5PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
6
7MACHINE_KERNEL_VERSION = "2.6"
8
9ERASEBLOCKSIZE = "0x4000"
10ERASEBLOCKSIZE_akita = "0x20000"
11
12EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n"
13
14IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
15
16EXTRA_IMAGEDEPENDS += "zaurus-updater"
17
18# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
19include conf/machine/include/tune-xscale.inc
20
21SERIAL_CONSOLE = "115200 ttyS0"
22
4PREFERRED_PROVIDER_virtual/kernel = "linux-rp" 23PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
5PREFERRED_VERSION_wpa_supplicant = "0.4.7" 24PREFERRED_PROVIDER_xserver = "xserver-kdrive"
6 25
7PCMCIA_MANAGER ?= "pcmciautils" 26PCMCIA_MANAGER ?= "pcmciautils"
8 27
9MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen bluetooth" 28MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"
10MACHINE_FEATURES_append_tosa = " usbhost usbwlanng " 29MACHINE_FEATURES_append_tosa = " usbhost wifi "
11MACHINE_FEATURES_append_akita = " usbhost " 30MACHINE_FEATURES_append_akita = " usbhost "
12MACHINE_FEATURES_append_spitz = " usbhost ext2 " 31MACHINE_FEATURES_append_spitz = " usbhost ext2 "
13 32
14MACHINE_EXTRA_RDEPENDS = "zaurusd" 33MACHINE_EXTRA_RDEPENDS = "zaurusd"
15MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" 34MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
16MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz" 35MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
17MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" 36MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
18MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" 37MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
19 38
39GUI_MACHINE_CLASS = "bigscreen"
40GUI_MACHINE_CLASS_collie = "smallscreen"
41GUI_MACHINE_CLASS_poodle = "smallscreen"
42
20MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" 43MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
21 44
22zaurus_make_installkit () { 45zaurus_make_installkit () {
diff --git a/meta/conf/machine/include/zaurus-clamshell.inc b/meta/conf/machine/include/zaurus-clamshell.inc
index 6c8bbfa5dd..f66502eff1 100644
--- a/meta/conf/machine/include/zaurus-clamshell.inc
+++ b/meta/conf/machine/include/zaurus-clamshell.inc
@@ -1,30 +1,13 @@
1TARGET_ARCH = "arm" 1EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
2PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
3
4PREFERRED_PROVIDER_xserver = "xserver-kdrive"
5
6EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater"
7
8ERASEBLOCKSIZE = "0x4000"
9ERASEBLOCKSIZE_akita = "0x20000"
10 2
11IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ 3IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
12 --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ 4 --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
13 && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ 5 && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
14 -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ 6 -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
15 --eraseblock=${ERASEBLOCKSIZE} -l -p; \ 7 --eraseblock=${ERASEBLOCKSIZE} -l -p; \
16 cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ 8 cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
17 ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ 9 ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
18 rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \ 10 rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
19 cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ 11 cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
20 ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ 12 ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
21 rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary" 13 rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
22
23GUI_MACHINE_CLASS = "bigscreen"
24GPE_EXTRA_INSTALL += "gaim sylpheed"
25
26# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
27include conf/machine/include/tune-xscale.inc
28
29SERIAL_CONSOLE = "115200 ttyS0"
30
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 6a2fe6feb9..4306a6b22d 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -3,7 +3,7 @@
3#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation 3#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
4 4
5TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
6PACKAGE_EXTRA_ARCHS = "armv4 armv5te" 6PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
7 7
8require conf/machine/include/qemu.inc 8require conf/machine/include/qemu.inc
9require conf/machine/include/tune-arm926ejs.inc 9require conf/machine/include/tune-arm926ejs.inc
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf
index 63cd30f0d7..4a3730aeb0 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.inc 5require conf/machine/include/zaurus-2.6.inc
6include conf/machine/include/zaurus-2.6.inc 6require conf/machine/include/zaurus-clamshell.inc
7 7
8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" 8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
9 9
@@ -12,5 +12,3 @@ IMAGE_FSTYPES ?= "tar.gz ext3"
12IMAGE_ROOTFS_SIZE_ext3 = "250000" 12IMAGE_ROOTFS_SIZE_ext3 = "250000"
13 13
14ROOT_FLASH_SIZE = "100" 14ROOT_FLASH_SIZE = "100"
15# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
16# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte