diff options
author | Richard Purdie <richard@openedhand.com> | 2007-09-02 17:00:54 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-09-02 17:00:54 +0000 |
commit | 65f6428521a6721b94a9c3f90a229ef06179ab51 (patch) | |
tree | df9dcda77e0bacb2f7d496e272ea13df649a83dd /meta/conf/machine/include | |
parent | d20e041f2f9c27bd3fc8f0f266c1e6a1f286eb3f (diff) | |
download | poky-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/machine/include')
-rw-r--r-- | meta/conf/machine/include/tune-arm920t.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-arm926ejs.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-ppc603e.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-xscale.inc | 6 | ||||
-rw-r--r-- | meta/conf/machine/include/zaurus-2.6.inc | 35 | ||||
-rw-r--r-- | meta/conf/machine/include/zaurus-clamshell.inc | 33 |
6 files changed, 45 insertions, 34 deletions
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 @@ | |||
1 | FEED_ARCH = "armv4t" | ||
1 | PACKAGE_ARCH = "armv4t" | 2 | PACKAGE_ARCH = "armv4t" |
2 | TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" | 3 | TARGET_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 @@ | |||
1 | FEED_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 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=603e" | 1 | TARGET_CC_ARCH = "-mcpu=603e -mhard-float" |
2 | PACKAGE_ARCH = "ppc603e" | 2 | PACKAGE_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 @@ | |||
1 | TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" | 1 | FEED_ARCH = "armv5te" |
2 | PACKAGE_ARCH = "armv5te" | ||
3 | 2 | ||
3 | TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" | ||
4 | TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" | ||
5 | PACKAGE_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 | ||
4 | TARGET_ARCH = "arm" | ||
5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" | ||
6 | |||
7 | MACHINE_KERNEL_VERSION = "2.6" | ||
8 | |||
9 | ERASEBLOCKSIZE = "0x4000" | ||
10 | ERASEBLOCKSIZE_akita = "0x20000" | ||
11 | |||
12 | EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" | ||
13 | |||
14 | IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" | ||
15 | |||
16 | EXTRA_IMAGEDEPENDS += "zaurus-updater" | ||
17 | |||
18 | # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. | ||
19 | include conf/machine/include/tune-xscale.inc | ||
20 | |||
21 | SERIAL_CONSOLE = "115200 ttyS0" | ||
22 | |||
4 | PREFERRED_PROVIDER_virtual/kernel = "linux-rp" | 23 | PREFERRED_PROVIDER_virtual/kernel = "linux-rp" |
5 | PREFERRED_VERSION_wpa_supplicant = "0.4.7" | 24 | PREFERRED_PROVIDER_xserver = "xserver-kdrive" |
6 | 25 | ||
7 | PCMCIA_MANAGER ?= "pcmciautils" | 26 | PCMCIA_MANAGER ?= "pcmciautils" |
8 | 27 | ||
9 | MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen bluetooth" | 28 | MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen" |
10 | MACHINE_FEATURES_append_tosa = " usbhost usbwlanng " | 29 | MACHINE_FEATURES_append_tosa = " usbhost wifi " |
11 | MACHINE_FEATURES_append_akita = " usbhost " | 30 | MACHINE_FEATURES_append_akita = " usbhost " |
12 | MACHINE_FEATURES_append_spitz = " usbhost ext2 " | 31 | MACHINE_FEATURES_append_spitz = " usbhost ext2 " |
13 | 32 | ||
14 | MACHINE_EXTRA_RDEPENDS = "zaurusd" | 33 | MACHINE_EXTRA_RDEPENDS = "zaurusd" |
15 | MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" | 34 | MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" |
16 | MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz" | 35 | MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz" |
17 | MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" | 36 | MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" |
18 | MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" | 37 | MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" |
19 | 38 | ||
39 | GUI_MACHINE_CLASS = "bigscreen" | ||
40 | GUI_MACHINE_CLASS_collie = "smallscreen" | ||
41 | GUI_MACHINE_CLASS_poodle = "smallscreen" | ||
42 | |||
20 | MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" | 43 | MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" |
21 | 44 | ||
22 | zaurus_make_installkit () { | 45 | zaurus_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 @@ | |||
1 | TARGET_ARCH = "arm" | 1 | EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" |
2 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" | ||
3 | |||
4 | PREFERRED_PROVIDER_xserver = "xserver-kdrive" | ||
5 | |||
6 | EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater" | ||
7 | |||
8 | ERASEBLOCKSIZE = "0x4000" | ||
9 | ERASEBLOCKSIZE_akita = "0x20000" | ||
10 | 2 | ||
11 | IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ | 3 | IMAGE_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 | |||
23 | GUI_MACHINE_CLASS = "bigscreen" | ||
24 | GPE_EXTRA_INSTALL += "gaim sylpheed" | ||
25 | |||
26 | # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. | ||
27 | include conf/machine/include/tune-xscale.inc | ||
28 | |||
29 | SERIAL_CONSOLE = "115200 ttyS0" | ||
30 | |||