diff options
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/collie.conf | 5 | ||||
| -rw-r--r-- | conf/machine/handheld-common.conf | 4 | ||||
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 14 | ||||
| -rw-r--r-- | conf/machine/nas100d.conf | 149 | ||||
| -rw-r--r-- | conf/machine/nslu2.conf | 6 | ||||
| -rw-r--r-- | conf/machine/simpad.conf | 4 | ||||
| -rw-r--r-- | conf/machine/spitz.conf | 2 | ||||
| -rw-r--r-- | conf/machine/tosa-2.6.conf | 8 | ||||
| -rw-r--r-- | conf/machine/tune-arm926ejs.conf | 3 |
9 files changed, 176 insertions, 19 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 428f47f71e..9384b0527b 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -6,10 +6,11 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support" +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support altboot" BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \ sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor" +kernel-module-usbdcore kernel-module-usbdmonitor \ +altboot" # kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf index 2445ee17a6..dab1d01e70 100644 --- a/conf/machine/handheld-common.conf +++ b/conf/machine/handheld-common.conf @@ -17,8 +17,8 @@ input uinput \ " # Configuration bits for "generic handheld" -BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap network-suspend-scripts" +BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts" BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" INHERIT += "linux_modules" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index b9925852e5..626b5cf218 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -17,9 +17,9 @@ ROOT_FLASH_SIZE = "80" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" -PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \ +PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ - nls_cp437 nls_utf8" + nls_cp437 nls_iso8859-1 nls_utf8" SERIAL_CONSOLE = "115200 ttyS0" @@ -27,15 +27,15 @@ include conf/machine/ipaq-common.conf include conf/machine/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" +GPE_EXTRA_DEPENDS += "gaim" +GPE_EXTRA_INSTALL += "gaim" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/tune-xscale.conf BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ - hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power" + hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" module_autoload_hx4700_power = "hx4700_power" module_autoload_pcmcia = "pcmcia" @@ -45,9 +45,9 @@ module_autoload_mmc_block = "mmc_block" module_autoload_hx4700_ts = "hx4700_ts" module_autoload_hx4700_navpt = "hx4700_navpt" module_autoload_hx4700_bt = "hx4700_bt" -module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700" +module_autoload_snd-hx4700_audio = "snd-hx4700_audio" module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_snd-pcm-oss = "snd-mixer-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_pxa27x_udc = "pxa27x_udc" #FIXME: this should be controlled by a userspace utility later. diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf new file mode 100644 index 0000000000..aa37f0920d --- /dev/null +++ b/conf/machine/nas100d.conf @@ -0,0 +1,149 @@ +#@TYPE: Machine +#@NAME: Iomega NAS 100d +#@DESCRIPTION: Machine configuration for the Iomega NAS 100d product + +#------------------------------------------------------------------------------- +# 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" +# <possible values> +# description + +ARCH_BYTE_SEX = "be" +# "be" "le" +# The memory byte sex and (on correctly implemented hardware - the NAS100D 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 = "" +# "" ":<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. + +#------------------------------------------------------------------------------- +# 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 :<base>, :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}:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}" + +# 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']}" + +# PACKAGE_ARCH +# 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']}" +PACKAGE_ARCH_BASE = "${@['armv5te', 'thumbv5t'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" +PACKAGE_ARCH = "${PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}" + +# IPKG_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). +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}" +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} ${IPKG_ARCHS} ${MACHINE}" +# +# This is a priority ordered list - most desireable architecture at the end, +# so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if +# THUMB_INTERWORK precede this with the other architectures. +IPKG_ARCHS = "${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ + (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \ + + (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')}" + +#------------------------------------------------------------------------------- +# Miscellany +#------------------------------------------------------------------------------- +# The correct settings for the NAS100D board: +SERIAL_CONSOLE = "115200 ttyS0" +KERNEL_CONSOLE = "ttyS0,115200n8" +USE_VT = "0" + +#------------------------------------------------------------------------------- +# Package versions +#------------------------------------------------------------------------------- +CVSDATE_gnu-config ?= "20050713" +CVSDATE_gnu-config-native ?= "20050713" +CVSDATE_ipkg-utils ?= "20050713" +CVSDATE_ipkg-utils-native ?= "20050713" +CVSDATE_ipkg-link ?= "20050713" +CVSDATE_irssi ?= "20050930" + +CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" +INHERIT += "nslu2-mirrors" + +PREFERRED_VERSION_ipkg ?= "0.99.152" +PREFERRED_VERSION_ipkg-native ?= "0.99.152" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index d0f089be2a..be85a82048 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -44,6 +44,12 @@ DISTRO_BASE = "" # after ${DISTRO}, this allows different distros to share a common base of # overrides. The value given must include a leading ':' or chaos will result. +N2K_SUFFIX = "nslu2${ARCH_BYTE_SEX}" +# <string> +# Kernel suffix - 'nslu2be' or 'nslu2le' 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 #------------------------------------------------------------------------------- diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 02cabf20f7..56cc2c0852 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -43,8 +43,8 @@ USE_DEVFS = "1" GUI_MACHINE_CLASS = "bigscreen" ROOT_FLASH_SIZE = "24" USE_VT = "0" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" +GPE_EXTRA_DEPENDS += "gaim sylpheed suspend-desktop" +GPE_EXTRA_INSTALL += "gaim sylpheed suspend-desktop" include conf/machine/handheld-common.conf include conf/machine/tune-strongarm.conf diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 79ce0c4193..9a53e8f1a9 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -13,7 +13,7 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += "" # Useful things for the built-in Harddisk BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs" -BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" +BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs" IMAGE_FSTYPES = "jffs2 tar.gz" diff --git a/conf/machine/tosa-2.6.conf b/conf/machine/tosa-2.6.conf index d21c6097fa..5455e3f0d5 100644 --- a/conf/machine/tosa-2.6.conf +++ b/conf/machine/tosa-2.6.conf @@ -6,9 +6,9 @@ module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97" module_autoload_snd-pcm-oss ="snd-pcm-oss" # WM97xx Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" -#module_autoload_wm9705 = "wm9705" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" +module_autoload_wm9705 = "wm9705" #module_autoload_pxa-wm97xx = "pen_int=0" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx" -module_autoload_wm97xx = "wm97xx" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx" +#module_autoload_wm97xx = "wm97xx" diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/tune-arm926ejs.conf index 563586c902..5e2f6b7c62 100644 --- a/conf/machine/tune-arm926ejs.conf +++ b/conf/machine/tune-arm926ejs.conf @@ -1,2 +1,3 @@ -TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" +#if gcc breaks change arm926ejs to arm926ej-s +TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" PACKAGE_ARCH = "armv5te" |