From 303cbeeea22248d7d3c635921fe9929106c60150 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 8 Aug 2007 12:37:40 +0000 Subject: conf/machine/include: Rename to .conf to .inc files git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2388 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/machine/akita.conf | 4 +- meta/conf/machine/bootcdx86.conf | 2 +- meta/conf/machine/c7x0.conf | 4 +- meta/conf/machine/cmx270.conf | 2 +- meta/conf/machine/fic-gta01.conf | 2 +- meta/conf/machine/hx2000.conf | 4 +- meta/conf/machine/include/ixp4xx.conf | 158 ------------------------ meta/conf/machine/include/poodle-2.6.conf | 1 - meta/conf/machine/include/poodle-2.6.inc | 1 + meta/conf/machine/include/qemu.conf | 11 -- meta/conf/machine/include/qemu.inc | 11 ++ meta/conf/machine/include/tosa-2.6.conf | 6 - meta/conf/machine/include/tosa-2.6.inc | 6 + meta/conf/machine/include/tune-arm920t.conf | 3 - meta/conf/machine/include/tune-arm920t.inc | 3 + meta/conf/machine/include/tune-arm926ejs.conf | 5 - meta/conf/machine/include/tune-arm926ejs.inc | 5 + meta/conf/machine/include/tune-arm9tdmi.conf | 2 - meta/conf/machine/include/tune-arm9tdmi.inc | 2 + meta/conf/machine/include/tune-c3.conf | 3 - meta/conf/machine/include/tune-c3.inc | 3 + meta/conf/machine/include/tune-ep9312.conf | 6 - meta/conf/machine/include/tune-ep9312.inc | 6 + meta/conf/machine/include/tune-iwmmxt.conf | 6 - meta/conf/machine/include/tune-iwmmxt.inc | 6 + meta/conf/machine/include/tune-ppc603e.conf | 2 - meta/conf/machine/include/tune-ppc603e.inc | 2 + meta/conf/machine/include/tune-ppce500.conf | 2 - meta/conf/machine/include/tune-ppce500.inc | 2 + meta/conf/machine/include/tune-sh3.conf | 1 - meta/conf/machine/include/tune-sh3.inc | 1 + meta/conf/machine/include/tune-sh4.conf | 1 - meta/conf/machine/include/tune-sh4.inc | 1 + meta/conf/machine/include/tune-strongarm.conf | 2 - meta/conf/machine/include/tune-strongarm.inc | 2 + meta/conf/machine/include/tune-supersparc.conf | 2 - meta/conf/machine/include/tune-supersparc.inc | 2 + meta/conf/machine/include/tune-xscale.conf | 3 - meta/conf/machine/include/tune-xscale.inc | 3 + meta/conf/machine/include/zaurus-2.6.conf | 18 --- meta/conf/machine/include/zaurus-2.6.inc | 18 +++ meta/conf/machine/include/zaurus-clamshell.conf | 29 ----- meta/conf/machine/include/zaurus-clamshell.inc | 30 +++++ meta/conf/machine/nokia770.conf | 2 +- meta/conf/machine/nokia800.conf | 2 +- meta/conf/machine/qemuarm.conf | 4 +- meta/conf/machine/qemux86.conf | 2 +- meta/conf/machine/spitz.conf | 4 +- 48 files changed, 120 insertions(+), 277 deletions(-) delete mode 100644 meta/conf/machine/include/ixp4xx.conf delete mode 100644 meta/conf/machine/include/poodle-2.6.conf create mode 100644 meta/conf/machine/include/poodle-2.6.inc delete mode 100644 meta/conf/machine/include/qemu.conf create mode 100644 meta/conf/machine/include/qemu.inc delete mode 100644 meta/conf/machine/include/tosa-2.6.conf create mode 100644 meta/conf/machine/include/tosa-2.6.inc delete mode 100644 meta/conf/machine/include/tune-arm920t.conf create mode 100644 meta/conf/machine/include/tune-arm920t.inc delete mode 100644 meta/conf/machine/include/tune-arm926ejs.conf create mode 100644 meta/conf/machine/include/tune-arm926ejs.inc delete mode 100644 meta/conf/machine/include/tune-arm9tdmi.conf create mode 100644 meta/conf/machine/include/tune-arm9tdmi.inc delete mode 100644 meta/conf/machine/include/tune-c3.conf create mode 100644 meta/conf/machine/include/tune-c3.inc delete mode 100644 meta/conf/machine/include/tune-ep9312.conf create mode 100644 meta/conf/machine/include/tune-ep9312.inc delete mode 100644 meta/conf/machine/include/tune-iwmmxt.conf create mode 100644 meta/conf/machine/include/tune-iwmmxt.inc delete mode 100644 meta/conf/machine/include/tune-ppc603e.conf create mode 100644 meta/conf/machine/include/tune-ppc603e.inc delete mode 100644 meta/conf/machine/include/tune-ppce500.conf create mode 100644 meta/conf/machine/include/tune-ppce500.inc delete mode 100644 meta/conf/machine/include/tune-sh3.conf create mode 100644 meta/conf/machine/include/tune-sh3.inc delete mode 100644 meta/conf/machine/include/tune-sh4.conf create mode 100644 meta/conf/machine/include/tune-sh4.inc delete mode 100644 meta/conf/machine/include/tune-strongarm.conf create mode 100644 meta/conf/machine/include/tune-strongarm.inc delete mode 100644 meta/conf/machine/include/tune-supersparc.conf create mode 100644 meta/conf/machine/include/tune-supersparc.inc delete mode 100644 meta/conf/machine/include/tune-xscale.conf create mode 100644 meta/conf/machine/include/tune-xscale.inc delete mode 100644 meta/conf/machine/include/zaurus-2.6.conf create mode 100644 meta/conf/machine/include/zaurus-2.6.inc delete mode 100644 meta/conf/machine/include/zaurus-clamshell.conf create mode 100644 meta/conf/machine/include/zaurus-clamshell.inc 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 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-2.6.conf +include conf/machine/include/zaurus-clamshell.inc +include conf/machine/include/zaurus-2.6.inc PACKAGE_EXTRA_ARCHS += "iwmmxt" IMAGE_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 @@ #@NAME: Bootable CD x86 setup #@DESCRIPTION: Machine configuration for running an x86 system from bootable CD -require conf/machine/qemux86.conf +require 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 @@ #@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.conf -include conf/machine/include/zaurus-2.6.conf +include conf/machine/include/zaurus-clamshell.inc +include conf/machine/include/zaurus-2.6.inc IMAGE_FSTYPES ?= "jffs2" 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 = "" # 800x480 is big enough for me GUI_MACHINE_CLASS = "bigscreen" -include conf/machine/include/tune-xscale.conf +include conf/machine/include/tune-xscale.inc #size of the root partition (yes, it is 123 MB) ROOT_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" EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n -x lzo" # tune for S3C24x0 -include conf/machine/include/tune-arm920t.conf +include 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" GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.conf +include conf/machine/include/tune-xscale.inc # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#include conf/machine/include/tune-iwmmxt.conf +#include conf/machine/include/tune-iwmmxt.inc BOOTSTRAP_EXTRA_RRECOMMENDS += "" #${@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 @@ -#@TYPE: Machine configuration -#@NAME: ixp4xx -#@DESCRIPTION: genric machine configuration for ixp4xx platforms - -#------------------------------------------------------------------------------- -# INPUTS -#------------------------------------------------------------------------------- -# conf/${DISTRO}.conf is included after this file and should be used to modify -# variables identified as 'INPUTS' to the required values for the DISTRO, this -# will cause the board specific settings (which depend for the most part on the -# exact CPU used) to be set correctly within this file. The results are the -# variables identifies here as 'OUTPUTS' -# -#variable = "default" -# -# description - -ARCH_BYTE_SEX = "be" -# "be" "le" -# The memory byte sex and (on correctly implemented hardware - the IXP4XX is -# correct) the byte sex of the buses within the system. 'be' (big-endian) -# means that the first byte is the most significant byte on a bus, 'le' -# (little-endian) means that the first byte is the least significant byte. - -ARM_INSTRUCTION_SET = "arm" -# "arm" "thumb" -# The instruction set the compiler should use when generating application -# code. The kernel is always compiled with arm code at present. arm code -# is the original 32 bit ARM instruction set, thumb code is the 16 bit -# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size) -# but requires more instructions (140% for 70% smaller code) so may be -# slower. - -THUMB_INTERWORK = "yes" -# "yes" "no" -# Whether to compile with code to allow interworking between the two -# instruction sets. This allows thumb code to be executed on a primarily -# arm system and vice versa. It is strongly recommended that DISTROs not -# turn this off - the actual cost is very small. - -DISTRO_BASE = "" -# "" ":" -# If given this must be the name of a 'distro' to add to the bitbake OVERRIDES -# after ${DISTRO}, this allows different distros to share a common base of -# overrides. The value given must include a leading ':' or chaos will result. - -IXP4XX_SUFFIX = "${MACHINE_ARCH}" -# -# Kernel suffix - 'ixp4xxbe' or 'ixp4xxle' for a truely generic image, controls -# the suffix on the name of the generated zImage, override in the DISTRO -# configuration if patches or defconfig are changed for the DISTRO. - -#------------------------------------------------------------------------------- -# OUTPUTS -#------------------------------------------------------------------------------- - -#OVERRIDES -# The standard ':' separated list of overrides used by bitbake - see the -# basic setting in bitbake.conf. This list is based on that used for the -# standard setting however :, :thumb and :thumb-interwork will be -# inserted at appropriate points if a base distro, default use of thumb or -# arm/thumb interworking are enabled in the inputs. -OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" -OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" -OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}:fail-fast" - -# TARGET_CC_ARCH -# TARGET_CC_KERNEL_ARCH -# TARGET_LD_ARCH -# TARGET_LD_KERNEL_ARCH -# Compiler and linker options for application code and kernel code. These -# options ensure that the compiler has the correct settings for the selected -# instruction set and interworking. -ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" -ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" -# -TARGET_CC_ARCH = "-march=armv5te -mtune=xscale ${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}" -TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale -mno-thumb-interwork -mno-thumb" -TARGET_LD_ARCH = "" -TARGET_LD_KERNEL_ARCH = "" - -# FULL_OPTIMIZATION -# Optimization settings. Os works fine and is significantly better than O2. -# The other settings are somewhat arbitrary. The optimisations chosen here -# include the ones which 'break' symbolic debugging (because the compiler does -# not include enough information to allow the debugger to know where given -# values are.) The -fno options are an attempt to cancel explicit use of space -# consuming options found in some packages (this isn't a complete list, this is -# just the ones which package writers seem to know about and abuse). -FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \ - -fno-unroll-loops -fno-inline-functions \ - -fweb -funit-at-a-time" - -# TARGET_ARCH -# The correct setting for the system endianness (ARCH_BYTE_SEX). This will -# be arm (le) or armeb (be) - it is difficult to be more precise in the -# setting because of the large number of ways it is used within OpenEmbedded. -TARGET_ARCH = "${@['armeb', 'arm'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}" - -# TARGET_PACKAGE_ARCH [not used] -# The correct setting for the generated packages. This corresponds to the -# -march flag passed to the compiler because that limits the architectures -# on which the generated code will run. -BYTE_SEX_CHAR = "${@['b', 'l'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}" -TARGET_PACKAGE_ARCH_BASE = "${@['armv5te', 'thumbv5t'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" -TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}" - -# MACHINE_ARCH -# The correct setting for packages which are specific to the machine, this -# defaults to ${MACHINE} in bitbake.conf, however it is set to ixp4xx here -# because everything built here is no more specific than that. -MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}" - -# PACKAGE_EXTRA_ARCHS -# The full list of package architectures which should run on the system. -# This takes into account both the board level issues and the INPUTS set -# by the distro. The arm list is derived from the architecture settings -# known to gcc, the thumb list is then derived from that (only the 't' -# architectures of course). -#[not used]: TARGET_ARCH is handled below because it is also currently -# used for thumb packages. -#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}" -ARM_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}" -THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t${BYTE_SEX_CHAR}" - -# NOTE: this list contains just the things which rootfs_ipk.bbclass does -# not add, rootfs_ipk.bbclass evaluates: -# -# ipkgarchs="all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" -# -# This is a priority ordered list - most desireable architecture at the end, -# so put _ARCHITECTURES at the end and, if -# THUMB_INTERWORK precede this with the other architectures. -PACKAGE_EXTRA_ARCHS = "ixp4xx ${MACHINE} \ - ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ - (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \ - + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \ - (bb.data.getVar('THUMB_ARCHITECTURES', d, 1), \ - bb.data.getVar('ARM_ARCHITECTURES', d, 1), \ - bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'thumb', \ - bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} \ - ${MACHINE_ARCH} ${MACHINE}${ARCH_BYTE_SEX}" - -# IPKG_ARCH_LIST [not used] -# This is used to override the ipkgarchs settings in rootfs_ipk.bbclass, allowing -# the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and -# ixp4xx are included at the start (lower priority) as the non-byte-sex specific -# versions. -IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${PACKAGE_EXTRA_ARCHS}" - -#------------------------------------------------------------------------------- -# Board defaults -#------------------------------------------------------------------------------- -# These values are board specific but they seem to be common to a large number -# of boards so are reasonable defaults. -SERIAL_CONSOLE = "115200 ttyS0" -KERNEL_CONSOLE = "ttyS0,115200n8" -USE_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 @@ -require 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.conf deleted file mode 100644 index 848709a5d5..0000000000 --- a/meta/conf/machine/include/qemu.conf +++ /dev/null @@ -1,11 +0,0 @@ -PCMCIA_MANAGER = "pcmciautils" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_INSTALL += "gaim sylpheed" - -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" - -IMAGE_FSTYPES ?= "tar.bz2 ext2" - -ROOT_FLASH_SIZE = "220" -IMAGE_ROOTFS_SIZE_ext2 ?= "220000" diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc new file mode 100644 index 0000000000..848709a5d5 --- /dev/null +++ b/meta/conf/machine/include/qemu.inc @@ -0,0 +1,11 @@ +PCMCIA_MANAGER = "pcmciautils" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +GUI_MACHINE_CLASS = "bigscreen" +GPE_EXTRA_INSTALL += "gaim sylpheed" + +MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" + +IMAGE_FSTYPES ?= "tar.bz2 ext2" + +ROOT_FLASH_SIZE = "220" +IMAGE_ROOTFS_SIZE_ext2 ?= "220000" diff --git a/meta/conf/machine/include/tosa-2.6.conf b/meta/conf/machine/include/tosa-2.6.conf deleted file mode 100644 index f3591b4b75..0000000000 --- a/meta/conf/machine/include/tosa-2.6.conf +++ /dev/null @@ -1,6 +0,0 @@ -include conf/machine/include/zaurus-2.6.conf -# wlan-ng Modules -MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb" - -# WM97xx Modules -#MACHINE_EXTRA_RRECOMMENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" diff --git a/meta/conf/machine/include/tosa-2.6.inc b/meta/conf/machine/include/tosa-2.6.inc new file mode 100644 index 0000000000..35dfb4d1b9 --- /dev/null +++ b/meta/conf/machine/include/tosa-2.6.inc @@ -0,0 +1,6 @@ +include conf/machine/include/zaurus-2.6.inc +# wlan-ng Modules +MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb" + +# WM97xx Modules +#MACHINE_EXTRA_RRECOMMENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" diff --git a/meta/conf/machine/include/tune-arm920t.conf b/meta/conf/machine/include/tune-arm920t.conf deleted file mode 100644 index 373bf46727..0000000000 --- a/meta/conf/machine/include/tune-arm920t.conf +++ /dev/null @@ -1,3 +0,0 @@ -PACKAGE_ARCH = "armv4t" -TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" - diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc new file mode 100644 index 0000000000..373bf46727 --- /dev/null +++ b/meta/conf/machine/include/tune-arm920t.inc @@ -0,0 +1,3 @@ +PACKAGE_ARCH = "armv4t" +TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" + diff --git a/meta/conf/machine/include/tune-arm926ejs.conf b/meta/conf/machine/include/tune-arm926ejs.conf deleted file mode 100644 index 31fe8868ca..0000000000 --- a/meta/conf/machine/include/tune-arm926ejs.conf +++ /dev/null @@ -1,5 +0,0 @@ -# For gcc 3.x you need: -#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" -# For gcc 4.x you need: -TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" -PACKAGE_ARCH = "armv5te" diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc new file mode 100644 index 0000000000..31fe8868ca --- /dev/null +++ b/meta/conf/machine/include/tune-arm926ejs.inc @@ -0,0 +1,5 @@ +# For gcc 3.x you need: +#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" +# For gcc 4.x you need: +TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" +PACKAGE_ARCH = "armv5te" diff --git a/meta/conf/machine/include/tune-arm9tdmi.conf b/meta/conf/machine/include/tune-arm9tdmi.conf deleted file mode 100644 index d097b07739..0000000000 --- a/meta/conf/machine/include/tune-arm9tdmi.conf +++ /dev/null @@ -1,2 +0,0 @@ -PACKAGE_ARCH = "armv4t" -TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc new file mode 100644 index 0000000000..d097b07739 --- /dev/null +++ b/meta/conf/machine/include/tune-arm9tdmi.inc @@ -0,0 +1,2 @@ +PACKAGE_ARCH = "armv4t" +TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" diff --git a/meta/conf/machine/include/tune-c3.conf b/meta/conf/machine/include/tune-c3.conf deleted file mode 100644 index e6a522af10..0000000000 --- a/meta/conf/machine/include/tune-c3.conf +++ /dev/null @@ -1,3 +0,0 @@ -TARGET_CC_ARCH = "-march=c3 -mtune=c3" -PACKAGE_ARCH = "i586" - diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc new file mode 100644 index 0000000000..e6a522af10 --- /dev/null +++ b/meta/conf/machine/include/tune-c3.inc @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-march=c3 -mtune=c3" +PACKAGE_ARCH = "i586" + diff --git a/meta/conf/machine/include/tune-ep9312.conf b/meta/conf/machine/include/tune-ep9312.conf deleted file mode 100644 index 0982cf2a13..0000000000 --- a/meta/conf/machine/include/tune-ep9312.conf +++ /dev/null @@ -1,6 +0,0 @@ -TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" -# add "-mfp=maverick" for newer gcc versions > 4.0 - -#set arch to ep9312 for all generated packages -PACKAGE_ARCH = "ep9312" - diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc new file mode 100644 index 0000000000..0982cf2a13 --- /dev/null +++ b/meta/conf/machine/include/tune-ep9312.inc @@ -0,0 +1,6 @@ +TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" +# add "-mfp=maverick" for newer gcc versions > 4.0 + +#set arch to ep9312 for all generated packages +PACKAGE_ARCH = "ep9312" + diff --git a/meta/conf/machine/include/tune-iwmmxt.conf b/meta/conf/machine/include/tune-iwmmxt.conf deleted file mode 100644 index 8376faca74..0000000000 --- a/meta/conf/machine/include/tune-iwmmxt.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Configurations for the Intel PXA27x Appications Processor Family. -# Please use tune-xscale for PXA255/PXA26x based processors. -TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" -PACKAGE_ARCH = "iwmmxt" -PACKAGE_EXTRA_ARCHS += "iwmmxt" - diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/tune-iwmmxt.inc new file mode 100644 index 0000000000..8376faca74 --- /dev/null +++ b/meta/conf/machine/include/tune-iwmmxt.inc @@ -0,0 +1,6 @@ +# Configurations for the Intel PXA27x Appications Processor Family. +# Please use tune-xscale for PXA255/PXA26x based processors. +TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH = "iwmmxt" +PACKAGE_EXTRA_ARCHS += "iwmmxt" + diff --git a/meta/conf/machine/include/tune-ppc603e.conf b/meta/conf/machine/include/tune-ppc603e.conf deleted file mode 100644 index 7c8714cfc2..0000000000 --- a/meta/conf/machine/include/tune-ppc603e.conf +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-mcpu=603e" -PACKAGE_ARCH = "ppc603e" diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc new file mode 100644 index 0000000000..7c8714cfc2 --- /dev/null +++ b/meta/conf/machine/include/tune-ppc603e.inc @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-mcpu=603e" +PACKAGE_ARCH = "ppc603e" diff --git a/meta/conf/machine/include/tune-ppce500.conf b/meta/conf/machine/include/tune-ppce500.conf deleted file mode 100644 index 11717eba70..0000000000 --- a/meta/conf/machine/include/tune-ppce500.conf +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-mcpu=8540" -PACKAGE_ARCH = "ppce500" diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc new file mode 100644 index 0000000000..11717eba70 --- /dev/null +++ b/meta/conf/machine/include/tune-ppce500.inc @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-mcpu=8540" +PACKAGE_ARCH = "ppce500" diff --git a/meta/conf/machine/include/tune-sh3.conf b/meta/conf/machine/include/tune-sh3.conf deleted file mode 100644 index 192dd8fd22..0000000000 --- a/meta/conf/machine/include/tune-sh3.conf +++ /dev/null @@ -1 +0,0 @@ -TARGET_CC_ARCH = "-ml -m3" diff --git a/meta/conf/machine/include/tune-sh3.inc b/meta/conf/machine/include/tune-sh3.inc new file mode 100644 index 0000000000..192dd8fd22 --- /dev/null +++ b/meta/conf/machine/include/tune-sh3.inc @@ -0,0 +1 @@ +TARGET_CC_ARCH = "-ml -m3" diff --git a/meta/conf/machine/include/tune-sh4.conf b/meta/conf/machine/include/tune-sh4.conf deleted file mode 100644 index 866f7f89d5..0000000000 --- a/meta/conf/machine/include/tune-sh4.conf +++ /dev/null @@ -1 +0,0 @@ -TARGET_CC_ARCH = "-ml -m4" diff --git a/meta/conf/machine/include/tune-sh4.inc b/meta/conf/machine/include/tune-sh4.inc new file mode 100644 index 0000000000..866f7f89d5 --- /dev/null +++ b/meta/conf/machine/include/tune-sh4.inc @@ -0,0 +1 @@ +TARGET_CC_ARCH = "-ml -m4" diff --git a/meta/conf/machine/include/tune-strongarm.conf b/meta/conf/machine/include/tune-strongarm.conf deleted file mode 100644 index 8654c996ef..0000000000 --- a/meta/conf/machine/include/tune-strongarm.conf +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-march=armv4 -mtune=xscale" - diff --git a/meta/conf/machine/include/tune-strongarm.inc b/meta/conf/machine/include/tune-strongarm.inc new file mode 100644 index 0000000000..8654c996ef --- /dev/null +++ b/meta/conf/machine/include/tune-strongarm.inc @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-march=armv4 -mtune=xscale" + diff --git a/meta/conf/machine/include/tune-supersparc.conf b/meta/conf/machine/include/tune-supersparc.conf deleted file mode 100644 index 1b1ec1207f..0000000000 --- a/meta/conf/machine/include/tune-supersparc.conf +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-mcpu=supersparc" -PACKAGE_ARCH = "supersparc" diff --git a/meta/conf/machine/include/tune-supersparc.inc b/meta/conf/machine/include/tune-supersparc.inc new file mode 100644 index 0000000000..1b1ec1207f --- /dev/null +++ b/meta/conf/machine/include/tune-supersparc.inc @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-mcpu=supersparc" +PACKAGE_ARCH = "supersparc" diff --git a/meta/conf/machine/include/tune-xscale.conf b/meta/conf/machine/include/tune-xscale.conf deleted file mode 100644 index 0b98f09fc8..0000000000 --- a/meta/conf/machine/include/tune-xscale.conf +++ /dev/null @@ -1,3 +0,0 @@ -TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" -PACKAGE_ARCH = "armv5te" - diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc new file mode 100644 index 0000000000..0b98f09fc8 --- /dev/null +++ b/meta/conf/machine/include/tune-xscale.inc @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" +PACKAGE_ARCH = "armv5te" + diff --git a/meta/conf/machine/include/zaurus-2.6.conf b/meta/conf/machine/include/zaurus-2.6.conf deleted file mode 100644 index 9eaa6bb2df..0000000000 --- a/meta/conf/machine/include/zaurus-2.6.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Zaurus Clamshell specific configuration for kernel 2.6 -# Don't forget to include zaurus-clamshell.conf as well - -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" -PREFERRED_VERSION_wpa_supplicant = "0.4.7" - -PCMCIA_MANAGER ?= "pcmciautils" - -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen bluetooth" -MACHINE_FEATURES_append_tosa = " usbhost usbwlanng " -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_poodle = "kernel-module-snd-soc-poodle" diff --git a/meta/conf/machine/include/zaurus-2.6.inc b/meta/conf/machine/include/zaurus-2.6.inc new file mode 100644 index 0000000000..681d38770b --- /dev/null +++ b/meta/conf/machine/include/zaurus-2.6.inc @@ -0,0 +1,18 @@ +# Zaurus Clamshell specific configuration for kernel 2.6 +# Don't forget to include zaurus-clamshell.inc as well + +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +PREFERRED_VERSION_wpa_supplicant = "0.4.7" + +PCMCIA_MANAGER ?= "pcmciautils" + +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen bluetooth" +MACHINE_FEATURES_append_tosa = " usbhost usbwlanng " +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_poodle = "kernel-module-snd-soc-poodle" diff --git a/meta/conf/machine/include/zaurus-clamshell.conf b/meta/conf/machine/include/zaurus-clamshell.conf deleted file mode 100644 index f585864c39..0000000000 --- a/meta/conf/machine/include/zaurus-clamshell.conf +++ /dev/null @@ -1,29 +0,0 @@ -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" - -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 \ - -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 \ - ${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.conf - -SERIAL_CONSOLE = "115200 ttyS0" diff --git a/meta/conf/machine/include/zaurus-clamshell.inc b/meta/conf/machine/include/zaurus-clamshell.inc new file mode 100644 index 0000000000..6c8bbfa5dd --- /dev/null +++ b/meta/conf/machine/include/zaurus-clamshell.inc @@ -0,0 +1,30 @@ +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" + +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 \ + -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 \ + ${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" + 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" GUI_MACHINE_CLASS = "bigscreen" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.inc #size of the root partition (yes, it is 123 MB) ROOT_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" GUI_MACHINE_CLASS = "bigscreen" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.inc ROOT_FLASH_SIZE = "174" EXTRA_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 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv5te" -require conf/machine/include/qemu.conf -require conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/qemu.inc +require conf/machine/include/tune-arm926ejs.inc SERIAL_CONSOLE = "115200 ttyAMA0" 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 @@ TARGET_ARCH = "i586" PACKAGE_EXTRA_ARCHS = "x86" -require conf/machine/include/qemu.conf +require conf/machine/include/qemu.inc SERIAL_CONSOLE = "115200 ttyS0" 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 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-2.6.conf +include conf/machine/include/zaurus-clamshell.inc +include conf/machine/include/zaurus-2.6.inc PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" -- cgit 1.2.3-korg