From 32cf84abc9698e48e575fde14799bfa79fbe2e7b Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 18 May 2005 23:39:37 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/19 00:16:06+01:00 rpsys.net!RP Fix documentation error that was corrupting $T. You end up with a work directory called "Tempory directory within the WORKDIR" and whilst that may be true... :) 2005/05/18 23:58:41+01:00 rpsys.net!RP linux-oz-2.6: Hopefully make spitz patches apply 2005/05/18 23:48:22+01:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/oe/openembedded 2005/05/18 23:48:02+01:00 rpsys.net!RP linux-oz-2.6: Fix pcmcia problem introduced in -mm2 BKrev: 428bd239vNTmBxHdenFlTXncvvvGHQ --- conf/documentation.conf | 75 +++++++++ packages/linux/linux-openzaurus_2.6.12-rc4-mm2.bb | 180 ++++++++++++++++++++++ 2 files changed, 255 insertions(+) diff --git a/conf/documentation.conf b/conf/documentation.conf index e69de29bb2..ad67fd8225 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -0,0 +1,75 @@ +# this file holds documentation for known keys, possible values and their meaning +# feel free to send updates and corrections to oe@handhelds.org + +# conf/bitbake.conf +PREFERRED_VERSION[doc] = "Normally use it as PREFERRED_VERSION_package-name = \"\" to set the preferred \ +version of more than one version for the package-name is available." + +BUILD_ARCH[doc] = "The name of the building architecture. For example i686" +BUILD_OS[doc] = "The operating system (in lower case) of the building architecture. For example \ +linux" +BUILD_VENDOR[doc] = "FIXME" +BUILD_SYS[doc] = "FIXME" +BUILD_PREFIX[doc] = "FIXME" +BUILD_CC_ARCH[doc] = "FIXME" + +HOST_ARCH[doc] = "The name of the target architecture. Normally same as the TARGET_ARCH (@see TARGET_ARCH)" +HOST_OS[doc] = "The name of the target operating system. Normall same as the TARGET_OS \ +(@see TARGET_OS)" +HOST_VENDOR[doc] = "The name of the vendor. Normally same as the TARGET_VENDOR (@see TARGET_VENDOR)" +HOST_SYS[doc] = "FIXME" +HOST_PREFIX[doc] = "Normally same as the TARGET_PREFIX (@see TARGET_PREFIX)" +HOST_CC_ARCH[doc] = "Normally same as the TARGET_CC_ARCH (@see TARGET_CC_ARCH)" + +TARGET_ARCH[doc] = "Build for which architecture. Examples are arm, i686, sh3, mips, powerpc" +TARGET_OS[doc] = "Build for which Operating System. Currently possible values are \ +linux and linux-ulibc" +TARGET_VENDOR[doc] = "FIXME" +TARGET_SYS[doc] = "The target system is composed out of TARGET_ARCH,TARGET_VENDOR and TARGET_OS" +TARGET_PREFIX[doc] = "The prefix for the cross compile toolchain. For example arm-linux-" +TARGET_CC_ARCH[doc] = "FIXME" +TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty" + +PACKAGE_ARCH[doc] = "The architecture needed for using a resulting package. If you have \ +machine dependant configuration options in your bitbake file add a \ +PACKAGE_ARCH = \"${MACHINE_ARCH}\" to the file" + + +DATE[doc] = "The date the build was started Ymd" +TIME[doc] = "The time the build was started HMS" +DATETIME[doc] = "The date and time the build was started at" + +PN[doc] = "PN holds the name of the package (Package Name). It is gathered from the bitbake-file filename" +PV[doc] = "PV holds the version of the package (Package Version). The default value is 1.0, it is \ +retrieved from the bitbake-file filename." +PR[doc] = "PR is the release of the package (Package Release). By default it is set to r0" +PF[doc] = "FIXME" +P[doc] = "FIXME" + + +SECTION[doc] = "Section of the packages e.g. console/networking" +PRIORITY[doc] = "FIXME" +DESCRIPTION[doc] = "A small description of the package" +LICENSE[doc] = "The license of the resulting package e.g. GPL" +MAINTAINER[doc] = "Maintainer of the .bb and resulting package" +HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net" + + +DEPENDS[doc] = "Build time dependencies, things needed to build the package" +RDEPENDS[doc] = "FIXME" +PROVIDES[doc] = "FIXME" + + +PACKAGES[doc] = "FIXME" +FILES[doc] = "FIXME" + + + +TMPDIR[doc] = "The temporary directory of openembedded holding work-, deploy, staging- and some more dirs" +CACHE[doc] = "The directory holding the parsing cache." +DL_DIR[doc] = "The directory where tarballs will be downloaded." +CVSDIR[doc] = "The directory where cvs checkouts will be stored in." + +STAMP[doc] = "The directory that holds files to keep track of what was built" +WORKDIR[doc] = "The directory where a concrete package will be unpacked and built" +T[doc] = "Tempory directory within the WORKDIR" diff --git a/packages/linux/linux-openzaurus_2.6.12-rc4-mm2.bb b/packages/linux/linux-openzaurus_2.6.12-rc4-mm2.bb index e69de29bb2..37cdff41c1 100644 --- a/packages/linux/linux-openzaurus_2.6.12-rc4-mm2.bb +++ b/packages/linux/linux-openzaurus_2.6.12-rc4-mm2.bb @@ -0,0 +1,180 @@ +DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750." +SECTION = "kernel" +MAINTAINER = "Richard Purdie , Michael 'Mickey' Lauer " +LICENSE = "GPL" +#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" +KV = "${@bb.data.getVar('PV',d,True)}" + +PR = "r5" + +DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" +RPSRC = "http://www.rpsys.net/openzaurus/patches" +JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files" +BASRC = "http://www.orca.cx/zaurus/patches" + +# Handy URLs +# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \ +# http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \ +# http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.11-rc1-bk7.gz;patch=1 \ +# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.11-rc5.bz2;patch=1 \ + +# ${RPSRC}/corgi_kbd1-r1.patch;patch=1 \ +# ${RPSRC}/sharpsl_mapprom-r1.patch;patch=1 \ + +# Patches submitted upstream are towards top of this list +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ + ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc4.bz2;patch=1 \ + ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc4/2.6.12-rc4-mm2/2.6.12-rc4-mm2.bz2;patch=1 \ + ${RPSRC}/mmtree_fix-r1.patch;patch=1 \ + ${RPSRC}/mmtree_pcmcia-r0.patch;patch=1 \ + ${RPSRC}/machtype_update-r1.patch;patch=1 \ + ${RPSRC}/corgi_kbd3-r6.patch;patch=1 \ + ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ + ${RPSRC}/pxa_irda-r2.patch;patch=1 \ + ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ + ${RPSRC}/input_power-r2.patch;patch=1 \ + ${RPSRC}/corgi_irda-r2.patch;patch=1 \ + ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \ + ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ + ${RPSRC}/corgi_power-r22.patch;patch=1 \ + ${RPSRC}/corgi_power1-r1.patch;patch=1 \ + ${RPSRC}/mmc_sd-r5.patch;patch=1 \ + ${RPSRC}/corgi_snd-r6.patch;patch=1 \ + ${RPSRC}/w100_split-r8.patch;patch=1 \ + ${RPSRC}/pxa_i2c-r2.patch;patch=1 \ + ${DOSRC}/pxa-i2c-suspend-r0.patch;patch=1 \ + ${DOSRC}/pxa-i2c-func-r0.patch;patch=1 \ + ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ + ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ + ${RPSRC}/ipaq/hx2750_base-r14.patch;patch=1 \ + ${RPSRC}/ipaq/hx2750_bl-r0.patch;patch=1 \ + ${RPSRC}/ipaq/hx2750_pcmcia-r0.patch;patch=1 \ + ${RPSRC}/ipaq/pxa_keys-r0.patch;patch=1 \ + ${RPSRC}/ipaq/tsc2101-r6.patch;patch=1 \ + ${DOSRC}/tosa-detection-r0.patch;patch=1 \ + ${BASRC}/spitz-detection-r0.patch;patch=1 \ + ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \ + ${DOSRC}/tc6393-device-r4.patch;patch=1 \ + ${DOSRC}/tc6393_nand-r3.patch;patch=1 \ + ${DOSRC}/tosa-machine-base-r6.patch;patch=1 \ + ${DOSRC}/tosa-keyboard-r3.patch;patch=1 \ + ${DOSRC}/tc6393fb-r6.patch;patch=1 \ + ${DOSRC}/tosa-power-r4.patch;patch=1 \ + ${DOSRC}/tosa-mmc-r3.patch;patch=1 \ + ${DOSRC}/tosa-udc-r3.patch;patch=1 \ + ${DOSRC}/tosa-irda-r2.patch;patch=1 \ + ${DOSRC}/tosa-lcd-r2.patch;patch=1 \ + ${DOSRC}/tosa-bl-r4.patch;patch=1 \ + ${DOSRC}/pxa-ac97-alsa-r0.patch;patch=1 \ + ${DOSRC}/ac97-bus-r0.patch;patch=1 \ + ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ + ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ + file://add-oz-release-string.patch;patch=1 \ + file://add-elpp-stuff.patch;patch=1 \ + file://pxa-serial-hack.patch;patch=1 \ + ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ + file://defconfig-c7x0 \ + file://defconfig-ipaq-pxa-2.6 \ + file://defconfig-collie \ + file://defconfig-poodle \ + file://defconfig-spitz \ + file://defconfig-tosa " + + +#${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \ + +SRC_URI_append_collie = "${RPSRC}/jl1/collie_keymap.patch;patch=1 " +SRC_URI_append_poodle = "${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 \ + ${RPSRC}/rpextra_poodle-r0.patch;patch=1 " +SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \ + ${DOSRC}/tosa-pxaac97-r0.patch;patch=1 " +SRC_URI_append_spitz = "${BASRC}/spitz-cf-support-r0.patch;patch=1 \ + ${BASRC}/spitz-base-r2.patch;patch=1 " + + +S = "${WORKDIR}/linux-2.6.11" + +inherit kernel + +############################################################## +# Compensate for sucky bootloader on all Sharp Zaurus models +# +FILES_kernel-image = "" +ALLOW_EMPTY = 1 + +EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}" +COMPATIBLE_HOST = "arm.*-linux" + +CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" +CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 " +CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 " + +############################################################## +# Configure memory/ramdisk split for collie +# +export mem = ${@bb.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"} +export rd = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"} + +CMDLINE_MEM_collie = "mem=${mem}M" +CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM}" + +############################################################### +# Enable or disable ELPP via local.conf - default is "no" +# +ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"} + +do_configure() { + + install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." + + if [ "${MACHINE}" == "collie" ]; then + mempos=`echo "obase=16; $mem * 1024 * 1024" | bc` + rdsize=`echo "$rd * 1024" | bc` + total=`expr $mem + $rd` + addr=`echo "obase=16; ibase=16; C0000000 + $mempos" | bc` + if [ "$rd" == "0" ] + then + echo "No RAMDISK" + echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config + else + echo "RAMDIR = $rdsize on $addr" + echo "CONFIG_MTD_MTDRAM_SA1100=y" >> ${S}/.config + echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize" >> ${S}/.config + echo "CONFIG_MTDRAM_ERASE_SIZE=1" >> ${S}/.config + echo "CONFIG_MTDRAM_ABS_POS=$addr" >> ${S}/.config + fi + fi + + echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config + + if [ "${ENABLE_ELPP}" == "yes" ]; then + echo "# Enhanced Linux Progress Patch" >> ${S}/.config + echo "CONFIG_FB_ELPP=y" >> ${S}/.config + echo "CONFIG_LOGO=y" >> ${S}/.config + echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config + else + echo "# CONFIG_FB_ELPP is not set" >> ${S}/.config + fi + + yes '' | oe_runmake oldconfig +} + +# Check the kernel is below the 1272*1024 byte limit for the c7x0 +do_compile_append() { + if [ "${MACHINE}" == "c7x0" ]; then + size=`ls arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -s | cut -d ' ' -f 1` + if [ $size -ge 1271 ]; then + rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} + die "This kernel is too big for the c7x0 and will destroy your machine if you flash it!!!" + fi + fi +} + +do_deploy() { + install -d ${DEPLOY_DIR}/images + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile -- cgit v1.2.3