conf/machine: Sync various changes with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2656 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
d20e041f2f
commit
65f6428521
|
@ -2,8 +2,8 @@
|
|||
#@NAME: Sharp Zaurus SL-C1000
|
||||
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
|
||||
|
||||
include conf/machine/include/zaurus-clamshell.inc
|
||||
include conf/machine/include/zaurus-2.6.inc
|
||||
require conf/machine/include/zaurus-2.6.inc
|
||||
require conf/machine/include/zaurus-clamshell.inc
|
||||
|
||||
PACKAGE_EXTRA_ARCHS += "iwmmxt"
|
||||
IMAGE_FSTYPES ?= "jffs2"
|
||||
|
|
|
@ -2,10 +2,13 @@
|
|||
#@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-clamshell.inc
|
||||
include conf/machine/include/zaurus-2.6.inc
|
||||
require conf/machine/include/zaurus-2.6.inc
|
||||
require conf/machine/include/zaurus-clamshell.inc
|
||||
|
||||
IMAGE_FSTYPES ?= "jffs2"
|
||||
|
||||
ROOT_FLASH_SIZE = "25"
|
||||
# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
|
||||
|
||||
#XSERVER = "xserver-kdrive-imageon"
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
FEED_ARCH = "armv4t"
|
||||
PACKAGE_ARCH = "armv4t"
|
||||
TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
FEED_ARCH = "armv5te"
|
||||
|
||||
# For gcc 3.x you need:
|
||||
#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
|
||||
# For gcc 4.x you need:
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
TARGET_CC_ARCH = "-mcpu=603e"
|
||||
TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
|
||||
PACKAGE_ARCH = "ppc603e"
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
|
||||
PACKAGE_ARCH = "armv5te"
|
||||
FEED_ARCH = "armv5te"
|
||||
|
||||
TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
|
||||
TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
|
||||
PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
|
||||
|
|
|
@ -1,22 +1,45 @@
|
|||
# Zaurus Clamshell specific configuration for kernel 2.6
|
||||
# Don't forget to include zaurus-clamshell.inc as well
|
||||
|
||||
TARGET_ARCH = "arm"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
|
||||
|
||||
MACHINE_KERNEL_VERSION = "2.6"
|
||||
|
||||
ERASEBLOCKSIZE = "0x4000"
|
||||
ERASEBLOCKSIZE_akita = "0x20000"
|
||||
|
||||
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n"
|
||||
|
||||
IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
|
||||
|
||||
EXTRA_IMAGEDEPENDS += "zaurus-updater"
|
||||
|
||||
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
|
||||
include conf/machine/include/tune-xscale.inc
|
||||
|
||||
SERIAL_CONSOLE = "115200 ttyS0"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
|
||||
PREFERRED_VERSION_wpa_supplicant = "0.4.7"
|
||||
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
|
||||
|
||||
PCMCIA_MANAGER ?= "pcmciautils"
|
||||
|
||||
MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen bluetooth"
|
||||
MACHINE_FEATURES_append_tosa = " usbhost usbwlanng "
|
||||
MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"
|
||||
MACHINE_FEATURES_append_tosa = " usbhost wifi "
|
||||
MACHINE_FEATURES_append_akita = " usbhost "
|
||||
MACHINE_FEATURES_append_spitz = " usbhost ext2 "
|
||||
|
||||
MACHINE_EXTRA_RDEPENDS = "zaurusd"
|
||||
MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
|
||||
MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
|
||||
MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
|
||||
MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
|
||||
MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
|
||||
MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
|
||||
MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
|
||||
|
||||
GUI_MACHINE_CLASS = "bigscreen"
|
||||
GUI_MACHINE_CLASS_collie = "smallscreen"
|
||||
GUI_MACHINE_CLASS_poodle = "smallscreen"
|
||||
|
||||
MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
|
||||
|
||||
zaurus_make_installkit () {
|
||||
|
|
|
@ -1,30 +1,13 @@
|
|||
TARGET_ARCH = "arm"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
|
||||
|
||||
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
|
||||
|
||||
EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater"
|
||||
|
||||
ERASEBLOCKSIZE = "0x4000"
|
||||
ERASEBLOCKSIZE_akita = "0x20000"
|
||||
EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
|
||||
|
||||
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
|
||||
--output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
|
||||
&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
|
||||
--output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
|
||||
&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
|
||||
-o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
|
||||
--eraseblock=${ERASEBLOCKSIZE} -l -p; \
|
||||
cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
|
||||
${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
|
||||
rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
|
||||
cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
|
||||
cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
|
||||
${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
|
||||
rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
|
||||
cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
|
||||
${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
|
||||
rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary"
|
||||
|
||||
GUI_MACHINE_CLASS = "bigscreen"
|
||||
GPE_EXTRA_INSTALL += "gaim sylpheed"
|
||||
|
||||
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
|
||||
include conf/machine/include/tune-xscale.inc
|
||||
|
||||
SERIAL_CONSOLE = "115200 ttyS0"
|
||||
|
||||
rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
|
||||
|
||||
TARGET_ARCH = "arm"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
|
||||
|
||||
require conf/machine/include/qemu.inc
|
||||
require conf/machine/include/tune-arm926ejs.inc
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
#@NAME: Sharp Zaurus SL-C3000
|
||||
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
|
||||
|
||||
include conf/machine/include/zaurus-clamshell.inc
|
||||
include conf/machine/include/zaurus-2.6.inc
|
||||
require conf/machine/include/zaurus-2.6.inc
|
||||
require conf/machine/include/zaurus-clamshell.inc
|
||||
|
||||
PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
|
||||
|
||||
|
@ -12,5 +12,3 @@ IMAGE_FSTYPES ?= "tar.gz ext3"
|
|||
IMAGE_ROOTFS_SIZE_ext3 = "250000"
|
||||
|
||||
ROOT_FLASH_SIZE = "100"
|
||||
# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
|
||||
# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte
|
||||
|
|
Loading…
Reference in New Issue