diff options
Diffstat (limited to 'conf')
52 files changed, 496 insertions, 468 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 02a072ca66..e63bdfc54e 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -188,12 +188,14 @@ IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.r IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" +IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ." IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." EXTRA_IMAGECMD = "" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" EXTRA_IMAGECMD_squashfs = "-le -b 16384" +EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384" IMAGE_ROOTFS_SIZE_ext2 = "65536" IMAGE_ROOTFS_SIZE_ext2.gz = "65536" @@ -203,6 +205,7 @@ IMAGE_DEPENDS_cramfs = "cramfs-native" IMAGE_DEPENDS_ext2 = "genext2fs-native" IMAGE_DEPENDS_ext2.gz = "genext2fs-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" +IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native" EXTRA_IMAGEDEPENDS = "" ################################################################## @@ -313,7 +316,8 @@ export palmqtdir = "/opt/QtPalmtop" GNU_MIRROR = "ftp://ftp.gnu.org/gnu" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge" -GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source" +GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" +GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}" XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" XORG_MIRROR = "http://xorg.freedesktop.org/releases" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 6722addad7..4c3ff695f6 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -6,8 +6,9 @@ #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- -#DISTRO_VERSION = "2006.9" +#DISTRO_VERSION = "2007.1" DISTRO_VERSION = "test-${DATE}" +DISTRO_REVISION = "3" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -16,6 +17,7 @@ DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" FEED_URIS += " \ + no-arch##${ANGSTROM_URI}/unstable/feed/all \ base##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/base \ perl##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/perl \ python##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/python \ @@ -26,9 +28,9 @@ FEED_URIS += " \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/updates" #SRCDATE = "20060630" -#SRCDATE_handhelds-pxa-2.6 = "20060622" -PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh5" -PREFERRED_VERSION_handhelds-pxa-2.6_htcuniversal = "2.6.17-hh1+cvs${SRCDATE}" +#SRCDATE_linux-handhelds-2.6 = "20060622" +PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7" +PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh1+cvs${SRCDATE}" PREFERRED_PROVIDER_hostap-modules_ipaq-pxa270 = "hostap-modules" @@ -36,11 +38,9 @@ PREFERRED_PROVIDER_hostap-modules_ipaq-pxa270 = "hostap-modules" SRCDATE_gconf-dbus = "20060719" SRCDATE_gnome-vfs-dbus = "20060803" -PREFERRED_VERSION_qemu-native = "0.8.2" - CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ -http://www.oesources.org/source/current/" +" # Opie #use 1337 mt version of opie to have a webbrowser @@ -112,9 +112,9 @@ PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "ucli PREFERRED_VERSION_gcc ?= "4.1.1" PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.17" -PREFERRED_VERSION_binutils-cross ?= "2.17" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" +PREFERRED_VERSION_binutils ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" @@ -139,20 +139,8 @@ PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" PREFERRED_VERSION_hostap-modules ?= "0.4.7" #Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff -# c7x0, akita, spitz, nokia770, h2200, h6300, ipaq-pxa270, simpad - -#### Bootstrap options #### +# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad -PCMCIA_MANAGER_c7x0 = "pcmciautils" -PCMCIA_MANAGER_akita = "pcmciautils" -PCMCIA_MANAGER_spitz = "pcmciautils" -PCMCIA_MANAGER_tosa = "pcmciautils" -PCMCIA_MANAGER_poodle = "pcmciautils" -PCMCIA_MANAGER_nokia770 = "pcmciautils" -PCMCIA_MANAGER_h2200 = "pcmciautils" -PCMCIA_MANAGER_h4000 = "pcmciautils" -PCMCIA_MANAGER_h6300 = "pcmciautils" -PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" # add altboot to compatible models, will be replaced with angstrom-bootmanager #EXTRA_STUFF_append_c7x0 = "altboot" @@ -161,20 +149,27 @@ PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" #EXTRA_STUFF_append_poodle = "altboot" #EXTRA_STUFF_append_tosa = "altboot" -### GPE section ### -#Install libgtkinput in devices without a keyboard -GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" -GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" -GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput" -GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" -GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" -GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" +# do some task-base stuff here + +# We want to ship extra debug utils in the rootfs when doing a debug build +DEBUG_APPS ?= "" +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}' + +#this should go away soon +EXTRA_STUFF ?= "" -#As soon as a kill switch is in place we can add it to devices with a keyboard -#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput" -#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" -#GPE_EXTRA_INSTALL_append_akita = " libgtkinput" -#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" +# Angstrom want to ship some extra stuff. This should be moved into task-base eventually +DISTRO_EXTRA_RDEPENDS = "\ + update-modules module-init-tools modutils-initscripts \ + sysvinit initscripts sysvinit-pidof \ + psplash \ + netbase dropbear \ + angstrom-version \ + ipkg ipkg-collateral \ + util-linux-mount util-linux-umount \ + ${EXTRA_STUFF} \ + ${DEBUG_APPS} \ + " diff --git a/conf/distro/celinux-test.conf b/conf/distro/celinux-test.conf new file mode 100644 index 0000000000..03dcd22d79 --- /dev/null +++ b/conf/distro/celinux-test.conf @@ -0,0 +1,88 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: CELF Linux test +#@DESCRIPTION: A Linux Distribution for the CELF test project +#@-------------------------------------------------------------------- + +# +# core distro settings +# + +# we want IPKG packages and Debian style naming +INHERIT += " package_ipk debian" + +# enable if build for many machines +#INHERIT += " multimachine" + +# we want images supporting the following features (for task-base) +DISTRO_FEATURES = "nfs pcmcia usbhost" + +# enable if you want ltp in bootstrap images +#DISTRO_EXTRA_RDEPENDS = "ltp" + +DISTRO_VERSION = "${DATE}" + +# DISTRO_TYPE control behaviour of some recipes +# dropbear allow password-less root logins for "debug" +# kernel can be set to export logs to screen/serial +DISTRO_TYPE = "debug" +# DISTRO_TYPE = "release" + +# fixed SRCDATE for many packages +require conf/distro/include/sane-srcdates.inc + +# fix it to one date but allow to override in local.conf if needed +SRCDATE ?= "20060927" + +# +# toolchain +# +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_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" + +PREFERRED_VERSION_binutils = "2.16" +PREFERRED_VERSION_binutils-cross = "2.16" + +PREFERRED_VERSION_gcc = "3.4.4" +PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4" + +PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" + +# glibc provides iconv and intl +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" + +# +# omap5912osk settings +# + +# use latest booting kernel but allow to override it in local.conf +PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18-omap1" + +# gcc 3.x use other -mtune name then gcc 4.x +TARGET_CC_ARCH_omap5912osk = "-march=armv5te -mtune=arm926ejs" + +# 2.6.18 kernel does not support pcmcia-cs ioctl() calls +PCMCIA_MANAGER = "pcmciautils" + +# +# target system settings +# +TARGET_OS = "linux" + +# use softfloat binaries to gain speed on ARM machines +TARGET_FPU_arm = "soft" + +# +# extra checking for needed tools +# + +# set minimal version of BitBake needed +BB_MIN_VERSION = "1.6.0" + +# check for required tools and minimal BitBake version +INHERIT += "sanity" diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf deleted file mode 100644 index 80fd25ae19..0000000000 --- a/conf/distro/generic-unstable.conf +++ /dev/null @@ -1,72 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Bleeding Edge -#@DESCRIPTION: An experimental distribution configuration -#@-------------------------------------------------------------------- - -# -# Header -# -DISTRO_NAME = "generic-unstable-glibc" -DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" -#DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" - -# -# Naming schemes -# -PARALLEL_INSTALL_MODULES = "1" -INHERIT += "debian multimachine" - -# -# Packaging and output format -# -INHERIT += "package_ipk" -IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" - -# -# Binutils & Compiler -# -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" - -# -# Target OS & FPU system -# -TARGET_OS = "linux" -TARGET_FPU_arm = "soft" -TARGET_FPU_armeb = "soft" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_VERSION_glibc = "2.4" -PREFERRED_VERSION_glibc-intermediate = "2.4" - -# -# Bootstrap & Init -# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -# -# Framebuffer & X -# -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -PREFERRED_PROVIDER_tslib ?= tslib - -# -# GPE -# -require conf/distro/include/preferred-gpe-versions.inc - -# -# Opie -# -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QTE = "yes" -require conf/distro/include/preferred-opie-versions.inc - -# -# Enlightenment -# -require conf/distro/include/preferred-e-versions.inc diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 08520f0dfe..3bb5df5496 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -29,17 +29,23 @@ INHERIT += "package_ipk" IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" # +# Kernel +# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +# # Binutils & Compiler # 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_VERSION_gcc = "3.4.4" -PREFERRED_VERSION_gcc-cross = "3.4.4" -PREFERRED_VERSION_gcc-cross-initial = "3.4.4" -PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" -PREFERRED_VERSION_binutils = "2.15.94.0.1" +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "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" # # Target OS & FPU system @@ -49,7 +55,11 @@ TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" +PREFERRED_VERSION_glibc ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" # # Bootstrap & Init diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 61d14407c8..6ee509759e 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -1,7 +1,7 @@ # glibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc ?= "glibc" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 0c5186c3a8..48915e6554 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -22,7 +22,7 @@ MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>" #use ipkg package format with debian style naming #use multimachine buildrules -INHERIT += "package_ipk debian multimachine" +INHERIT += "package_ipk debian multimachine sanity" #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable PREFERRED_PROVIDER_qemu-native = "qemu-native" diff --git a/conf/distro/include/preferred-x-versions-pre-X11R7.inc b/conf/distro/include/preferred-x-versions-pre-X11R7.inc deleted file mode 100644 index 240f2cddcd..0000000000 --- a/conf/distro/include/preferred-x-versions-pre-X11R7.inc +++ /dev/null @@ -1,44 +0,0 @@ -# -# Specify to build old/old CVS versions of X libraries and apps -# - -PREFERRED_VERSION_xproto = "0.0+cvs${SRCDATE}" - -PREFERRED_VERSION_diet-x11 = "6.2.1+cvs${SRCDATE}" -PREFERRED_VERSION_libice = "6.3.3" -PREFERRED_VERSION_libsm = "6.0.3" -PREFERRED_VERSION_libx11 = "6.2.1+cvs${SRCDATE}" -PREFERRED_VERSION_libxau = "0.1.1" -PREFERRED_VERSION_libxaw = "7.0.2" -PREFERRED_VERSION_libxcomposite = "1.0.1" -PREFERRED_VERSION_libxcursor = "1.1.2" -PREFERRED_VERSION_libxdamage = "1.0.1" -PREFERRED_VERSION_libxdmcp = "0.1.3" -PREFERRED_VERSION_libxext = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxfixes = "2.0.1" -PREFERRED_VERSION_libxfont = "1.4.2" -PREFERRED_VERSION_libxft = "2.1.6" -PREFERRED_VERSION_libxi = "6.0.1" -PREFERRED_VERSION_libxinerama = "1.0.2+cvs20050505" -PREFERRED_VERSION_libxkbfile = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxmu = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxp = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxpm = "3.5.1" -PREFERRED_VERSION_libxrandr = "1.0.2" -PREFERRED_VERSION_libxrender = "0.8.4" -PREFERRED_VERSION_libxres = "1.0.1" -PREFERRED_VERSION_libxss = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxt = "0.1.5" -PREFERRED_VERSION_libxtst = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxv = "2.2.2+cvs20040918" -PREFERRED_VERSION_libxxf86dga = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxxf86vm = "0.0+cvs${SRCDATE}" - -PREFERRED_VERSION_xcalibrate = "0.0+cvs20060312" -PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" - -PREFERRED_VERSION_xdpyinfo = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_xev = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_xhost = "0.0+cvs20040413" -PREFERRED_VERSION_xmodmap = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_xrandr = "0.0+cvs${SRCDATE}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index a1132209ad..d000bf4a92 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -59,7 +59,7 @@ SRCDATE_ipkg-link-1 ?= "20050930" SRCDATE_ipkg-utils ?= "20050930" SRCDATE_ipkg-utils-native ?= "20050930" SRCDATE_kaffe-qt ?= "20060814" -SRCDATE_kbdd ?= "20060814" +SRCDATE_kbdd ?= "20061019" SRCDATE_led ?= "20060814" SRCDATE_linux-input ?= "20060814" SRCDATE_madwifi-modules ?= "20060814" @@ -68,7 +68,7 @@ SRCDATE_minimo ?= "20050401" SRCDATE_mystun-server ?= "20060814" SRCDATE_olsrd ?= "20060814" SRCDATE_opencvs ?= "20060814" -SRCDATE_oprofile ?= "20060214" +SRCDATE_oprofile ?= "20061011" SRCDATE_portaudio ?= "20060814" SRCDATE_putty ?= "20060814" SRCDATE_python-cairo ?= "20060814" diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index b4dde3d0e2..1c76ef870b 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -12,7 +12,7 @@ # Bruno Randolf <bruno.randolf@4g-systems.biz> INHERIT += "package_ipk debian nylon-mirrors" -INHERIT += "linux_modules" +INHERIT += "linux-kernel-base" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index 4502422021..0c864db04f 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -9,8 +9,6 @@ TARGET_FPU ?= "soft" # 2.4 vs 2.6 is a distro decision. MODUTILS = "26" -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - PREFERRED_PROVIDER_hotplug = "udev" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" @@ -22,16 +20,32 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +# Use current git until I can find a git tag that builds for omap5912osk +PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18+git" +#PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2" + #use EABI toolchain PREFERRED_VERSION_gcc ?= "4.1.1" PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.17" -PREFERRED_VERSION_binutils-cross ?= "2.17" +PREFERRED_VERSION_binutils ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" +PREFERRED_VERSION_glibc ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" + +#PREFERRED_VERSION_gcc ?= "4.1.1" +#PREFERRED_VERSION_gcc-cross ?= "4.1.1" +#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" +#PREFERRED_VERSION_binutils ?= "2.17" +#PREFERRED_VERSION_binutils-cross ?= "2.17" +#PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +#PREFERRED_VERSION_glibc ?= "2.4" +#PREFERRED_VERSION_glibc-intermediate ?= "2.4" # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs pcmcia usbhost" +DISTRO_FEATURES = "nfs pcmcia usbhost alsa" + +PCMCIA_MANAGER = "pcmciautils" + diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 51922b8ad4..b1080d1fea 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -8,8 +8,7 @@ DISTRO_VERSION = ".dev-snapshot-${DATE}" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ -http://www.oesources.org/source/current/" - +" require conf/distro/include/sane-srcdates.inc require conf/distro/include/openzaurus.inc @@ -55,6 +54,11 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_VERSION_binutils-cross = "2.16" PREFERRED_VERSION_binutils = "2.16" +PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" +PREFERRED_VERSION_gcc = "3.4.4" +PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4" + # # Opie # diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 1395f09a7e..9d4fd4c338 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -1,11 +1,11 @@ #@TYPE: Distribution #@NAME: SharpROM #@DESCRIPTION: Distribution configuration for SharpROM (Zaurus) compatible packages -#@MENTOR: Michael 'Mickey' Lauer <mickey@Vanille.de> -#@REQUIREMENTS: A prebuilt SharpROM Embedix Toolchain in your PATH. +#@MENTOR: None +#@REQUIREMENTS: A prebuilt SharpROM Embedix Toolchain in /usr/local/arm/2.95.3 #@REQUIREMENTS: Rename arm-linux-gcc|g++ to arm-linux-gcc-2.95 and rename arm-linux-ld to arm-linux-ld-2.11.2. -INHERIT += " package_ipk debian sharprom" +INHERIT += " package_ipk debian" # # Zaurus @@ -17,23 +17,26 @@ TARGET_CC_ARCH = "-march=armv4" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O2" OEINCLUDELOGS = "yes" KERNEL_CONSOLE = "tty1" +# prebuilt toolchain doesn't now about -isystem +export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" +export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" #DEBUG_OPTIMIZATION = "-O -g3" #DEBUG_BUILD = "1" # # Base # -DISTRO = "sharprom" DISTRO_NAME = "SharpROM" DISTRO_VERSION = "3.1 compatible" DISTRO_TYPE = "debug" -ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95 binutils-cross gcc-cross-initial gcc-cross" -ASSUME_PROVIDED += "virtual/arm-linux-libc-for-gcc virtual/arm-linux-binutils virtual/arm-linux-gcc" -ASSUME_PROVIDED += "virtual/arm-linux-gcc-initial virtual/arm-linux-gcc-initial -ASSUME_PROVIDED += "virtual/libc linux-libc-headers" - -DEPENDS =+ "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/arm-linux-gcc-2.95 = "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native" IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0" #INHIBIT_PACKAGE_STRIP = "1" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 9d23b654cf..0f098c3272 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -133,7 +133,7 @@ BBINCLUDELOGS = "yes" # Specifies a location to search for pre-generated tarballs when fetching # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS. -CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" +#CVS_TARBALL_STASH = "" # EDIT THIS FILE and then remove the line below before using! REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}" diff --git a/conf/machine/blueangel.conf b/conf/machine/blueangel.conf index 251dc8a806..979c002d11 100644 --- a/conf/machine/blueangel.conf +++ b/conf/machine/blueangel.conf @@ -36,8 +36,6 @@ SERIAL_CONSOLE = "115200 tts/2 vt100" USE_VT = "0" -include conf/machine/include/handheld-common.conf - GUI_MACHINE_CLASS = "smallscreen" ROOT_FLASH_SIZE = "32" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 0363f05e6b..fcaa2ff046 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -5,8 +5,9 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \ -sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \ +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs \ +sharp-sdmmc-support" +BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \ kernel-module-usbdcore kernel-module-usbdmonitor \ altboot" @@ -19,7 +20,6 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" IMAGE_LINGUAS = "" -include conf/machine/include/handheld-common.conf include conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 955344344a..82905dd089 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -11,16 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" #don't try to access tty1 USE_VT = "0" - - -#ship in rootfs: -EP93XX_MODULES = "kernel-module-apm \ - kernel-module-pcmcia-core \ - kernel-module-ipv6 " - -BOOTSTRAP_EXTRA_RRECOMMENDS += "${EP93XX_MODULES}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" - +MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost" # used by sysvinit_2 SERIAL_CONSOLE = "57600 ttyAM0" diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index 35cb1d2070..4890f3cecd 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -17,7 +17,7 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -MACHINE_FEATURES = "kernel26 usbhost ext2" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci" -require conf/machine/include/tune-athlonmp.conf +#require conf/machine/include/tune-athlonmp.conf diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 39ab571d1e..a2c4a9c10e 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -2,20 +2,29 @@ #@NAME: HP iPAQ H1910/H1915 #@DESCRIPTION: Machine configuration for the HP iPAQ H1910/H1915 -KERNEL ?= "kernel26" -OVERRIDES =. "${KERNEL}:" - +# +# Hardware-based properties +# TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf -PREFERRED_PROVIDER_xserver = "xserver-kdrive" +VOLATILE_STORAGE_SIZE = "64" +ROOT_FLASH_SIZE = "32" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget" -BOOTSTRAP_EXTRA_RDEPENDS = "udev apm apmd network-suspend-scripts modutils-collateral mtd-utils" -BOOTSTRAP_EXTRA_RRECOMMENDS += "" +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PCMCIA_MANAGER = "pcmciautils" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" EXTRA_IMAGECMD_h1910_jffs2 = "-e 0x4000 -p -n" -GUI_MACHINE_CLASS = "smallscreen" - +# +# Modules autoload and other boot properties +# +SERIAL_CONSOLE = "115200 ttyS0 vt100" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index b11e447ea0..3f3b2f916e 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -14,7 +14,7 @@ HANDHELD_MODULES = "" BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}" -INHERIT += "linux_modules" +INHERIT += "linux-kernel-base" GUI_MACHINE_CLASS = "smallscreen" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 1ead1aa919..cc242dc682 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -2,31 +2,39 @@ #@NAME: HP iPAQ h22xx #@DESCRIPTION: Machine configuration for the HP iPAQ h22xx - +# +# Hardware-based properties +# TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" - -EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" +#Compile with armv5te optimizations, incompatible with armv4(t) cpus +require conf/machine/include/tune-xscale.conf +#Set some hints for metadata +VOLATILE_STORAGE_SIZE = "64" ROOT_FLASH_SIZE = "32" -PCMCIA_MANAGER = "pcmciautils" +GUI_MACHINE_CLASS = "smallscreen" +#Set features for task-base MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" +# +# Software/packages selection +# +PCMCIA_MANAGER = "pcmciautils" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" + MACHINE_EXTRA_RDEPENDS = "mtd-utils h2200-bootloader kernel" +EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" -#autoload on boot: +# +# Modules autoload and other boot properties +# module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -GUI_MACHINE_CLASS = "smallscreen" - -include conf/machine/include/tune-xscale.conf - -# LAB can only resolve relative symlinks -ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " +require conf/machine/include/LAB-settings.conf diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 5c7440403b..14a9bb6ba5 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -2,22 +2,33 @@ #@NAME: Compaq iPAQ 36xx,Compaq iPAQ 37xx,Compaq iPAQ 38xx #@DESCRIPTION: Machine configuration for the Compaq iPAQ 36xx, Compaq iPAQ 37xx and Compaq iPAQ 38xx devices +# +# Hardware-based properties +# TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "ipaqsa" + +require conf/machine/include/tune-strongarm.conf + +# h3700, h3800 have 32, but let that be bonus +ROOT_FLASH_SIZE = "16" +# h3630 have 32Mb only +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" + +# +# Software/packages selection +# PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa" PREFERRED_VERSION_handhelds-sa ?= "2.4.19-rmk6-pxa1-hh42" -EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}" - -ROOT_FLASH_SIZE = "16" +EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" H3600_MODULES = "\ h3600-asic \ h3600-micro \ -h3600-microkbd h3600-stowaway \ hwtimer \ -l3-backpaq \ nvrd \ sa1100-cs \ sa1100-ir \ @@ -30,13 +41,10 @@ serial-h3800 \ usb-char \ usb-eth" +# +# Modules autoload and other boot properties +# USE_DEVFS = "1" USE_VT = "0" -IMAGE_LINGUAS = "" - -include conf/machine/include/ipaq-common.conf -include conf/machine/include/handheld-common.conf -include conf/machine/include/tune-strongarm.conf - SERIAL_CONSOLE = "115200 ttySA0" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 65cce6ce81..61024584b5 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -5,7 +5,7 @@ KERNEL ?= "kernel24" #KERNEL ?= "kernel26" -INHERIT += "linux_modules" +INHERIT += "linux-kernel-base" OVERRIDES =. "${KERNEL}:" @@ -13,7 +13,7 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa" -PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6" +PREFERRED_PROVIDER_virtual/kernel_kernel26 = "linux-handhelds-2.6" EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" ROOT_FLASH_SIZE = "32" @@ -30,10 +30,8 @@ SERIAL_CONSOLE = "115200 tts/0 vt100" USE_DEVFS_kernel24 = "1" USE_VT = "0" -include conf/machine/include/ipaq-common.conf -include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" # not using tune-xscale so as to retain backwards compatibility -include conf/machine/tune-xscale.conf +require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index c12e487bf7..f2ecbc5883 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -2,28 +2,33 @@ #@NAME: HP iPAQ h4xxx #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx - +# +# Hardware-based properties +# TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" -PCMCIA_MANAGER = "pcmciautils" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PCMCIA_MANAGER = "pcmciautils" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" -#autoload on boot: +# +# Modules autoload and other boot properties +# module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -GUI_MACHINE_CLASS = "smallscreen" - -include conf/machine/include/tune-xscale.conf - -# LAB can only resolve relative symlinks -ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " +require conf/machine/include/LAB-settings.conf diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index 2ab9775419..d2e7306c46 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -2,38 +2,32 @@ #@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx #@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices -#KERNEL ?= "kernel24" -KERNEL ?= "kernel26" - -OVERRIDES =. "${KERNEL}:" - -INHERIT += "linux_modules" - +# +# Hardware-based properties +# TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -#PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" -ROOT_FLASH_SIZE = "32" +require conf/machine/include/tune-xscale.conf +ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" -BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" -H5XXX_MODULES_kernel24 = " g_ether pxa2xx_udc h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mtdchar h5400-audio" -H5XXX_MODULES_kernel26 = " h5400_lcd g_ether apm h5400_battery pcmcia-core" -# pxa2xx_udc is built in to the kernel +MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ + kernel-module-h5400_battery" +# +# Modules autoload and other boot properties +# SERIAL_CONSOLE = "115200 tts/0 vt100" - -USE_DEVFS_kernel24 = "1" USE_VT = "0" - -GUI_MACHINE_CLASS = "smallscreen" - -include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index 42eabeb588..bffe1a97e1 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -2,22 +2,34 @@ #@NAME: OMAP1510 cpu on iPAQ h6315, h6340 and h6365 #@DESCRIPTION: Machine configuration for the OMAP1510 based HP iPAQ h6300 series devices. +# +# Hardware-based properties +# TARGET_ARCH = "arm" PACKAGE_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" +#Use OMAP 1510 cpu specifig arm9tdmi options for gcc +require conf/machine/include/tune-arm9tdmi.conf + +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget" + +# +# Software/packages selection +# PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" -H6300_MODULES = "omapts omap-keypad bluetooth rfcomm bnep l2cap hci_uart h6300_bt i2c-dev" -#common alsa sound modules -H6300_MODULES += "snd snd_timer snd_pcm snd_seq_device snd_seq_midi_event snd_page_alloc" -#h6300 specific alsa sound module -H6300_MODULES += "snd-omap-alsa-tsc2101" -#oss compatibility alsa sound modules -H6300_MODULES += "snd_pcm_oss snd_mixer_oss snd_seq_oss" +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-omapts \ + kernel-module-omap-keypad \ + kernel-module-h6300-bt" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" + +# +# Modules autoload and other boot properties +# module_autoload_omapts = "omapts" module_autoload_omap-keypad = "omap-keypad" module_autoload_hci_uart = "hci_uart" @@ -28,17 +40,4 @@ module_autoload_snd-omap-alsa-tsc2101 = "snd-omap-alsa-tsc2101" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils console-tools module-init-tools" -BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${H6300_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd alsa-utils" -BOOTSTRAP_EXTRA_RDEPENDS += "alsa-utils-aconnect alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-amixer alsa-utils-aplay" -BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin" -BOOTSTRAP_EXTRA_RRECOMMENDS += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils" - -GPE_EXTRA_INSTALL += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator gpe-tetris gpe-othello gpe-go gstreamer" - -SERIAL_CONSOLE ?= "115200 ttyS0" -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" - -#Use OMAP 1510 cpu specifig arm9tdmi options for gcc -include conf/machine/include/tune-arm9tdmi.conf +SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 8fae31d9f8..4366cb16df 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -2,41 +2,44 @@ #@NAME: HTC Universal #@DESCRIPTION: Machine configuration for the HTC Universal +# +# Hardware-based properties +# TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "ipaqpxa armv4t armv5te iwmmxt" -#use this for a HTC Universal -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -XSERVER = "xserver-kdrive-fbdev" - -MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen" - -MODUTILS = "26" -BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${UN_MODULES}', d)}" -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" -BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus" -BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" - -PXA270_MODULES = "acx g_ether g_file_storage pxa27x_udc bsd_comp \ - snd_pcm_oss snd_mixer_oss \ - hidp bluetooth bfusb hci_usb \ - irtty-sir pxaficp_ir sir-dev \ - " - -include conf/machine/include/smartphone-common.conf - -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 +require conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#include conf/machine/include/tune-iwmmxt.conf +#require conf/machine/include/tune-iwmmxt.conf -UN_MODULES = "i2c-pxa htcuniversal_acx htcuniversal_power snd-htcuniversal_audio" +GUI_MACHINE_CLASS = "bigscreen" +MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen" + +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" +MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \ + kernel-module-nls-iso8859-1 \ + kernel-module-nls-utf8 \ + kernel-module-af-key \ + kernel-module-bsd-comp \ + kernel-module-i2c-pxa \ + kernel-module-htcuniversal-power \ + kernel-module-snd-htcuniversal-audio \ + kernel-module-htcuniversal-acx \ + kernel-module-acx \ + " + +# +# Modules autoload and other boot properties +# module_autoload_acx = "acx" module_autoload_htcuniversal_acx = "htcuniversal_acx" diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index 0a88932e3e..b0c962c1d0 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -33,10 +33,10 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "smallscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#include conf/machine/include/tune-iwmmxt.conf +#require conf/machine/include/tune-iwmmxt.conf module_autoload_evdev = "evdev" module_autoload_pcmcia = "pcmcia" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index e94b7d4d56..d43d16fb46 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -2,50 +2,51 @@ #@NAME: iPAQ hx47xx #@DESCRIPTION: Machine configuration for the hx4700 iPAQ with a pxa27x CPU +# +# Hardware-based properties +# TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -PREFERRED_VERSION_orinoco-modules = "0.15rc1" - -ROOT_FLASH_SIZE = "80" - -EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ - -e 256KiB -p" - -IMAGE_FSTYPES ?= "jffs2" +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +require conf/machine/include/tune-xscale.conf -MODUTILS = "26" +# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first +#require conf/machine/include/tune-iwmmxt.conf +ROOT_FLASH_SIZE = "80" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "bigscreen" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget" +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PCMCIA_MANAGER = "pcmciautils" +MODUTILS = "26" +XSERVER = "xserver-kdrive-w100" + +PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA__RRECOMMENDS = "kernel-module-nls_cp437 \ - kernel-module-nls_iso8859-1 \ - kernel-module-nls_utf8 \ - kernel-module-af_key \ +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ + kernel-module-nls-iso8859-1 \ + kernel-module-nls-utf8 \ + kernel-module-af-key \ kernel-module-i2c-pxa \ - kernel-module-hx4700_voltage \ - kernel-module-hx4700_acx \ - kernel-module-snd_hx4700_audio" - - -SERIAL_CONSOLE = "115200 ttyS0" + kernel-module-hx4700-voltage \ + kernel-module-hx4700-acx \ + kernel-module-snd-hx4700-audio" -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 - -# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#include conf/machine/include/tune-iwmmxt.conf - +EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 256KiB -p" -#define which modules to load at boot +# +# Modules autoload and other boot properties +# module_autoload_evdev = "evdev" module_autoload_hx4700_power = "hx4700_power" module_autoload_pcmcia = "pcmcia" @@ -62,3 +63,5 @@ module_autoload_pxa27x_udc = "pxa27x_udc" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" + +SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/include/LAB-settings.conf b/conf/machine/include/LAB-settings.conf new file mode 100644 index 0000000000..576846fbdf --- /dev/null +++ b/conf/machine/include/LAB-settings.conf @@ -0,0 +1,8 @@ +# +# Settings for LAB (Linux As Bootloader) support. +# Machines which support (or want to support) LAB, +# include this. +# + +# LAB can only resolve relative symlinks +ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf deleted file mode 100644 index 9ac43d84e9..0000000000 --- a/conf/machine/include/handheld-common.conf +++ /dev/null @@ -1,23 +0,0 @@ -HANDHELD_MODULES = "ipv6 \ -ipsec \ -nvrd \ -mip6-mn \ -tun \ -ide-cs ide-disk ide-probe-mod \ -loop \ -vfat ext2 \ -sunrpc nfs \ -btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart hidp \ -pcnet-cs serial-cs airo-cs \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty ircomm-tty \ -input uinput \ -" - -# Configuration bits for "generic handheld" -BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" - -INHERIT += "linux_modules" diff --git a/conf/machine/include/ipaq-common.conf b/conf/machine/include/ipaq-common.conf deleted file mode 100644 index eb696cf9f9..0000000000 --- a/conf/machine/include/ipaq-common.conf +++ /dev/null @@ -1,7 +0,0 @@ -IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" - -BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}" -BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6" - -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - diff --git a/conf/machine/include/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf index 5453fda605..cbf150f3ec 100644 --- a/conf/machine/include/poodle-2.4.conf +++ b/conf/machine/include/poodle-2.4.conf @@ -3,8 +3,8 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \ -kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor \ +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs sharp-sdmmc-support \ hostap-utils prism3-firmware prism3-support" +BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ +kernel-module-usbdcore kernel-module-usbdmonitor" diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf index b5fda186ca..3d9c77539f 100644 --- a/conf/machine/include/simpad-2.4.conf +++ b/conf/machine/include/simpad-2.4.conf @@ -3,5 +3,5 @@ PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules orinoco-modules \ -orinoco-modules-cs pcmcia-cs apm hostap-utils wpa-supplicant-nossl" +BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules \ + pcmcia-cs apm hostap-utils wpa-supplicant-nossl" diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf index a5f4962c75..45ddac1bec 100644 --- a/conf/machine/include/simpad-2.6.conf +++ b/conf/machine/include/simpad-2.6.conf @@ -1,4 +1,4 @@ -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross" BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools" diff --git a/conf/machine/include/smartphone-common.conf b/conf/machine/include/smartphone-common.conf deleted file mode 100644 index bd5983cdc0..0000000000 --- a/conf/machine/include/smartphone-common.conf +++ /dev/null @@ -1,21 +0,0 @@ -HANDHELD_MODULES = "ipv6 \ -ipsec \ -nvrd \ -mip6-mn \ -tun \ -nls-base nls-cp437 nls-iso8859-1 \ -fat vfat \ -loop \ -rfcomm bnep l2cap sco hci_uart hidp \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty ircomm-tty \ -input uinput \ -" - -# Configuration bits for "generic samrtphone" -BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" - -INHERIT += "linux_modules" diff --git a/conf/machine/include/thinclient-common.conf b/conf/machine/include/thinclient-common.conf deleted file mode 100644 index 4a96b42525..0000000000 --- a/conf/machine/include/thinclient-common.conf +++ /dev/null @@ -1,19 +0,0 @@ -THINCLIENT_MODULES = "ipv6 \ -mip6-mn \ -tun \ -loop \ -vfat \ -sunrpc nfs \ -rfcomm bnep l2cap sco \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty \ -input uinput \ -" - -# Configuration bits for "generic thinclient" -BOOTSTRAP_EXTRA_RDEPENDS += "apm" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${THINCLIENT_MODULES}', d)}" - -INHERIT += "linux_modules" diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf index 068d8c4677..2fad9b2d91 100644 --- a/conf/machine/include/tosa-2.4.conf +++ b/conf/machine/include/tosa-2.4.conf @@ -9,7 +9,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils keymaps \ kernel-module-evdev kernel-module-net-fd \ kernel-module-pxa-bi kernel-module-registers \ kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel hostap-modules-cs orinoco-modules-cs \ + kernel hostap-modules-cs \ sharp-sdmmc-support kernel-module-pxa-bi \ kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \ kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage" diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf index 992f1923c6..373bf46727 100644 --- a/conf/machine/include/tune-arm920t.conf +++ b/conf/machine/include/tune-arm920t.conf @@ -1,3 +1,3 @@ PACKAGE_ARCH = "armv4t" -TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t -mcpu=arm920t" +TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index 5c8fce4398..75de007233 100644 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -9,7 +9,7 @@ PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ +BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs sharp-sdmmc-support \ pcmcia-cs apmd apm wireless-tools keymaps irda-utils hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin " diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index ad2120ef6c..b3db5c8268 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700" #use this for a hx47xx ipaq -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" #use this for a hx2xxx ipaq #PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" @@ -33,7 +33,6 @@ PXA270_MODULES = "nls_cp437 nls_iso8859-1 nls_utf8 af_key" SERIAL_CONSOLE = "115200 ttyS0" -include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index c1f918f662..d6b3c70454 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6" +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules module-init-tools" @@ -12,5 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" SERIAL_CONSOLE = "115200 ttySA0" -include conf/machine/include/handheld-common.conf include conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index 206958c2ce..efb19aea93 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -16,7 +16,12 @@ SERIAL_CONSOLE = "115200 ttyS0" # used by opie-collections.inc ROOT_FLASH_SIZE = "32" -# EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000" -EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000" + +# default flash partition setup of the LogicPD flash board is: +# 0x00000000-0x000c0000 : "Bootloader" +# 0x000c0000-0x01000000 : "YAFFS" +# 0x01000000-0x02000000 : "Filesystem" (JFFS2) + +EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000" diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf new file mode 100644 index 0000000000..d2cc9b1f49 --- /dev/null +++ b/conf/machine/magician.conf @@ -0,0 +1,49 @@ +#@TYPE: Machine +#@NAME: HTC Magician +#@DESCRIPTION: Machine configuration for the HTC Magician PDA/Phone + +# +# Hardware-based properties +# +TARGET_ARCH = "arm" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +require conf/machine/include/tune-xscale.conf + +# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first +#require conf/machine/include/tune-iwmmxt.conf + +ROOT_FLASH_SIZE = "80" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget" + +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +MODUTILS = "26" +XSERVER = "xserver-kdrive-fbdev" + +PREFERRED_VERSION_orinoco-modules = "0.15rc1" + +MACHINE_EXTRA_RRECOMMENDS = " \ + kernel-module-leds-magician \ + kernel-module-magician-ts \ + kernel-module-pxaficp-ir \ + kernel-module-uinput \ + kernel-module-hci-usb \ + " + +# +# Modules autoload and other boot properties +# +module_autoload_magician_ts = "magician_ts" +module_autoload_leds-magician = "leds-magician" +module_autoload_snd-pcm-oss = "snd-pcm-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. +module_autoload_g_ether = "g_ether" diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index 357e286752..72a305df38 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -17,4 +17,6 @@ SERIAL_CONSOLE = "115200 ttyS0" # used by opie-collections.inc ROOT_FLASH_SIZE = "32" +MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen keyboard alsa irda" +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/navman-icn330.conf b/conf/machine/navman-icn330.conf new file mode 100644 index 0000000000..fa1cbbaaf4 --- /dev/null +++ b/conf/machine/navman-icn330.conf @@ -0,0 +1,37 @@ +#@TYPE: Machine +#@NAME: Navman iCN 300 +#@DESCRIPTION: Machine configuration for the navman iCN 330 gps devicesx + +# see http://www.duff.dk/navman/ for more details + +# +# Hardware-based properties +# +TARGET_ARCH = "arm" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" + +#Compile with armv5te optimizations, incompatible with armv4(t) cpus +require conf/machine/include/tune-xscale.conf + +#Set some hints for metadata +VOLATILE_STORAGE_SIZE = "32" +GUI_MACHINE_CLASS = "smallscreen" + +#Set features for task-base +MACHINE_FEATURES = "kernel26 touchscreen apm alsa usbgadget" + +# +# Software/packages selection +# +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-navman" + + +# +# Modules autoload and other boot properties +# +module_autoload_snd-pcm-oss = "snd-pcm-oss" + +SERIAL_CONSOLE = "115200 ttyS0 vt100" +USE_VT = "0" + diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index c480cf4ebf..095cd95d31 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -2,10 +2,10 @@ #@Name: Psion teklogix netbookpro Platform #@DESCRIPTION: Machine configuration for Psion teklogix netbookpro Platformm -INHERIT += "linux_modules" +INHERIT += "linux-kernel-base" TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv5te" +IPKG_EXTRA_ARCHS = "arm armv4 armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" @@ -17,15 +17,6 @@ XSERVER = "xserver-kdrive-epson" MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost" -#ship in rootfs: -NBP_MODULES = " apm \ - pcmcia-core \ - ipv6 " -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${NBP_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" - -GPE_EXTRA_INSTALL += "gpe-mini-browser" - # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySA0 vt100" diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 2b9b572024..f5787e6448 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -21,4 +21,3 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword" #udevdir = "/dev" -include conf/thinclient-common.conf diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index ea86d0c5cc..c6bb20948a 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -13,14 +13,10 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020" -# Use current git until I can find a git tag that builds for omap5912osk -PREFERRED_VERSION_linux-omap1 = "2.6.x+git" -#PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2" - SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" -MACHINE_FEATURES = "kernel26 pcmcia usbhost" +MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 49eaf1ef4b..fc8fb718f2 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -14,8 +14,6 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE EXTRA_IMAGEDEPENDS += "zaurus-updater" -include conf/machine/include/handheld-common.conf - ROOT_FLASH_SIZE = "22" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 2777e688bb..13943bae39 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" BOOTSTRAP_EXTRA_RDEPENDS += "kernel" -BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs orinoco-modules-cs \ +BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ kernel-module-pcnet-cs kernel-module-8390" @@ -26,6 +26,5 @@ ROOT_FLASH_SIZE = "16" USE_VT = "0" GPE_EXTRA_INSTALL += "suspend-desktop" -require conf/machine/include/handheld-common.conf require conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index a6b4caf6fd..e7f2aa204a 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -18,8 +18,6 @@ GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_INSTALL += "gaim" ROOT_FLASH_SIZE = "28" -include conf/machine/include/handheld-common.conf - # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/include/tune-xscale.conf |