diff options
author | Koen Kooi <koen@openembedded.org> | 2007-06-13 09:32:53 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2007-06-13 09:32:53 +0000 |
commit | df6f7f3624879b030ed9f1d47f1d71bccde1de84 (patch) | |
tree | 4aafa9455e849f8f4a087545529543d13036fa45 /packages/linux | |
parent | 26eeb940ac198c37fa32fe98edadbeca15e8be6b (diff) |
linux 2.6.20, 2.6.21, 2.6.21+2.6.21+2.6.22-rc1: at91sam9263-ek updates
Diffstat (limited to 'packages/linux')
-rw-r--r-- | packages/linux/linux-2.6.21+2.6.22-rc1/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.21+2.6.22-rc1/at91-mmcfix.patch | 35 | ||||
-rw-r--r-- | packages/linux/linux_2.6.20.bb | 27 | ||||
-rw-r--r-- | packages/linux/linux_2.6.21+2.6.22-rc1.bb | 61 | ||||
-rw-r--r-- | packages/linux/linux_2.6.21.bb | 2 |
5 files changed, 123 insertions, 2 deletions
diff --git a/packages/linux/linux-2.6.21+2.6.22-rc1/.mtn2git_empty b/packages/linux/linux-2.6.21+2.6.22-rc1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-2.6.21+2.6.22-rc1/.mtn2git_empty diff --git a/packages/linux/linux-2.6.21+2.6.22-rc1/at91-mmcfix.patch b/packages/linux/linux-2.6.21+2.6.22-rc1/at91-mmcfix.patch new file mode 100644 index 0000000000..0b503b9409 --- /dev/null +++ b/packages/linux/linux-2.6.21+2.6.22-rc1/at91-mmcfix.patch @@ -0,0 +1,35 @@ +From: Marc Pignat <marc.pignat@hevs.ch> +Date: Wed, 6 Jun 2007 18:27:59 +0000 (+0200) +Subject: mmc-atmel: remove linux/mmc/protocol.h dependencies +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b6cedb38613d41367839df9d2181df3c81fb25c4 + +mmc-atmel: remove linux/mmc/protocol.h dependencies + +Fix compilation error by removing command decoding from at91_mci.c driver. +Decoding commands in the host driver is the wrong way. + +Signed-off-by: Marc Pignat <marc.pignat@hevs.ch> +Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> +--- + +--- /tmp/at91_mci.c 2007-06-13 11:17:32.809501930 +0200 ++++ linux-2.6.21/drivers/mmc/host/at91_mci.c 2007-06-13 11:19:36.953487036 +0200 +@@ -417,7 +417,7 @@ + blocks = 0; + } + +- if (cmd->opcode == MMC_STOP_TRANSMISSION) ++ if (host->flags & FL_SENT_STOP) + cmdr |= AT91_MCI_TRCMD_STOP; + + if (host->bus_mode == MMC_BUSMODE_OPENDRAIN) +@@ -561,8 +561,7 @@ + status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]); + + if (status & AT91_MCI_ERRORS) { +- if ((status & AT91_MCI_RCRCE) && +- ((cmd->opcode == MMC_SEND_OP_COND) || (cmd->opcode == SD_APP_OP_COND))) { ++ if ((status & AT91_MCI_RCRCE) && !(mmc_resp_type(cmd) & MMC_RSP_CRC)) { + cmd->error = MMC_ERR_NONE; + } + else { diff --git a/packages/linux/linux_2.6.20.bb b/packages/linux/linux_2.6.20.bb index 80f6c71442..91388a2f95 100644 --- a/packages/linux/linux_2.6.20.bb +++ b/packages/linux/linux_2.6.20.bb @@ -1,7 +1,11 @@ DESCRIPTION = "Linux Kernel" SECTION = "kernel" LICENSE = "GPL" -PR = "r6" + +# These devices need mkimage to generate a kernel image +DEPENDS_at91sam9263ek = "u-boot-mkimage-gta01-native" + +PR = "r7" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://defconfig" @@ -11,13 +15,32 @@ SRC_URI_append_n2100 = "\ file://rtc-rs5c372-n2100.patch;patch=1 \ " +SRC_URI_append_at91sam9263ek = " \ + http://maxim.org.za/AT91RM9200/2.6/${PV}-at91.patch.gz;patch=1 \ + http://www.at91.com/repFichier/Project-217/linux-${PV}-at91-exp.diff.bz2;patch=1 \ + " + inherit kernel + KERNEL_IMAGETYPE = "bzImage" KERNEL_IMAGETYPE_n2100 = "zImage" +KERNEL_IMAGETYPE_at91sam9263ek = "uImage" do_configure_prepend() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' + + yes '' | oe_runmake oldconfig } do_install_append_n2100() { diff --git a/packages/linux/linux_2.6.21+2.6.22-rc1.bb b/packages/linux/linux_2.6.21+2.6.22-rc1.bb new file mode 100644 index 0000000000..2773280da2 --- /dev/null +++ b/packages/linux/linux_2.6.21+2.6.22-rc1.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "Linux Kernel" +SECTION = "kernel" +LICENSE = "GPL" + +DEFAULT_PREFERENCE = "-1" + + +# These devices need mkimage to generate a kernel image +DEPENDS_kb9202 = "u-boot-mkimage-gta01-native" +DEPENDS_at32stk1000 = "u-boot-mkimage-gta01-native" +DEPENDS_atngw100 = "u-boot-mkimage-gta01-native" +DEPENDS_at91sam9263ek = "u-boot-mkimage-gta01-native" + +DEFAULT_PREFERENCE_at91sam9263ek = "-1" + +PR = "r0" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc1.bz2;patch=1 \ + file://defconfig \ + " + +SRC_URI_append_simpad = "\ + file://linux-2.6.21-SIMpad-cs3-simpad.patch;patch=1 \ + file://linux-2.6.21-SIMpad-mq200.patch;patch=1 \ + file://linux-2.6.21-SIMpad-serial-and-gpio_keys.patch;patch=1 \ + file://linux-2.6.21-SIMpad-ucb1x00-switches.patch;patch=1 \ + file://linux-2.6.21-pcmcia-device-to-platform-driver.patch;patch=1 \ + " +SRC_URI_append_kb9202 = " http://maxim.org.za/AT91RM9200/2.6/2.6.22-rc1-at91.patch.gz;patch=1 \ + file://at91-mmcfix.patch;patch=1" +SRC_URI_append_at91sam9263ek = " http://maxim.org.za/AT91RM9200/2.6/2.6.22-rc1-at91.patch.gz;patch=1 \ + file://at91-mmcfix.patch;patch=1" + +S = "${WORKDIR}/linux-2.6.21" + +inherit kernel + +KERNEL_IMAGETYPE_progear = "bzImage" +KERNEL_IMAGETYPE_simpad = "zImage" +KERNEL_IMAGETYPE_kb9202 = "uImage" +KERNEL_IMAGETYPE_atngw100 = "uImage" +KERNEL_IMAGETYPE_at32stk1000 = "uImage" +KERNEL_IMAGETYPE_at91sam9263ek = "uImage" + +do_configure_prepend() { + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' + + yes '' | oe_runmake oldconfig +} + diff --git a/packages/linux/linux_2.6.21.bb b/packages/linux/linux_2.6.21.bb index 94ec06072a..d823b4d625 100644 --- a/packages/linux/linux_2.6.21.bb +++ b/packages/linux/linux_2.6.21.bb @@ -8,6 +8,8 @@ DEPENDS_at32stk1000 = "u-boot-mkimage-gta01-native" DEPENDS_atngw100 = "u-boot-mkimage-gta01-native" DEPENDS_at91sam9263ek = "u-boot-mkimage-gta01-native" +DEFAULT_PREFERENCE_at91sam9263ek = "-1" + PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ |