diff options
Diffstat (limited to 'conf')
32 files changed, 157 insertions, 45 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 57d167505b..fe5b326a05 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -158,6 +158,7 @@ STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader" +STAGING_FIRMWARE_DIR = "${STAGING_DIR}/${HOST_SYS}/firmware" STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" DEPLOY_DIR = "${TMPDIR}/deploy" @@ -358,7 +359,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}" # a RCS, which freaks out those special folks with active Perforce clients # the following makes patch ignore RCS: -export PATCH_GET=0 +export PATCH_GET="0" # Program to be used to build ipkg packages diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf index 66dc4fb0a6..362e6e5a30 100644 --- a/conf/distro/amsdelta-oe.conf +++ b/conf/distro/amsdelta-oe.conf @@ -21,8 +21,8 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDER_virtual/libiconv=glibc -PREFERRED_PROVIDER_virtual/libintl=glibc +PREFERRED_PROVIDER_virtual/libiconv="glibc" +PREFERRED_PROVIDER_virtual/libintl="glibc" # The CSL compiler is unusable because # 1) certain programs stop to compile diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 91b2729554..5e7ce0d40c 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.1" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "6" +DISTRO_REVISION = "9" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -19,11 +19,12 @@ DISTRO_TYPE = "debug" #Set the right arch for the feeds #Alphabetically sorted -FEED_ARCH ?= ${TARGET_ARCH} +FEED_ARCH ?= "${TARGET_ARCH}" #armv4t machines FEED_ARCH_ep93xx = "armv4t" +FEED_ARCH_h6300 = "armv4t" #armv5t machines @@ -36,6 +37,8 @@ FEED_ARCH_h5xxx = "armv5te" FEED_ARCH_htcuniversal = "armv5te" FEED_ARCH_hx2000 = "armv5te" FEED_ARCH_hx4700 = "armv5te" +FEED_ARCH_ixp4xx = "armv5te" +FEED_ARCH_magician = "armv5te" FEED_ARCH_netbook-pro = "armv5te" FEED_ARCH_nokia770 = "armv5te" FEED_ARCH_poodle = "armv5te" @@ -62,7 +65,7 @@ FEED_URIS += " \ #SRCDATE = "20061029" PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7" -PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh1+cvs${SRCDATE}" +PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh2" PREFERRED_PROVIDER_hostap-modules_ipaq-pxa270 = "hostap-modules" @@ -94,6 +97,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" +PREFERRED_VERSION_gtk+ = "2.10.6" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" @@ -115,7 +119,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" # Virtuals: PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" -PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" @@ -128,6 +132,10 @@ PREFERRED_PROVIDER_ntp = "ntp" PREFERRED_PROVIDER_hotplug = "udev" PREFERRED_PROVIDER_libxss = "libxss" +#Machine related toolchain stuff +ARCH_BYTE_SEX_ixp4xx = "le" + + #EABI stuff PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" @@ -141,10 +149,14 @@ PREFERRED_VERSION_gcc ?= "4.1.1" PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" + PREFERRED_VERSION_binutils ?= "2.17.50.0.5" PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5" + +PREFERRED_VERSION_linux-libc-headers_guinness ?= "2.6.18" PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" + PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index e28fb85d88..e86ffa028c 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "debianslug" SLUGOS_IMAGESEX = "little-endian" # debianslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "yes" +SLUGOS_FLASH_IMAGE = "nslu2" # NOTE: to build new packages set DEBIANSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see debianslug-packages.conf in this diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 3bb5df5496..27c0437cf5 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -71,7 +71,7 @@ require conf/distro/include/sane-srcdates.inc # Framebuffer & X # PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -PREFERRED_PROVIDER_tslib ?= tslib +PREFERRED_PROVIDER_tslib ?= "tslib" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc # diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 96d42f8a93..149b8ed9d8 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -4,6 +4,8 @@ PREFERRED_PROVIDER_virtual/libc = "uclibc" PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +USE_NLS ?= "no" + TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" #mess with compiler flags to use -Os instead of -O2 diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 48915e6554..3bf87abdb6 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -28,13 +28,21 @@ INHERIT += "package_ipk debian multimachine sanity" PREFERRED_PROVIDER_qemu-native = "qemu-native" ENABLE_BINARY_LOCALE_GENERATION ?= "1" +#qemu doesn't like armv6/eabi/vfp +ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0" + #ARM EABI is softfloat by default, but let's make sure :) #make it overridable for platforms with FPU, like ep93xx or i.mx31 TARGET_FPU_arm ?= "soft" +TARGET_FPU_ixp4xx ?= "soft" + + +#Make a LE jffs2 image +SLUGOS_IMAGESEX = "little-endian" #Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" -DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # Angstrom *always* has some form of release config, so error out if someone thinks he knows better DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc index 256bc0103f..9eb5b90abb 100644 --- a/conf/distro/include/preferred-gpe-versions-2.6.inc +++ b/conf/distro/include/preferred-gpe-versions-2.6.inc @@ -3,13 +3,13 @@ # #work around some breakages -SRCDATE_xserver-kdrive=20050207 -SRCDATE_minimo=20050401 -SRCDATE_cairo=20050330 -SRCDATE_xext=20050222 +SRCDATE_xserver-kdrive="20050207" +SRCDATE_minimo="20050401" +SRCDATE_cairo="20050330" +SRCDATE_xext="20050222" #set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus +PREFERRED_PROVIDER_gconf="gconf-dbus" #specify versions, as the header says :) PREFERRED_VERSION_libmatchbox ?= "1.6" diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc index 56d9c5b059..662dfc386f 100644 --- a/conf/distro/include/preferred-gpe-versions-2.7.inc +++ b/conf/distro/include/preferred-gpe-versions-2.7.inc @@ -6,8 +6,8 @@ #SRCDATE_minimo=20050401 #set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus -PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus +PREFERRED_PROVIDER_gconf="gconf-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" #specify versions, as the header says :) PREFERRED_VERSION_libmatchbox ?= "1.7" diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index 9c9be528df..bf00aa8d01 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -3,8 +3,8 @@ # #set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus -PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus +PREFERRED_PROVIDER_gconf="gconf-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc index e78888a02c..7d4efea06e 100644 --- a/conf/distro/include/preferred-gpe-versions.inc +++ b/conf/distro/include/preferred-gpe-versions.inc @@ -6,8 +6,8 @@ #SRCDATE_xext=20050222 #set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus -PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus +PREFERRED_PROVIDER_gconf="gconf-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" #specify versions, as the header says :) #PREFERRED_VERSION_libmatchbox ?= "1.6" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index d000bf4a92..2a6676db58 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -54,6 +54,7 @@ SRCDATE_dvbtraffic ?= "20060814" SRCDATE_dvbtune ?= "20060814" SRCDATE_fdclock ?= "20060814" SRCDATE_fltk ?= "20060814" +SRCDATE_ipatience ?= "20061112" SRCDATE_ipkg-link ?= "20050930" SRCDATE_ipkg-link-1 ?= "20050930" SRCDATE_ipkg-utils ?= "20050930" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index e015314d92..299944ee29 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -113,8 +113,9 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) CMDLINE_DEBUG = "noirqdebug" -# Building a full image. If you set SLUGOS_FLASH_IMAGE to "yes" a complete -# 8MByte flash image will be built after the rootfs JFFS2 image. +# Building a full image. If you set SLUGOS_FLASH_IMAGE to "nslu2" a complete +# 8MByte flash image will be built after the rootfs JFFS2 image. Other options +# may later be defined for other vendor-flashable image types. # # If you do this you will need to find a source for the LinkSys software to be # placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch @@ -170,7 +171,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.18" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19-rc5" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index e3f669e9a2..2390106023 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -90,9 +90,7 @@ TARGET_OS = "linux" #<>What we want on the bootstrap image (extra) #<> #<>------------------------------------------------------------------< -BOOTSTRAP_EXTRA_RDEPENDS += "ncurses nano wireless-tools console-tools \ - udev e2tools e2fsprogs kernel-modules keymaps \ - wget links" +DISTRO_EXTRA_RDEPENDS += "" #<>------------------------------------------------------------------> @@ -113,7 +111,7 @@ PCMCIA_MANAGER = "pcmciautils" #<>------------------------------------------------------------------> #<> We are using gcc 4.1.1 so lets keep optimizations low #<>------------------------------------------------------------------< -FULL_OPTIMIZATION = "-O1" +FULL_OPTIMIZATION = "-O2" #<>------------------------------------------------------------------> diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index b4875dc37b..19379862ae 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -36,7 +36,7 @@ BBINCLUDELOGS = "yes" MODUTILS = "26" IMAGE_FSTYPES = "tar.bz2" -BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \ +BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \ kernel-module-3c574-cs kernel-module-3c589-cs kernel-module-8390 \ kernel-module-airo-cs kernel-module-airo console-tools \ kernel-module-arlan \ diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 1c76ef870b..0d21488bb0 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -20,12 +20,18 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" PREFERRED_PROVIDERS += " virtual/libx11:diet-x11" PREFERRED_PROVIDERS += " python:python-curses" +PREFERRED_PROVIDER_classpath = "classpath-minimal" TARGET_FPU = "soft" SRCDATE := "20050527" PREFERRED_VERSION_glibc = "2.3.3" +PREFERRED_VERSION_shorewall = "2.0.9-monolithic" +PREFERRED_VERSION_ppp-dsl = "0.1-monolithic" +PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20041113" +PREFERRED_VERSION_kismet = "2005-01-R1" + PREFERRED_VERSION_gcc-cross-initial = "3.3.4" PREFERRED_VERSION_gcc-cross = "3.3.4" PREFERRED_VERSION_gcc-cross-sdk = "3.3.4" @@ -33,13 +39,30 @@ PREFERRED_VERSION_gcc = "3.3.4" PREFERRED_VERSION_binutils-cross = "2.14.90.0.7" PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7" PREFERRED_VERSION_binutils = "2.16" -PREFERRED_VERSION_shorewall = "2.0.9-monolithic" -PREFERRED_VERSION_ppp-dsl = "0.1-monolithic" -PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20041113" -PREFERRED_VERSION_kismet = "2005-01-R1" PREFERRED_VERSION_prism54-firmware = "1.0.3.0" +KERNEL_VERSION_mtx-1 = "2.4.27" +KERNEL_VERSION_mtx-2 = "2.4.27" + +PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627" +PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4" +PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4" +PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4" +PREFERRED_VERSION_gcc_mtx-3 = "3.4.4" +### did not compile with: +#PREFERRED_VERSION_binutils-cross_mtx-3 = "2.16.91.0.7" +#PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.16.91.0.7" +### falling back to: +PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1" +PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1" +PREFERRED_VERSION_binutils_mtx-3 = "2.16" + +PREFERRED_VERSION_udev = "089" + +KERNEL_VERSION_mtx-3 = "2.6.15.4" + + # usually overrrided from local.conf NYLON_RELEASE = "unstable" @@ -53,7 +76,6 @@ export FEED_URIS = " \ # image names DISTRO_VERSION = "${NYLON_VERSION}" BUILDNAME := "${NYLON_VERSION}" -KERNEL_VERSION = "2.4.27" #this does not work: ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')} IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf index 0366998e79..7452c26eaa 100644 --- a/conf/distro/openslug-native.conf +++ b/conf/distro/openslug-native.conf @@ -16,5 +16,5 @@ ASSUME_PROVIDED = "libtool-cross \ " # Our build host is armeb, not armv5eb that the kernel reports -BUILD_ARCH = armeb +BUILD_ARCH = "armeb" diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index d5ceeee105..c24001f3f4 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "openslug" SLUGOS_IMAGESEX = "big-endian" # openslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "yes" +SLUGOS_FLASH_IMAGE = "nslu2" # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see ucslugc-packages.conf in this diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index b1080d1fea..10f00b7604 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -33,7 +33,7 @@ SRCDATE ?= "20060701" ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" PREFERRED_PROVIDER_hostap-conf = "hostap-conf" PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_tslib ?= tslib +PREFERRED_PROVIDER_tslib ?= "tslib" KERNEL_CONSOLE = "ttyS0" #DEBUG_OPTIMIZATION = "-O -g3" diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf index 443b70c5de..85afdc85f4 100644 --- a/conf/machine/amsdelta.conf +++ b/conf/machine/amsdelta.conf @@ -19,7 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" GUI_MACHINE_CLASS="smallscreen" -PREFERRED_VERSION_u-boot = 1.1.4 +PREFERRED_VERSION_u-boot = "1.1.4" TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 3f3b2f916e..1ea4a68639 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" -TARGET_ARCH = arm +TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index cc242dc682..8a6cee312c 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -26,7 +26,7 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -MACHINE_EXTRA_RDEPENDS = "mtd-utils h2200-bootloader kernel" +MACHINE_EXTRA_RDEPENDS = "h2200-bootloader" EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" # diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index d2e7306c46..941d08c013 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -29,5 +29,5 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ # # Modules autoload and other boot properties # -SERIAL_CONSOLE = "115200 tts/0 vt100" +SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index bffe1a97e1..8cce5f61b9 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -7,7 +7,7 @@ # TARGET_ARCH = "arm" PACKAGE_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4" +IPKG_EXTRA_ARCHS = "arm armv4 armv4t" #Use OMAP 1510 cpu specifig arm9tdmi options for gcc require conf/machine/include/tune-arm9tdmi.conf diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index b0c962c1d0..da2e466425 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" -#PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" +PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" PREFERRED_VERSION_orinoco-modules = "0.15rc1" diff --git a/conf/machine/include/tune-arm9tdmi.conf b/conf/machine/include/tune-arm9tdmi.conf index cfc3bad1c1..d097b07739 100644 --- a/conf/machine/include/tune-arm9tdmi.conf +++ b/conf/machine/include/tune-arm9tdmi.conf @@ -1 +1,2 @@ +PACKAGE_ARCH = "armv4t" TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf index c088485fcc..c3e56067cd 100644 --- a/conf/machine/ixp4xx.conf +++ b/conf/machine/ixp4xx.conf @@ -2,4 +2,8 @@ #@NAME: Generic IXP4XX kernel #@DESCRIPTION: Machine configuration for a generic ixp4xx board +MACHINE_FEATURES = "kernel26 usbhost ext2" + include conf/machine/include/ixp4xx.conf + +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}" diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 2bf6cc2d8e..cd943f7e65 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -4,7 +4,7 @@ UBOOT_MACHINE = "Lite5200" SERIAL_CONSOLE="38400 ttyS0" -TARGET_PREFIX = powerpc-603e-linux-gnu- +TARGET_PREFIX = "powerpc-603e-linux-gnu-" IMAGE_FSTYPES = "jffs2 tar.bz2" diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf new file mode 100644 index 0000000000..bdd39ab57f --- /dev/null +++ b/conf/machine/mtx-3.conf @@ -0,0 +1,36 @@ +#@TYPE: Machine +#@NAME: 4G Systems mtx-3 +#@DESCRIPTION: Machine configuration for the mtx-3 (aka SurfBox 3rd generation) + +# hint: the mtx-3 architecture is still in experimental state, no hardware +# is yet available for it + +# TARGET_ARCH should be set here in the machine configuration. +# For compiling the kernel, ARCH will be derived form it by kernel-arch.bbclass +TARGET_ARCH = "arm" + +IPKG_ARCHS = "all arm ${MACHINE}" + +PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3" + +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" + +TARGET_CC_ARCH = "-march=armv5te" +#-mtune=arm926ejs" + +USE_DEVFS = "1" +USE_VT = "0" +SERIAL_CONSOLE = "115200 ttyS0 vt100" + +BOOTSTRAP_EXTRA_RDEPENDS += "" + +#PREFERRED_VERSION_yamon = "2.24" + + +# FIXME: old srec files as mtx-2 used to do it ... this may need to get adapted sometime! + +# create srec files +#IMAGE_POSTPROCESS_COMMAND += "\ +# ${TARGET_PREFIX}objcopy -O srec -I binary --adjust-vma 0xbe000000 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.srec; \ +# grep -v S7 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.srec > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.srec; \ +# grep -v S0 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.srec >> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.srec; " diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf index ad6de78f56..4b3fff7061 100644 --- a/conf/machine/mx31ads.conf +++ b/conf/machine/mx31ads.conf @@ -5,8 +5,10 @@ TARGET_ARCH = "arm" TARGET_FPU_arm = "hard" +MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget" + GUI_MACHINE_CLASS = "smallscreen" -IPKG_EXTRA_ARCHS = "armv6" +IPKG_EXTRA_ARCHS = "arm armv4t armv5te armv6" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" diff --git a/conf/machine/navman-icn330.conf b/conf/machine/navman-icn330.conf index fa1cbbaaf4..79bafd1230 100644 --- a/conf/machine/navman-icn330.conf +++ b/conf/machine/navman-icn330.conf @@ -18,6 +18,7 @@ VOLATILE_STORAGE_SIZE = "32" GUI_MACHINE_CLASS = "smallscreen" #Set features for task-base +# touchscreen is not confirmed MACHINE_FEATURES = "kernel26 touchscreen apm alsa usbgadget" # diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf new file mode 100644 index 0000000000..35a31aa00b --- /dev/null +++ b/conf/machine/palmld.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: Palm LifeDrive +#@DESCRIPTION: Machine configuration for the Palm LifeDrive + +TARGET_ARCH = "arm" +IPKG_EXTRA_ARCHS = "arm armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "hackndev-2.6trunk" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" + +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda wifi ext2 usbgadget" + +ROOT_FLASH_SIZE = "100" + +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/tune-xscale.conf + +module_autoload_sa1100-rtc = "sa1100-rtc" |