diff options
Diffstat (limited to 'packages')
84 files changed, 3463 insertions, 1915 deletions
diff --git a/packages/klibc/files/wc.patch b/packages/klibc/files/wc.patch new file mode 100644 index 0000000000..296a4f9d92 --- /dev/null +++ b/packages/klibc/files/wc.patch @@ -0,0 +1,236 @@ +Index: klibc-1.5/usr/utils/Kbuild +=================================================================== +--- klibc-1.5.orig/usr/utils/Kbuild 2008-04-14 23:21:57.702294843 +0200 ++++ klibc-1.5/usr/utils/Kbuild 2008-04-14 23:24:38.817291977 +0200 +@@ -3,7 +3,7 @@ + # + + progs := chroot dd mkdir mkfifo mknod mount pivot_root umount +-progs += true false sleep ln nuke minips cat losetup ++progs += true false sleep ln nuke minips cat losetup wc + progs += insmod uname halt kill readlink cpio modprobe + + static-y := $(addprefix static/, $(progs)) +@@ -56,6 +56,9 @@ + shared/modprobe-y := modprobe.o + static/losetup-y := losetup.o + shared/losetup-y := losetup.o ++static/wc-y := wc.o ++shared/wc-y := wc.o ++ + # Additionally linked targets + always := static/reboot static/poweroff shared/reboot shared/poweroff + +Index: klibc-1.5/usr/utils/wc.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ klibc-1.5/usr/utils/wc.c 2008-04-14 23:25:15.449292711 +0200 +@@ -0,0 +1,208 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * wc implementation for busybox ++ * ++ * Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org> ++ * ++ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. ++ */ ++ ++/* BB_AUDIT SUSv3 _NOT_ compliant -- option -m is not currently supported. */ ++/* http://www.opengroup.org/onlinepubs/007904975/utilities/wc.html */ ++ ++/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) ++ * ++ * Rewritten to fix a number of problems and do some size optimizations. ++ * Problems in the previous busybox implementation (besides bloat) included: ++ * 1) broken 'wc -c' optimization (read note below) ++ * 2) broken handling of '-' args ++ * 3) no checking of ferror on EOF returns ++ * 4) isprint() wasn't considered when word counting. ++ * ++ * TODO: ++ * ++ * When locale support is enabled, count multibyte chars in the '-m' case. ++ * ++ * NOTES: ++ * ++ * The previous busybox wc attempted an optimization using stat for the ++ * case of counting chars only. I omitted that because it was broken. ++ * It didn't take into account the possibility of input coming from a ++ * pipe, or input from a file with file pointer not at the beginning. ++ * ++ * To implement such a speed optimization correctly, not only do you ++ * need the size, but also the file position. Note also that the ++ * file position may be past the end of file. Consider the example ++ * (adapted from example in gnu wc.c) ++ * ++ * echo hello > /tmp/testfile && ++ * (dd ibs=1k skip=1 count=0 &> /dev/null; wc -c) < /tmp/testfile ++ * ++ * for which 'wc -c' should output '0'. ++ */ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <unistd.h> ++#undef isspace ++#undef isprint ++#define isspace(c) ((((c) == ' ') || (((unsigned int)((c) - 9)) <= (13 - 9)))) ++#define isprint(c) (((unsigned int)((c) - 0x20)) <= (0x7e - 0x20)) ++#define isspace_given_isprint(c) ((c) == ' ') ++ ++#define COUNT_T unsigned long ++#define COUNT_FMT "u" ++#define optind 1 ++FILE *fopen_or_warn_stdin(const char *filename) ++{ ++ FILE *fp = stdin; ++ ++ if (filename[0]) { ++ fp = fopen(filename, "r"); ++ } ++ ++ return fp; ++} ++ ++enum { ++ WC_LINES = 0, ++ WC_WORDS = 1, ++ WC_CHARS = 2, ++ WC_LENGTH = 3 ++}; ++ ++int main(int argc, char **argv) ++{ ++ FILE *fp; ++ const char *s, *arg; ++ const char *start_fmt = "%9"COUNT_FMT; ++ const char *fname_fmt = " %s\n"; ++ COUNT_T *pcounts; ++ COUNT_T counts[4]; ++ COUNT_T totals[4]; ++ unsigned linepos; ++ unsigned u; ++ int num_files = 0; ++ int c; ++ signed char status = EXIT_SUCCESS; ++ signed char in_word; ++ unsigned print_type; ++ ++ print_type = getopt(argc, argv, "lwcL"); ++ ++ if (print_type == 0) { ++ print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS); ++ } ++ ++ argv += optind; ++ if (!argv[0]) { ++ *--argv = (char *) "wc"; ++ fname_fmt = "\n"; ++ if (!((print_type-1) & print_type)) /* exactly one option? */ ++ start_fmt = "%"COUNT_FMT; ++ } ++ ++ memset(totals, 0, sizeof(totals)); ++ ++ pcounts = counts; ++ ++ while ((arg = *argv++) != 0) { ++ ++num_files; ++ fp = fopen_or_warn_stdin(arg); ++ if (!fp) { ++ status = EXIT_FAILURE; ++ continue; ++ } ++ ++ memset(counts, 0, sizeof(counts)); ++ linepos = 0; ++ in_word = 0; ++ ++ do { ++ /* Our -w doesn't match GNU wc exactly... oh well */ ++ ++ ++counts[WC_CHARS]; ++ c = getc(fp); ++ if (isprint(c)) { ++ ++linepos; ++ if (!isspace_given_isprint(c)) { ++ in_word = 1; ++ continue; ++ } ++ } else if (((unsigned int)(c - 9)) <= 4) { ++ /* \t 9 ++ * \n 10 ++ * \v 11 ++ * \f 12 ++ * \r 13 ++ */ ++ if (c == '\t') { ++ linepos = (linepos | 7) + 1; ++ } else { /* '\n', '\r', '\f', or '\v' */ ++ DO_EOF: ++ if (linepos > counts[WC_LENGTH]) { ++ counts[WC_LENGTH] = linepos; ++ } ++ if (c == '\n') { ++ ++counts[WC_LINES]; ++ } ++ if (c != '\v') { ++ linepos = 0; ++ } ++ } ++ } else if (c == EOF) { ++/* if (ferror(fp)) { ++ status = EXIT_FAILURE; ++ } ++*/ --counts[WC_CHARS]; ++ goto DO_EOF; /* Treat an EOF as '\r'. */ ++ } else { ++ continue; ++ } ++ ++ counts[WC_WORDS] += in_word; ++ in_word = 0; ++ if (c == EOF) { ++ break; ++ } ++ } while (1); ++ ++ if (totals[WC_LENGTH] < counts[WC_LENGTH]) { ++ totals[WC_LENGTH] = counts[WC_LENGTH]; ++ } ++ totals[WC_LENGTH] -= counts[WC_LENGTH]; ++ ++ if(fp != stdin) ++ fclose(fp); ++ ++ OUTPUT: ++ /* coreutils wc tries hard to print pretty columns ++ * (saves results for all files, find max col len etc...) ++ * we won't try that hard, it will bloat us too much */ ++ s = start_fmt; ++ u = 0; ++ do { ++ if (print_type & (1 << u)) { ++ printf(s, pcounts[u]); ++ s = " %9"COUNT_FMT; /* Ok... restore the leading space. */ ++ } ++ totals[u] += pcounts[u]; ++ } while (++u < 4); ++ printf(fname_fmt, arg); ++ } ++ ++ /* If more than one file was processed, we want the totals. To save some ++ * space, we set the pcounts ptr to the totals array. This has the side ++ * effect of trashing the totals array after outputting it, but that's ++ * irrelavent since we no longer need it. */ ++ if (num_files > 1) { ++ num_files = 0; /* Make sure we don't get here again. */ ++ arg = "total"; ++ pcounts = totals; ++ --argv; ++ goto OUTPUT; ++ } ++ ++ fflush(stdout); ++ exit(status); ++} diff --git a/packages/klibc/klibc-common.inc b/packages/klibc/klibc-common.inc index 5e890b3bc8..87fb6498f4 100644 --- a/packages/klibc/klibc-common.inc +++ b/packages/klibc/klibc-common.inc @@ -9,6 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2 \ file://modprobe.patch;patch=1 \ file://losetup.patch;patch=1 \ file://dash_readopt.patch;patch=1 \ + file://wc.patch;patch=1 \ " S = "${WORKDIR}/klibc-${PV}" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb index f0429e34a2..f7015ffaf7 100644 --- a/packages/klibc/klibc-utils-static_1.5.bb +++ b/packages/klibc/klibc-utils-static_1.5.bb @@ -1,6 +1,6 @@ require klibc-common.inc -PR = "r9" +PR = "r10" # We only want the static utils. klibc build both. So we install only what we want. do_install() { @@ -38,6 +38,7 @@ do_install() { install -m 755 usr/utils/static/uname ${D}${base_bindir} install -m 755 usr/utils/static/modprobe ${D}${base_bindir} install -m 755 usr/utils/static/losetup ${D}${base_bindir} + install -m 755 usr/utils/static/wc ${D}${base_bindir} cd ${D}${base_bindir} ln -s gzip gunzip ln -s gzip zcat @@ -60,7 +61,7 @@ PACKAGES = "klibc-utils-static-sh klibc-utils-static-gzip \ klibc-utils-static-reboot klibc-utils-static-sleep \ klibc-utils-static-true klibc-utils-static-umount \ klibc-utils-static-uname klibc-utils-static-modprobe \ - klibc-utils-static-losetup" + klibc-utils-static-losetup klibc-utils-static-wc" FILES_klibc-utils-static-sh = "${base_bindir}/sh" FILES_klibc-utils-static-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat" @@ -95,3 +96,4 @@ FILES_klibc-utils-static-umount = "${base_bindir}/umount" FILES_klibc-utils-static-uname = "${base_bindir}/uname" FILES_klibc-utils-static-modprobe = "${base_bindir}/modprobe" FILES_klibc-utils-static-losetup = "${base_bindir}/losetup" +FILES_klibc-utils-static-wc = "${base_bindir}/wc" diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc index c32111af37..15205c754b 100644 --- a/packages/klibc/klibc.inc +++ b/packages/klibc/klibc.inc @@ -40,7 +40,8 @@ do_install() { install -m 755 usr/utils/shared/uname ${D}${base_bindir} install -m 755 usr/utils/shared/modprobe ${D}${base_bindir} install -m 755 usr/utils/shared/losetup ${D}${base_bindir} - + install -m 755 usr/utils/shared/wc ${D}${base_bindir} + install -d ${D}${base_libdir} install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} cd ${D}${base_libdir} @@ -74,7 +75,7 @@ PACKAGES = "${PN} klibc-utils-sh klibc-utils-kinit \ klibc-utils-sleep klibc-utils-true \ klibc-utils-umount klibc-utils-uname \ klibc-utils-gzip klibc-utils-modprobe \ - klibc-utils-losetup" + klibc-utils-losetup klibc-utils-wc" FILES_${PN} = "${base_libdir}/klibc*.so" FILES_klibc-utils-sh = "${base_bindir}/sh" @@ -110,6 +111,7 @@ FILES_klibc-utils-umount = "${base_bindir}/umount" FILES_klibc-utils-uname = "${base_bindir}/uname" FILES_klibc-utils-modprobe = "${base_bindir}/modprobe" FILES_klibc-utils-losetup = "${base_bindir}/losetup" +FILES_klibc-utils-wc = "${base_bindir}/wc" # Yes we want exactly the klibc that was compiled with the utils RDEPENDS_klibc-utils-sh = "${PN} (=${PV}-${PR})" @@ -144,3 +146,4 @@ RDEPENDS_klibc-utils-umount = "${PN} (=${PV}-${PR})" RDEPENDS_klibc-utils-uname = "${PN} (=${PV}-${PR})" RDEPENDS_klibc-utils-modprobe = "${PN} (=${PV}-${PR})" RDEPENDS_klibc-utils-losetup = "${PN} (=${PV}-${PR})" +RDEPENDS_klibc-utils-wc = "${PN} (=${PV}-${PR})" diff --git a/packages/klibc/klibc_1.5.bb b/packages/klibc/klibc_1.5.bb index 967f88f948..70d2819394 100644 --- a/packages/klibc/klibc_1.5.bb +++ b/packages/klibc/klibc_1.5.bb @@ -1,2 +1,2 @@ require klibc.inc -PR = "r7" +PR = "r8" diff --git a/packages/libsdl/libsdl-qpe_1.2.9.bb b/packages/libsdl/libsdl-qpe_1.2.9.bb index 3583f20cf0..e33cf44e60 100644 --- a/packages/libsdl/libsdl-qpe_1.2.9.bb +++ b/packages/libsdl/libsdl-qpe_1.2.9.bb @@ -12,6 +12,7 @@ SRC_URI += "\ file://SDL-Akita-1.2.9.patch;patch=1 \ file://fixlibs-1.2.9.patch;patch=1 \ file://explicit-extern-C.patch;patch=1 \ + file://no-PAGE_SIZE.patch;patch=1 \ " EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ @@ -26,6 +27,6 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads do_compile_prepend() { if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ] then - sed -i s,-lqte,-lqte-mt, src/Makefile + sed -i s,-lqte\([^-]\),-lqte-mt, src/Makefile fi } diff --git a/packages/libsdl/libsdl.inc b/packages/libsdl/libsdl.inc index 217072ce61..c039f7c398 100644 --- a/packages/libsdl/libsdl.inc +++ b/packages/libsdl/libsdl.inc @@ -5,7 +5,7 @@ DEPENDS = "alsa-lib mesa virtual/libx11 libxext" DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" -PR = "r4" +PR = "r5" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ diff --git a/packages/libtomcrypt/libtomcrypt_0.97b.bb b/packages/libtomcrypt/libtomcrypt_1.17.bb index 66ad673ed6..1d0c664464 100644 --- a/packages/libtomcrypt/libtomcrypt_0.97b.bb +++ b/packages/libtomcrypt/libtomcrypt_1.17.bb @@ -7,7 +7,9 @@ routines." SECTION = "libs/network" PRIORITY = "optional" LICENSE = "PD" -SRC_URI = "http://libtomcrypt.org/files/crypt-${PV}.tar.bz2" +PR = "r0" + +SRC_URI = "http://libtom.org/files/crypt-${PV}.tar.bz2" inherit autotools @@ -17,10 +19,9 @@ EXTRA_OEMAKE = "library" do_stage() { oe_libinstall -a libtomcrypt ${STAGING_LIBDIR}/ - install -m 0644 *.h ${STAGING_INCDIR}/ + install -m 0644 ${S}/src/headers/*.h ${STAGING_INCDIR}/ } do_install() { : } - diff --git a/packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig b/packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig index b7ca083ac1..90a73cdd0a 100644 --- a/packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig +++ b/packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig @@ -218,7 +218,21 @@ CONFIG_PCI_SYSCALL=y CONFIG_ARCH_SUPPORTS_MSI=y # CONFIG_PCI_MSI is not set CONFIG_PCI_LEGACY=y -# CONFIG_PCCARD is not set +CONFIG_PCCARD=m +# CONFIG_PCMCIA_DEBUG is not set +# CONFIG_PCMCIA is not set +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PCCARD_NONSTATIC=m # CONFIG_HOTPLUG_PCI is not set # diff --git a/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch new file mode 100644 index 0000000000..713f089ebf --- /dev/null +++ b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch @@ -0,0 +1,12 @@ +diff -urN linux-2.6.24.orig/drivers/pcmcia/yenta_socket.c linux-2.6.24/drivers/pcmcia/yenta_socket.c +--- linux-2.6.24.orig/drivers/pcmcia/yenta_socket.c 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24/drivers/pcmcia/yenta_socket.c 2008-04-16 18:03:38.000000000 +0200 +@@ -551,7 +551,7 @@ + * max 4 MB, min 16 kB. We try very hard to not get below + * the "ACC" values, though. + */ +-#define BRIDGE_MEM_MAX 4*1024*1024 ++#define BRIDGE_MEM_MAX 64*1024*1024 + #define BRIDGE_MEM_ACC 128*1024 + #define BRIDGE_MEM_MIN 16*1024 + diff --git a/packages/linux/linux-beagleboard_git.bb b/packages/linux/linux-beagleboard_git.bb deleted file mode 100644 index b7096deabb..0000000000 --- a/packages/linux/linux-beagleboard_git.bb +++ /dev/null @@ -1,14 +0,0 @@ -require linux.inc - -SRCREV = "039ced63db6a3f90f8b8f23a74499e38c0462b27" -PV = "2.6.24+2.6.25rc7-git${SRCREV}" -PR = "r2" - -COMPATIBLE_MACHINE = "beagleboard" - - -SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ - file://beagle-board-patch-dirk.diff;patch=1 \ - file://defconfig" - -S = "${WORKDIR}/git" diff --git a/packages/linux/linux-davinci/binutils-buildid-arm.patch b/packages/linux/linux-davinci/binutils-buildid-arm.patch deleted file mode 100644 index edd224f4dd..0000000000 --- a/packages/linux/linux-davinci/binutils-buildid-arm.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S -index 5ff5406..538fcb5 100644 ---- a/arch/arm/kernel/vmlinux.lds.S -+++ b/arch/arm/kernel/vmlinux.lds.S -@@ -94,6 +94,7 @@ SECTIONS - TEXT_TEXT - SCHED_TEXT - LOCK_TEXT -+ *(.note.*) - #ifdef CONFIG_MMU - *(.fixup) - #endif diff --git a/packages/linux/linux-davinci/davinci-nand.patch b/packages/linux/linux-davinci/davinci-nand.patch deleted file mode 100644 index 33e53cf095..0000000000 --- a/packages/linux/linux-davinci/davinci-nand.patch +++ /dev/null @@ -1,905 +0,0 @@ -Index: linux-davinci/drivers/mtd/nand/davinci_nand.c -=================================================================== ---- /dev/null -+++ linux-davinci/drivers/mtd/nand/davinci_nand.c -@@ -0,0 +1,638 @@ -+/* -+ * linux/drivers/mtd/nand/davinci_nand.c -+ * -+ * NAND Flash Driver -+ * -+ * Copyright (C) 2006 Texas Instruments. -+ * -+ * ported to 2.6.23 (C) 2008 by -+ * Sander Huijsen <Shuijsen@optelecom-nkf.com> -+ * Troy Kisky <troy.kisky@boundarydevices.com> -+ * Dirk Behme <Dirk.Behme@gmail.com> -+ * -+ * -------------------------------------------------------------------------- -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -------------------------------------------------------------------------- -+ * -+ * Overview: -+ * This is a device driver for the NAND flash device found on the -+ * DaVinci board which utilizes the Samsung k9k2g08 part. -+ * -+ * Modifications: -+ * ver. 1.0: Feb 2005, Vinod/Sudhakar -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/module.h> -+#include <linux/platform_device.h> -+#include <linux/err.h> -+#include <linux/clk.h> -+#include <linux/io.h> -+#include <linux/mtd/mtd.h> -+#include <linux/mtd/nand.h> -+#include <linux/mtd/partitions.h> -+ -+#include <asm/arch/hardware.h> -+#include <asm/arch/nand.h> -+#include <asm/arch/mux.h> -+ -+#include <asm/mach/flash.h> -+ -+#ifdef CONFIG_NAND_FLASH_HW_ECC -+#define DAVINCI_NAND_ECC_MODE NAND_ECC_HW3_512 -+#else -+#define DAVINCI_NAND_ECC_MODE NAND_ECC_SOFT -+#endif -+ -+#define DRIVER_NAME "davinci_nand" -+ -+static struct clk *nand_clock; -+static void __iomem *nand_vaddr; -+ -+/* -+ * MTD structure for DaVinici board -+ */ -+static struct mtd_info *nand_davinci_mtd; -+ -+#ifdef CONFIG_MTD_PARTITIONS -+const char *part_probes[] = { "cmdlinepart", NULL }; -+#endif -+ -+static uint8_t scan_ff_pattern[] = { 0xff, 0xff }; -+ -+/* BB marker is byte 5 in OOB of page 0 */ -+static struct nand_bbt_descr davinci_memorybased_small = { -+ .options = NAND_BBT_SCAN2NDPAGE, -+ .offs = 5, -+ .len = 1, -+ .pattern = scan_ff_pattern -+}; -+ -+/* BB marker is bytes 0-1 in OOB of page 0 */ -+static struct nand_bbt_descr davinci_memorybased_large = { -+ .options = 0, -+ .offs = 0, -+ .len = 2, -+ .pattern = scan_ff_pattern -+}; -+ -+inline unsigned int davinci_nand_readl(int offset) -+{ -+ return davinci_readl(DAVINCI_ASYNC_EMIF_CNTRL_BASE + offset); -+} -+ -+inline void davinci_nand_writel(unsigned long value, int offset) -+{ -+ davinci_writel(value, DAVINCI_ASYNC_EMIF_CNTRL_BASE + offset); -+} -+ -+/* -+ * Hardware specific access to control-lines -+ */ -+static void nand_davinci_hwcontrol(struct mtd_info *mtd, int cmd, -+ unsigned int ctrl) -+{ -+ struct nand_chip *chip = mtd->priv; -+ u32 IO_ADDR_W = (u32)chip->IO_ADDR_W; -+ -+ /* Did the control lines change? */ -+ if (ctrl & NAND_CTRL_CHANGE) { -+ IO_ADDR_W &= ~(MASK_ALE|MASK_CLE); -+ -+ if ((ctrl & NAND_CTRL_CLE) == NAND_CTRL_CLE) -+ IO_ADDR_W |= MASK_CLE; -+ else if ((ctrl & NAND_CTRL_ALE) == NAND_CTRL_ALE) -+ IO_ADDR_W |= MASK_ALE; -+ -+ chip->IO_ADDR_W = (void __iomem *)IO_ADDR_W; -+ } -+ -+ if (cmd != NAND_CMD_NONE) -+ writeb(cmd, chip->IO_ADDR_W); -+} -+ -+static void nand_davinci_select_chip(struct mtd_info *mtd, int chip) -+{ -+ /* do nothing */ -+} -+ -+#ifdef CONFIG_NAND_FLASH_HW_ECC -+static void nand_davinci_enable_hwecc(struct mtd_info *mtd, int mode) -+{ -+ u32 retval; -+ -+ /* Reset ECC hardware */ -+ retval = davinci_nand_readl(NANDF1ECC_OFFSET); -+ -+ /* Restart ECC hardware */ -+ retval = davinci_nand_readl(NANDFCR_OFFSET); -+ retval |= (1 << 8); -+ davinci_nand_writel(retval, NANDFCR_OFFSET); -+} -+ -+/* -+ * Read DaVinci ECC register -+ */ -+static u32 nand_davinci_readecc(struct mtd_info *mtd) -+{ -+ /* Read register ECC and clear it */ -+ return davinci_nand_readl(NANDF1ECC_OFFSET); -+} -+ -+/* -+ * Read DaVinci ECC registers and rework into MTD format -+ */ -+static int nand_davinci_calculate_ecc(struct mtd_info *mtd, -+ const u_char *dat, u_char *ecc_code) -+{ -+ unsigned int ecc_val = nand_davinci_readecc(mtd); -+ /* squeeze 0 middle bits out so that it fits in 3 bytes */ -+ unsigned int tmp = (ecc_val&0x0fff)|((ecc_val&0x0fff0000)>>4); -+ /* invert so that erased block ecc is correct */ -+ tmp = ~tmp; -+ ecc_code[0] = (u_char)(tmp); -+ ecc_code[1] = (u_char)(tmp >> 8); -+ ecc_code[2] = (u_char)(tmp >> 16); -+ -+ return 0; -+} -+ -+static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat, -+ u_char *read_ecc, u_char *calc_ecc) -+{ -+ struct nand_chip *chip = mtd->priv; -+ u_int32_t eccNand = read_ecc[0] | (read_ecc[1] << 8) | -+ (read_ecc[2] << 16); -+ u_int32_t eccCalc = calc_ecc[0] | (calc_ecc[1] << 8) | -+ (calc_ecc[2] << 16); -+ u_int32_t diff = eccCalc ^ eccNand; -+ -+ if (diff) { -+ if ((((diff>>12)^diff) & 0xfff) == 0xfff) { -+ /* Correctable error */ -+ if ((diff>>(12+3)) < chip->ecc.size) { -+ dat[diff>>(12+3)] ^= (1 << ((diff>>12)&7)); -+ return 1; -+ } else { -+ return -1; -+ } -+ } else if (!(diff & (diff-1))) { -+ /* Single bit ECC error in the ECC itself, -+ nothing to fix */ -+ return 1; -+ } else { -+ /* Uncorrectable error */ -+ return -1; -+ } -+ -+ } -+ return 0; -+} -+#endif -+ -+/* -+ * Read OOB data from flash. -+ */ -+static int read_oob_and_check(struct mtd_info *mtd, loff_t offs, uint8_t *buf, -+ struct nand_bbt_descr *bd) -+{ -+ int i, ret; -+ int page; -+ struct nand_chip *chip = mtd->priv; -+ -+ /* Calculate page address from offset */ -+ page = (int)(offs >> chip->page_shift); -+ page &= chip->pagemask; -+ -+ /* Read OOB data from flash */ -+ ret = chip->ecc.read_oob(mtd, chip, page, 1); -+ if (ret < 0) -+ return ret; -+ -+ /* Copy read OOB data to the buffer*/ -+ memcpy(buf, chip->oob_poi, mtd->oobsize); -+ -+ /* Check pattern against BBM in OOB area */ -+ for (i = 0; i < bd->len; i++) { -+ if (buf[bd->offs + i] != bd->pattern[i]) -+ return 1; -+ } -+ return 0; -+} -+ -+/* -+ * Fill in the memory based Bad Block Table (BBT). -+ */ -+static int nand_davinci_memory_bbt(struct mtd_info *mtd, -+ struct nand_bbt_descr *bd) -+{ -+ int i, numblocks; -+ int startblock = 0; -+ loff_t from = 0; -+ struct nand_chip *chip = mtd->priv; -+ int blocksize = 1 << chip->bbt_erase_shift; -+ uint8_t *buf = chip->buffers->databuf; -+ int len = bd->options & NAND_BBT_SCAN2NDPAGE ? 2 : 1; -+ -+ /* -numblocks- is 2 times the actual number of eraseblocks */ -+ numblocks = mtd->size >> (chip->bbt_erase_shift - 1); -+ -+ /* Now loop through all eraseblocks in the flash */ -+ for (i = startblock; i < numblocks; i += 2) { -+ int j, ret; -+ int offs = from; -+ -+ /* If NAND_BBT_SCAN2NDPAGE flag is set in bd->options, -+ * also each 2nd page of an eraseblock is checked -+ * for a Bad Block Marker. In that case, len equals 2. -+ */ -+ for (j = 0; j < len; j++) { -+ /* Read OOB data and check pattern */ -+ ret = read_oob_and_check(mtd, from, buf, bd); -+ if (ret < 0) -+ return ret; -+ -+ /* Check pattern for bad block markers */ -+ if (ret) { -+ /* Mark bad block by writing 0b11 in the -+ table */ -+ chip->bbt[i >> 3] |= 0x03 << (i & 0x6); -+ -+ printk(KERN_WARNING "Bad eraseblock %d at " \ -+ "0x%08x\n", i >> 1, -+ (unsigned int)from); -+ -+ mtd->ecc_stats.badblocks++; -+ break; -+ } -+ offs += mtd->writesize; -+ } -+ -+ /* Make -from- point to next eraseblock */ -+ from += blocksize; -+ } -+ -+ printk(KERN_NOTICE "Bad block scan: %d out of %d blocks are bad.\n", -+ mtd->ecc_stats.badblocks, numblocks>>1); -+ -+ return 0; -+} -+ -+/* -+ * This function creates a memory based bad block table (BBT). -+ * It is largely based on the standard BBT function, but all -+ * unnecessary junk is thrown out to speed up. -+ */ -+static int nand_davinci_scan_bbt(struct mtd_info *mtd) -+{ -+ struct nand_chip *chip = mtd->priv; -+ struct nand_bbt_descr *bd; -+ int len, ret = 0; -+ -+ chip->bbt_td = NULL; -+ chip->bbt_md = NULL; -+ -+ /* pagesize determines location of BBM */ -+ if (mtd->writesize > 512) -+ bd = &davinci_memorybased_large; -+ else -+ bd = &davinci_memorybased_small; -+ -+ chip->badblock_pattern = bd; -+ -+ /* Use 2 bits per page meaning 4 page markers per byte */ -+ len = mtd->size >> (chip->bbt_erase_shift + 2); -+ -+ /* Allocate memory (2bit per block) and clear the memory bad block -+ table */ -+ chip->bbt = kzalloc(len, GFP_KERNEL); -+ if (!chip->bbt) { -+ printk(KERN_ERR "nand_davinci_scan_bbt: Out of memory\n"); -+ return -ENOMEM; -+ } -+ -+ /* Now try to fill in the BBT */ -+ ret = nand_davinci_memory_bbt(mtd, bd); -+ if (ret) { -+ printk(KERN_ERR "nand_davinci_scan_bbt: " -+ "Can't scan flash and build the RAM-based BBT\n"); -+ -+ kfree(chip->bbt); -+ chip->bbt = NULL; -+ } -+ -+ return ret; -+} -+ -+/* -+ * Read from memory register: we can read 4 bytes at a time. -+ * The hardware takes care of actually reading the NAND flash. -+ */ -+static void nand_davinci_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) -+{ -+ int i; -+ int num_words = len >> 2; -+ u32 *p = (u32 *)buf; -+ struct nand_chip *chip = mtd->priv; -+ -+ for (i = 0; i < num_words; i++) -+ p[i] = readl(chip->IO_ADDR_R); -+} -+ -+/* -+ * Check hardware register for wait status. Returns 1 if device is ready, -+ * 0 if it is still busy. -+ */ -+static int nand_davinci_dev_ready(struct mtd_info *mtd) -+{ -+ return (davinci_nand_readl(NANDFSR_OFFSET) & NAND_BUSY_FLAG); -+} -+ -+static void nand_davinci_set_eccsize(struct nand_chip *chip) -+{ -+ chip->ecc.size = 256; -+ -+#ifdef CONFIG_NAND_FLASH_HW_ECC -+ switch (chip->ecc.mode) { -+ case NAND_ECC_HW12_2048: -+ chip->ecc.size = 2048; -+ break; -+ -+ case NAND_ECC_HW3_512: -+ case NAND_ECC_HW6_512: -+ case NAND_ECC_HW8_512: -+ chip->ecc.size = 512; -+ break; -+ -+ case NAND_ECC_HW3_256: -+ default: -+ /* do nothing */ -+ break; -+ } -+#endif -+} -+ -+static void nand_davinci_set_eccbytes(struct nand_chip *chip) -+{ -+ chip->ecc.bytes = 3; -+ -+#ifdef CONFIG_NAND_FLASH_HW_ECC -+ switch (chip->ecc.mode) { -+ case NAND_ECC_HW12_2048: -+ chip->ecc.bytes += 4; -+ case NAND_ECC_HW8_512: -+ chip->ecc.bytes += 2; -+ case NAND_ECC_HW6_512: -+ chip->ecc.bytes += 3; -+ case NAND_ECC_HW3_512: -+ case NAND_ECC_HW3_256: -+ default: -+ /* do nothing */ -+ break; -+ } -+#endif -+} -+ -+static void __devinit nand_davinci_flash_init(void) -+{ -+ u32 regval, tmp; -+ -+ /* Check for correct pin mux, reconfigure if necessary */ -+ tmp = davinci_readl(DAVINCI_SYSTEM_MODULE_BASE + PINMUX0); -+ -+ if ((tmp & 0x20020C1F) != 0x00000C1F) { -+ /* Disable HPI and ATA mux */ -+ davinci_mux_peripheral(DAVINCI_MUX_HPIEN, 0); -+ davinci_mux_peripheral(DAVINCI_MUX_ATAEN, 0); -+ -+ /* Enable VLYNQ and AEAW */ -+ davinci_mux_peripheral(DAVINCI_MUX_AEAW0, 1); -+ davinci_mux_peripheral(DAVINCI_MUX_AEAW1, 1); -+ davinci_mux_peripheral(DAVINCI_MUX_AEAW2, 1); -+ davinci_mux_peripheral(DAVINCI_MUX_AEAW3, 1); -+ davinci_mux_peripheral(DAVINCI_MUX_AEAW4, 1); -+ davinci_mux_peripheral(DAVINCI_MUX_VLSCREN, 1); -+ davinci_mux_peripheral(DAVINCI_MUX_VLYNQEN, 1); -+ -+ regval = davinci_readl(DAVINCI_SYSTEM_MODULE_BASE + PINMUX0); -+ -+ printk(KERN_WARNING "Warning: MUX config for NAND: Set " \ -+ "PINMUX0 reg to 0x%08x, was 0x%08x, should be done " \ -+ "by bootloader.\n", regval, tmp); -+ } -+ -+ regval = davinci_nand_readl(AWCCR_OFFSET); -+ regval |= 0x10000000; -+ davinci_nand_writel(regval, AWCCR_OFFSET); -+ -+ /*------------------------------------------------------------------* -+ * NAND FLASH CHIP TIMEOUT @ 459 MHz * -+ * * -+ * AEMIF.CLK freq = PLL1/6 = 459/6 = 76.5 MHz * -+ * AEMIF.CLK period = 1/76.5 MHz = 13.1 ns * -+ * * -+ *------------------------------------------------------------------*/ -+ regval = 0 -+ | (0 << 31) /* selectStrobe */ -+ | (0 << 30) /* extWait */ -+ | (1 << 26) /* writeSetup 10 ns */ -+ | (3 << 20) /* writeStrobe 40 ns */ -+ | (1 << 17) /* writeHold 10 ns */ -+ | (0 << 13) /* readSetup 10 ns */ -+ | (3 << 7) /* readStrobe 60 ns */ -+ | (0 << 4) /* readHold 10 ns */ -+ | (3 << 2) /* turnAround ?? ns */ -+ | (0 << 0) /* asyncSize 8-bit bus */ -+ ; -+ tmp = davinci_nand_readl(A1CR_OFFSET); -+ if (tmp != regval) { -+ printk(KERN_WARNING "Warning: NAND config: Set A1CR " \ -+ "reg to 0x%08x, was 0x%08x, should be done by " \ -+ "bootloader.\n", regval, tmp); -+ davinci_nand_writel(regval, A1CR_OFFSET); /* 0x0434018C */ -+ } -+ -+ davinci_nand_writel(0x00000101, NANDFCR_OFFSET); -+} -+ -+/* -+ * Main initialization routine -+ */ -+int __devinit nand_davinci_probe(struct platform_device *pdev) -+{ -+ struct nand_platform_data *pdata = pdev->dev.platform_data; -+ struct resource *res = pdev->resource; -+ struct nand_chip *chip; -+ struct device *dev = NULL; -+ u32 nand_rev_code; -+#ifdef CONFIG_MTD_CMDLINE_PARTS -+ char *master_name; -+ int mtd_parts_nb = 0; -+ struct mtd_partition *mtd_parts = 0; -+#endif -+ -+ nand_clock = clk_get(dev, "AEMIFCLK"); -+ if (IS_ERR(nand_clock)) { -+ printk(KERN_ERR "Error %ld getting AEMIFCLK clock?\n", -+ PTR_ERR(nand_clock)); -+ return -1; -+ } -+ -+ clk_enable(nand_clock); -+ -+ /* Allocate memory for MTD device structure and private data */ -+ nand_davinci_mtd = kmalloc(sizeof(struct mtd_info) + -+ sizeof(struct nand_chip), GFP_KERNEL); -+ -+ if (!nand_davinci_mtd) { -+ printk(KERN_ERR "Unable to allocate davinci NAND MTD device " \ -+ "structure.\n"); -+ clk_disable(nand_clock); -+ return -ENOMEM; -+ } -+ -+ /* Get pointer to private data */ -+ chip = (struct nand_chip *) (&nand_davinci_mtd[1]); -+ -+ /* Initialize structures */ -+ memset((char *)nand_davinci_mtd, 0, sizeof(struct mtd_info)); -+ memset((char *)chip, 0, sizeof(struct nand_chip)); -+ -+ /* Link the private data with the MTD structure */ -+ nand_davinci_mtd->priv = chip; -+ -+ nand_rev_code = davinci_nand_readl(NRCSR_OFFSET); -+ -+ printk("DaVinci NAND Controller rev. %d.%d\n", -+ (nand_rev_code >> 8) & 0xff, nand_rev_code & 0xff); -+ -+ nand_vaddr = ioremap(res->start, res->end - res->start); -+ if (nand_vaddr == NULL) { -+ printk(KERN_ERR "DaVinci NAND: ioremap failed.\n"); -+ clk_disable(nand_clock); -+ kfree(nand_davinci_mtd); -+ return -ENOMEM; -+ } -+ -+ chip->IO_ADDR_R = (void __iomem *)nand_vaddr; -+ chip->IO_ADDR_W = (void __iomem *)nand_vaddr; -+ chip->chip_delay = 0; -+ chip->select_chip = nand_davinci_select_chip; -+ chip->options = 0; -+ chip->ecc.mode = DAVINCI_NAND_ECC_MODE; -+ -+ /* Set ECC size and bytes */ -+ nand_davinci_set_eccsize(chip); -+ nand_davinci_set_eccbytes(chip); -+ -+ /* Set address of hardware control function */ -+ chip->cmd_ctrl = nand_davinci_hwcontrol; -+ chip->dev_ready = nand_davinci_dev_ready; -+ -+#ifdef CONFIG_NAND_FLASH_HW_ECC -+ chip->ecc.calculate = nand_davinci_calculate_ecc; -+ chip->ecc.correct = nand_davinci_correct_data; -+ chip->ecc.hwctl = nand_davinci_enable_hwecc; -+#endif -+ -+ /* Speed up the read buffer */ -+ chip->read_buf = nand_davinci_read_buf; -+ -+ /* Speed up the creation of the bad block table */ -+ chip->scan_bbt = nand_davinci_scan_bbt; -+ -+ nand_davinci_flash_init(); -+ -+ nand_davinci_mtd->owner = THIS_MODULE; -+ -+ /* Scan to find existence of the device */ -+ if (nand_scan(nand_davinci_mtd, 1)) { -+ printk(KERN_ERR "Chip Select is not set for NAND\n"); -+ clk_disable(nand_clock); -+ kfree(nand_davinci_mtd); -+ return -ENXIO; -+ } -+ -+ /* Register the partitions */ -+ add_mtd_partitions(nand_davinci_mtd, pdata->parts, pdata->nr_parts); -+ -+#ifdef CONFIG_MTD_CMDLINE_PARTS -+ /* Set nand_davinci_mtd->name = 0 temporarily */ -+ master_name = nand_davinci_mtd->name; -+ nand_davinci_mtd->name = (char *)0; -+ -+ /* nand_davinci_mtd->name == 0, means: don't bother checking -+ <mtd-id> */ -+ mtd_parts_nb = parse_mtd_partitions(nand_davinci_mtd, part_probes, -+ &mtd_parts, 0); -+ -+ /* Restore nand_davinci_mtd->name */ -+ nand_davinci_mtd->name = master_name; -+ -+ add_mtd_partitions(nand_davinci_mtd, mtd_parts, mtd_parts_nb); -+#endif -+ -+ return 0; -+} -+ -+/* -+ * Clean up routine -+ */ -+static int nand_davinci_remove(struct platform_device *pdev) -+{ -+ clk_disable(nand_clock); -+ -+ if (nand_vaddr) -+ iounmap(nand_vaddr); -+ -+ /* Release resources, unregister device */ -+ nand_release(nand_davinci_mtd); -+ -+ /* Free the MTD device structure */ -+ kfree(nand_davinci_mtd); -+ -+ return 0; -+} -+ -+ -+static struct platform_driver nand_davinci_driver = { -+ .probe = nand_davinci_probe, -+ .remove = nand_davinci_remove, -+ .driver = { -+ .name = DRIVER_NAME, -+ }, -+}; -+ -+static int __init nand_davinci_init(void) -+{ -+ return platform_driver_register(&nand_davinci_driver); -+} -+module_init(nand_davinci_init); -+ -+#ifdef MODULE -+static void __exit nand_davinci_exit(void) -+{ -+ platform_driver_unregister(&nand_davinci_driver); -+} -+module_exit(nand_davinci_exit); -+#endif -+ -+MODULE_ALIAS(DRIVER_NAME); -+MODULE_LICENSE("GPL"); -+MODULE_AUTHOR("Texas Instruments"); -+MODULE_DESCRIPTION("Board-specific glue layer for NAND flash on davinci" \ -+ "board"); -Index: linux-davinci/drivers/mtd/nand/Makefile -=================================================================== ---- linux-davinci.orig/drivers/mtd/nand/Makefile -+++ linux-davinci/drivers/mtd/nand/Makefile -@@ -29,5 +29,6 @@ obj-$(CONFIG_MTD_NAND_AT91) += at91_nan - obj-$(CONFIG_MTD_NAND_CM_X270) += cmx270_nand.o - obj-$(CONFIG_MTD_NAND_BASLER_EXCITE) += excite_nandflash.o - obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o -+obj-$(CONFIG_MTD_NAND_DAVINCI) += davinci_nand.o - - nand-objs := nand_base.o nand_bbt.o -Index: linux-davinci/drivers/mtd/nand/Kconfig -=================================================================== ---- linux-davinci.orig/drivers/mtd/nand/Kconfig -+++ linux-davinci/drivers/mtd/nand/Kconfig -@@ -293,5 +293,17 @@ config MTD_NAND_PLATFORM - devices. You will need to provide platform-specific functions - via platform_data. - -+config MTD_NAND_DAVINCI -+ tristate "NAND Flash device on DaVinci SoC" -+ depends on MTD_NAND -+ select MTD_PARTITIONS -+ help -+ Support for NAND flash on Texas Instruments DaVinci SoC. -+ -+config NAND_FLASH_HW_ECC -+ bool "Hardware ECC Support on NAND Device for DaVinci" -+ depends on MTD_NAND_DAVINCI -+ help -+ Support for Hardware ECC on NAND device for DaVinci. - - endif # MTD_NAND -Index: linux-davinci/include/asm-arm/arch-davinci/nand.h -=================================================================== ---- /dev/null -+++ linux-davinci/include/asm-arm/arch-davinci/nand.h -@@ -0,0 +1,45 @@ -+/* -+ * include/asm-arm/arch-davinci/nand.h -+ * -+ * Copyright (C) 2006 Texas Instruments. -+ * -+ * ported to 2.6.23 (C) 2008 by -+ * Sander Huijsen <Shuijsen@optelecom-nkf.com> -+ * Troy Kisky <troy.kisky@boundarydevices.com> -+ * Dirk Behme <Dirk.Behme@gmail.com> -+ * -+ * -------------------------------------------------------------------------- -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -------------------------------------------------------------------------- -+ * -+ */ -+ -+#ifndef __ARCH_ARM_DAVINCI_NAND_H -+#define __ARCH_ARM_DAVINCI_NAND_H -+ -+#define NRCSR_OFFSET 0x00 -+#define AWCCR_OFFSET 0x04 -+#define A1CR_OFFSET 0x10 -+#define NANDFCR_OFFSET 0x60 -+#define NANDFSR_OFFSET 0x64 -+#define NANDF1ECC_OFFSET 0x70 -+ -+#define MASK_ALE 0x0A -+#define MASK_CLE 0x10 -+ -+#define NAND_BUSY_FLAG 0x01 -+ -+#endif /* __ARCH_ARM_DAVINCI_NAND_H */ -Index: linux-davinci/arch/arm/mach-davinci/mux.c -=================================================================== ---- linux-davinci.orig/arch/arm/mach-davinci/mux.c -+++ linux-davinci/arch/arm/mach-davinci/mux.c -@@ -15,10 +15,6 @@ - - #include <asm/arch/mux.h> - --/* System control register offsets */ --#define PINMUX0 0x00 --#define PINMUX1 0x04 -- - static DEFINE_SPINLOCK(mux_lock); - - void davinci_mux_peripheral(unsigned int mux, unsigned int enable) -Index: linux-davinci/include/asm-arm/arch-davinci/mux.h -=================================================================== ---- linux-davinci.orig/include/asm-arm/arch-davinci/mux.h -+++ linux-davinci/include/asm-arm/arch-davinci/mux.h -@@ -11,6 +11,11 @@ - #ifndef __ASM_ARCH_MUX_H - #define __ASM_ARCH_MUX_H - -+/* System control register offsets */ -+#define PINMUX0 0x00 -+#define PINMUX1 0x04 -+ -+/* System control register bits */ - #define DAVINCI_MUX_AEAW0 0 - #define DAVINCI_MUX_AEAW1 1 - #define DAVINCI_MUX_AEAW2 2 -Index: linux-davinci/include/linux/mtd/nand.h -=================================================================== ---- linux-davinci.orig/include/linux/mtd/nand.h -+++ linux-davinci/include/linux/mtd/nand.h -@@ -123,6 +123,13 @@ typedef enum { - NAND_ECC_SOFT, - NAND_ECC_HW, - NAND_ECC_HW_SYNDROME, -+#ifdef CONFIG_NAND_FLASH_HW_ECC -+ NAND_ECC_HW3_256, -+ NAND_ECC_HW3_512, -+ NAND_ECC_HW6_512, -+ NAND_ECC_HW8_512, -+ NAND_ECC_HW12_2048, -+#endif - } nand_ecc_modes_t; - - /* -Index: linux-davinci/drivers/mtd/nand/nand_base.c -=================================================================== ---- linux-davinci.orig/drivers/mtd/nand/nand_base.c -+++ linux-davinci/drivers/mtd/nand/nand_base.c -@@ -2456,6 +2456,13 @@ int nand_scan_tail(struct mtd_info *mtd) - chip->ecc.write_page_raw = nand_write_page_raw; - - switch (chip->ecc.mode) { -+#ifdef CONFIG_NAND_FLASH_HW_ECC -+ case NAND_ECC_HW12_2048: -+ case NAND_ECC_HW8_512: -+ case NAND_ECC_HW6_512: -+ case NAND_ECC_HW3_512: -+ case NAND_ECC_HW3_256: -+#endif - case NAND_ECC_HW: - /* Use standard hwecc read page function ? */ - if (!chip->ecc.read_page) -Index: linux-davinci/arch/arm/mach-davinci/board-evm.c -=================================================================== ---- linux-davinci.orig/arch/arm/mach-davinci/board-evm.c -+++ linux-davinci/arch/arm/mach-davinci/board-evm.c -@@ -14,6 +14,7 @@ - #include <linux/dma-mapping.h> - #include <linux/platform_device.h> - #include <linux/mtd/mtd.h> -+#include <linux/mtd/nand.h> - #include <linux/mtd/partitions.h> - #include <linux/mtd/physmap.h> - -@@ -27,6 +28,7 @@ - #include <asm/mach/flash.h> - - #include <asm/arch/common.h> -+#include <asm/arch/hardware.h> - #include <asm/arch/psc.h> - - /* other misc. init functions */ -@@ -38,7 +40,7 @@ void __init davinci_init_common_hw(void) - /* NOR Flash base address set to CS0 by default */ - #define NOR_FLASH_PHYS 0x02000000 - --static struct mtd_partition davinci_evm_partitions[] = { -+static struct mtd_partition davinci_evm_norflash_partitions[] = { - /* bootloader (U-Boot, etc) in first 4 sectors */ - { - .name = "bootloader", -@@ -69,30 +71,63 @@ static struct mtd_partition davinci_evm_ - } - }; - --static struct physmap_flash_data davinci_evm_flash_data = { -+static struct physmap_flash_data davinci_evm_norflash_data = { - .width = 2, -- .parts = davinci_evm_partitions, -- .nr_parts = ARRAY_SIZE(davinci_evm_partitions), -+ .parts = davinci_evm_norflash_partitions, -+ .nr_parts = ARRAY_SIZE(davinci_evm_norflash_partitions), - }; - - /* NOTE: CFI probe will correctly detect flash part as 32M, but EMIF - * limits addresses to 16M, so using addresses past 16M will wrap */ --static struct resource davinci_evm_flash_resource = { -+static struct resource davinci_evm_norflash_resource = { - .start = NOR_FLASH_PHYS, - .end = NOR_FLASH_PHYS + SZ_16M - 1, - .flags = IORESOURCE_MEM, - }; - --static struct platform_device davinci_evm_flash_device = { -+static struct platform_device davinci_evm_norflash_device = { - .name = "physmap-flash", - .id = 0, - .dev = { -- .platform_data = &davinci_evm_flash_data, -+ .platform_data = &davinci_evm_norflash_data, - }, - .num_resources = 1, -- .resource = &davinci_evm_flash_resource, -+ .resource = &davinci_evm_norflash_resource, - }; - -+#if defined(CONFIG_MTD_NAND_DAVINCI) || defined(CONFIG_MTD_NAND_DAVINCI_MODULE) -+struct mtd_partition davinci_evm_nandflash_partition[] = { -+ /* 5 MB space at the beginning for bootloader and kernel */ -+ { -+ .name = "NAND filesystem", -+ .offset = 5 * SZ_1M, -+ .size = MTDPART_SIZ_FULL, -+ .mask_flags = 0, -+ } -+}; -+ -+static struct nand_platform_data davinci_evm_nandflash_data = { -+ .parts = davinci_evm_nandflash_partition, -+ .nr_parts = ARRAY_SIZE(davinci_evm_nandflash_partition), -+}; -+ -+static struct resource davinci_evm_nandflash_resource = { -+ .start = DAVINCI_ASYNC_EMIF_DATA_CE0_BASE, -+ .end = DAVINCI_ASYNC_EMIF_DATA_CE0_BASE + SZ_16K - 1, -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device davinci_evm_nandflash_device = { -+ .name = "davinci_nand", -+ .id = 0, -+ .dev = { -+ .platform_data = &davinci_evm_nandflash_data, -+ }, -+ .num_resources = 1, -+ .resource = &davinci_evm_nandflash_resource, -+}; -+#endif -+ - #if defined(CONFIG_FB_DAVINCI) || defined(CONFIG_FB_DAVINCI_MODULE) - - static u64 davinci_fb_dma_mask = DMA_32BIT_MASK; -@@ -168,7 +203,10 @@ static struct platform_device rtc_dev = - }; - - static struct platform_device *davinci_evm_devices[] __initdata = { -- &davinci_evm_flash_device, -+ &davinci_evm_norflash_device, -+#if defined(CONFIG_MTD_NAND_DAVINCI) || defined(CONFIG_MTD_NAND_DAVINCI_MODULE) -+ &davinci_evm_nandflash_device, -+#endif - #if defined(CONFIG_FB_DAVINCI) || defined(CONFIG_FB_DAVINCI_MODULE) - &davinci_fb_device, - #endif diff --git a/packages/linux/linux-davinci/davinci-sffsdr/defconfig b/packages/linux/linux-davinci/davinci-sffsdr/defconfig index 0d5155f32a..7d67d34e53 100644 --- a/packages/linux/linux-davinci/davinci-sffsdr/defconfig +++ b/packages/linux/linux-davinci/davinci-sffsdr/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.23-davinci1 -# Sun Feb 3 08:30:51 2008 +# Linux kernel version: 2.6.25-rc8-davinci1 +# Tue Apr 15 07:09:55 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -21,6 +21,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_SUPPORTS_AOUT=y CONFIG_ZONE_DMA=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -39,13 +40,20 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set -# CONFIG_USER_NS is not set # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -54,22 +62,33 @@ CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y +CONFIG_COMPAT_BRK=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -97,6 +116,7 @@ CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_CLASSIC_RCU=y # # System Type @@ -125,6 +145,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_ORION is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -134,6 +155,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_LH7A40X is not set CONFIG_ARCH_DAVINCI=y # CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_MSM7X00A is not set # # Boot options @@ -192,10 +214,6 @@ CONFIG_ARM_THUMB=y # # CONFIG_PCI_SYSCALL is not set # CONFIG_ARCH_SUPPORTS_MSI is not set - -# -# PCCARD (PCMCIA/CardBus) support -# # CONFIG_PCCARD is not set # @@ -204,6 +222,7 @@ CONFIG_ARM_THUMB=y # CONFIG_TICK_ONESHOT is not set # CONFIG_NO_HZ is not set # CONFIG_HIGH_RES_TIMERS is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y # CONFIG_PREEMPT is not set CONFIG_HZ=100 CONFIG_AEABI=y @@ -216,6 +235,7 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set +# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 @@ -241,8 +261,7 @@ CONFIG_CMDLINE="" # # At least one emulation must be selected # -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_NWFPE is not set # CONFIG_FPE_FASTFPE is not set # CONFIG_VFP is not set @@ -257,7 +276,7 @@ CONFIG_BINFMT_ELF=y # Power management options # # CONFIG_PM is not set -CONFIG_SUSPEND_UP_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y # # Networking @@ -274,6 +293,7 @@ CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set @@ -295,6 +315,7 @@ CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_LRO is not set CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set @@ -322,12 +343,13 @@ CONFIG_IPV6_SIT=m # CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y # # Core Netfilter Configuration # -# CONFIG_NETFILTER_NETLINK is not set -# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +# CONFIG_NETFILTER_NETLINK_LOG is not set # CONFIG_NF_CONNTRACK is not set # CONFIG_NETFILTER_XTABLES is not set @@ -339,7 +361,7 @@ CONFIG_NETFILTER=y # CONFIG_IP_NF_ARPTABLES is not set # -# IPv6: Netfilter Configuration (EXPERIMENTAL) +# IPv6: Netfilter Configuration # # CONFIG_IP6_NF_QUEUE is not set # CONFIG_IP6_NF_IPTABLES is not set @@ -357,10 +379,6 @@ CONFIG_NETFILTER=y # CONFIG_LAPB is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set - -# -# QoS and/or fair queueing -# # CONFIG_NET_SCHED is not set # @@ -368,6 +386,7 @@ CONFIG_NETFILTER=y # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set @@ -389,9 +408,12 @@ CONFIG_NETFILTER=y # # Generic Driver Options # +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set CONFIG_MTD=y @@ -399,7 +421,7 @@ CONFIG_MTD=y # CONFIG_MTD_CONCAT is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_CMDLINE_PARTS is not set # CONFIG_MTD_AFS_PARTS is not set # @@ -413,14 +435,13 @@ CONFIG_MTD_BLOCK=y # CONFIG_INFTL is not set # CONFIG_RFD_FTL is not set # CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set # # RAM/ROM/Flash chip drivers # -CONFIG_MTD_CFI=y +# CONFIG_MTD_CFI is not set # CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_GEN_PROBE=y -# CONFIG_MTD_CFI_ADV_OPTIONS is not set CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y @@ -431,10 +452,6 @@ CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set -# CONFIG_MTD_CFI_INTELEXT is not set -CONFIG_MTD_CFI_AMDSTD=y -# CONFIG_MTD_CFI_STAA is not set -CONFIG_MTD_CFI_UTIL=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set @@ -443,11 +460,6 @@ CONFIG_MTD_CFI_UTIL=y # Mapping drivers for chip access # # CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PHYSMAP_START=0x8000000 -CONFIG_MTD_PHYSMAP_LEN=0x0 -CONFIG_MTD_PHYSMAP_BANKWIDTH=2 -# CONFIG_MTD_ARM_INTEGRATOR is not set # CONFIG_MTD_PLATRAM is not set # @@ -465,15 +477,16 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set CONFIG_MTD_NAND_DAVINCI=y -CONFIG_NAND_FLASH_HW_ECC=y +# CONFIG_NAND_FLASH_HW_ECC is not set # CONFIG_MTD_ONENAND is not set # @@ -490,9 +503,13 @@ CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=1 CONFIG_BLK_DEV_RAM_SIZE=32768 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_BLK_DEV_XIP is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +CONFIG_HAVE_IDE=y # CONFIG_IDE is not set # @@ -531,6 +548,7 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set CONFIG_SCSI_LOWLEVEL=y # CONFIG_ISCSI_TCP is not set # CONFIG_SCSI_DEBUG is not set @@ -543,6 +561,7 @@ CONFIG_NETDEVICES=y # CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set CONFIG_TUN=m +# CONFIG_VETH is not set # CONFIG_PHYLIB is not set CONFIG_NET_ETHERNET=y # CONFIG_MII is not set @@ -550,8 +569,13 @@ CONFIG_NET_ETHERNET=y # CONFIG_SMC91X is not set CONFIG_TI_DAVINCI_EMAC=y # CONFIG_DM9000 is not set -CONFIG_NETDEV_1000=y -CONFIG_NETDEV_10000=y +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_B44 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set # # Wireless LAN @@ -566,7 +590,6 @@ CONFIG_NETDEV_10000=y # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET_MII is not set # CONFIG_USB_USBNET is not set # CONFIG_WAN is not set CONFIG_PPP=m @@ -581,8 +604,8 @@ CONFIG_PPP_DEFLATE=m # CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set CONFIG_SLHC=m -# CONFIG_SHAPER is not set CONFIG_NETCONSOLE=y +# CONFIG_NETCONSOLE_DYNAMIC is not set CONFIG_NETPOLL=y CONFIG_NETPOLL_TRAP=y CONFIG_NET_POLL_CONTROLLER=y @@ -598,9 +621,11 @@ CONFIG_INPUT=y # # Userland interfaces # -# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set @@ -608,10 +633,10 @@ CONFIG_INPUT_EVDEV=m # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -# CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_KEYBOARD_XTKBD=y # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_GPIO is not set @@ -626,7 +651,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_SERIO=y CONFIG_SERIO_SERPORT=y -# CONFIG_SERIO_LIBPS2 is not set +CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_RAW is not set # CONFIG_GAMEPORT is not set @@ -657,7 +682,6 @@ CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_IPMI_HANDLER is not set -# CONFIG_WATCHDOG is not set CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set CONFIG_DAVINCI_RTC=y @@ -678,6 +702,7 @@ CONFIG_I2C_CHARDEV=y # # I2C Hardware Bus support # +CONFIG_I2C_DAVINCI=y # CONFIG_I2C_GPIO is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set @@ -685,17 +710,14 @@ CONFIG_I2C_CHARDEV=y # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_TINY_USB is not set -CONFIG_I2C_DAVINCI=y # # Miscellaneous I2C Chip support # -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_DS1374 is not set # CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_PCF8575 is not set # CONFIG_SENSORS_PCF8591 is not set CONFIG_SENSORS_TLV320AIC23=y CONFIG_SENSORS_TLV320AIC33=y @@ -713,10 +735,9 @@ CONFIG_GPIOEXPANDER_DAVINCI=y # CONFIG_SPI is not set # CONFIG_SPI_MASTER is not set # CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set CONFIG_HWMON=y # CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ABITUGURU is not set -# CONFIG_SENSORS_ABITUGURU3 is not set # CONFIG_SENSORS_AD7418 is not set # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set @@ -724,12 +745,13 @@ CONFIG_HWMON=y # CONFIG_SENSORS_ADM1029 is not set # CONFIG_SENSORS_ADM1031 is not set # CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7473 is not set # CONFIG_SENSORS_ATXP1 is not set # CONFIG_SENSORS_DS1621 is not set # CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_IT87 is not set @@ -752,6 +774,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_THMC50 is not set # CONFIG_SENSORS_VT1211 is not set # CONFIG_SENSORS_W83781D is not set @@ -759,35 +782,42 @@ CONFIG_HWMON=y # CONFIG_SENSORS_W83792D is not set # CONFIG_SENSORS_W83793 is not set # CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set # CONFIG_HWMON_DEBUG_CHIP is not set -CONFIG_MISC_DEVICES=y -# CONFIG_EEPROM_93CX6 is not set +# CONFIG_WATCHDOG is not set + +# +# Sonics Silicon Backplane +# +CONFIG_SSB_POSSIBLE=y +# CONFIG_SSB is not set # # Multifunction device drivers # # CONFIG_MFD_SM501 is not set -# CONFIG_NEW_LEDS is not set +# CONFIG_MFD_ASIC3 is not set # # Multimedia devices # CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_VIVI is not set # CONFIG_VIDEO_TVP5146 is not set # CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_CPIA2 is not set # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set # CONFIG_TUNER_3036 is not set -# CONFIG_TUNER_TEA5761 is not set CONFIG_V4L_USB_DRIVERS=y # CONFIG_VIDEO_PVRUSB2 is not set # CONFIG_VIDEO_EM28XX is not set @@ -806,9 +836,11 @@ CONFIG_V4L_USB_DRIVERS=y # CONFIG_USB_ZC0301 is not set # CONFIG_USB_PWC is not set # CONFIG_USB_ZR364XX is not set +# CONFIG_USB_STKWEBCAM is not set CONFIG_RADIO_ADAPTERS=y # CONFIG_RADIO_TEA5761 is not set # CONFIG_USB_DSBR is not set +# CONFIG_USB_SI470X is not set # CONFIG_DVB_CORE is not set CONFIG_DAB=y # CONFIG_USB_DABUSB is not set @@ -816,21 +848,54 @@ CONFIG_DAB=y # # Graphics support # +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_DAVINCI=y +# CONFIG_FB_VIRTUAL is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Display device support # # CONFIG_DISPLAY_SUPPORT is not set -# CONFIG_VGASTATE is not set -# CONFIG_VIDEO_OUTPUT_CONTROL is not set -# CONFIG_FB is not set # # Console display driver support # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y # # Sound @@ -840,7 +905,56 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -# CONFIG_SND is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +CONFIG_SND_DEBUG_DETECT=y +# CONFIG_SND_PCM_XRUN_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +# CONFIG_SND_OMAP24XX_EAC is not set + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_CAIAQ is not set + +# +# System on Chip audio support +# +CONFIG_SND_SOC=m + +# +# SoC Audio support for SuperH +# + +# +# ALSA SoC audio for Freescale SOCs +# # # Open Sound System @@ -849,6 +963,7 @@ CONFIG_SOUND=y CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HID_DEBUG is not set +# CONFIG_HIDRAW is not set # # USB Input Devices @@ -869,6 +984,7 @@ CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_EHCI is not set CONFIG_USB=m # CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set # # Miscellaneous USB options @@ -916,6 +1032,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_DPCM is not set # CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set @@ -936,10 +1053,6 @@ CONFIG_USB_MON=y # # USB port drivers # - -# -# USB Serial Converter support -# # CONFIG_USB_SERIAL is not set # @@ -964,18 +1077,12 @@ CONFIG_USB_MON=y # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set - -# -# USB DSL modem support -# - -# -# USB Gadget Support -# CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set # CONFIG_USB_GADGET_FSL_USB2 is not set # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set @@ -995,37 +1102,27 @@ CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set -CONFIG_MMC=m +# CONFIG_USB_G_PRINTER is not set +CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set # # MMC/SD Card Drivers # -CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set # # MMC/SD Host Controller Drivers # -CONFIG_MMC_DAVINCI=m +CONFIG_MMC_DAVINCI=y +# CONFIG_NEW_LEDS is not set CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set # -# DMA Engine support -# -# CONFIG_DMA_ENGINE is not set - -# -# DMA Clients -# - -# -# DMA Devices -# - -# # File systems # CONFIG_EXT2_FS=y @@ -1037,7 +1134,6 @@ CONFIG_EXT3_FS_XATTR=y # CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set @@ -1049,12 +1145,10 @@ CONFIG_XFS_FS=m # CONFIG_XFS_RT is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -CONFIG_MINIX_FS=m -# CONFIG_ROMFS_FS is not set +CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set -CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m # CONFIG_FUSE_FS is not set @@ -1068,9 +1162,9 @@ CONFIG_AUTOFS4_FS=m # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set @@ -1084,7 +1178,6 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set -CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set # @@ -1100,36 +1193,32 @@ CONFIG_RAMFS=y CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set # CONFIG_JFFS2_SUMMARY is not set # CONFIG_JFFS2_FS_XATTR is not set # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set -# CONFIG_CRAMFS is not set +CONFIG_CRAMFS=y # CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set - -# -# Network File Systems -# +CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set -# CONFIG_NFSD_V4 is not set -CONFIG_NFSD_TCP=y +# CONFIG_NFSD is not set CONFIG_ROOT_NFS=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y # CONFIG_SUNRPC_BIND34 is not set @@ -1162,10 +1251,6 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set # CONFIG_SYSV68_PARTITION is not set - -# -# Native Language Support -# CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y @@ -1206,37 +1291,103 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=m - -# -# Distributed Lock Manager -# # CONFIG_DLM is not set # -# Profiling support -# -# CONFIG_PROFILING is not set - -# # Kernel hacking # # CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_SAMPLES is not set # CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set # # Security options # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set -# CONFIG_CRYPTO is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y +# CONFIG_CRYPTO_SEQIV is not set +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_XTS is not set +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TEST is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_LZO is not set +# CONFIG_CRYPTO_HW is not set # # Library routines diff --git a/packages/linux/linux-davinci/davinci-sffsdr/sffsdr.patch b/packages/linux/linux-davinci/davinci-sffsdr/sffsdr.patch new file mode 100644 index 0000000000..23ca399e98 --- /dev/null +++ b/packages/linux/linux-davinci/davinci-sffsdr/sffsdr.patch @@ -0,0 +1,190 @@ +diff --git a/arch/arm/mach-davinci/board-evm.c b/arch/arm/mach-davinci/board-evm.c +index 40a5665..e786ffc 100644 +--- a/arch/arm/mach-davinci/board-evm.c ++++ b/arch/arm/mach-davinci/board-evm.c +@@ -97,10 +97,22 @@ static struct platform_device davinci_evm_norflash_device = { + + #if defined(CONFIG_MTD_NAND_DAVINCI) || defined(CONFIG_MTD_NAND_DAVINCI_MODULE) + struct mtd_partition davinci_evm_nandflash_partition[] = { +- /* 5 MB space at the beginning for bootloader and kernel */ + { +- .name = "NAND filesystem", +- .offset = 5 * SZ_1M, ++ .name = "Bootloader", ++ .offset = 0, ++ .size = 5 * SZ_128K, ++ .mask_flags = 0, ++ }, ++ ++ { ++ .name = "Kernel", ++ .offset = MTDPART_OFS_APPEND, ++ .size = SZ_2M, ++ .mask_flags = 0, ++ }, ++ { ++ .name = "File System", ++ .offset = MTDPART_OFS_APPEND, + .size = MTDPART_SIZ_FULL, + .mask_flags = 0, + } +diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types +index 7ed58c0..ba506d0 100644 +--- a/arch/arm/tools/mach-types ++++ b/arch/arm/tools/mach-types +@@ -12,7 +12,7 @@ + # + # http://www.arm.linux.org.uk/developer/machines/?action=new + # +-# Last update: Sat Jan 26 14:45:34 2008 ++# Last update: Fri Apr 11 21:19:16 2008 + # + # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number + # +@@ -381,13 +381,13 @@ ks8695p ARCH_KS8695P KS8695P 363 + se4000 ARCH_SE4000 SE4000 364 + quadriceps ARCH_QUADRICEPS QUADRICEPS 365 + bronco ARCH_BRONCO BRONCO 366 +-esl_wireless_tab ARCH_ESL_WIRELESS_TABLETESL_WIRELESS_TABLET 367 ++esl_wireless_tab ARCH_ESL_WIRELESS_TAB ESL_WIRELESS_TAB 367 + esl_sofcomp ARCH_ESL_SOFCOMP ESL_SOFCOMP 368 + s5c7375 ARCH_S5C7375 S5C7375 369 + spearhead ARCH_SPEARHEAD SPEARHEAD 370 + pantera ARCH_PANTERA PANTERA 371 + prayoglite ARCH_PRAYOGLITE PRAYOGLITE 372 +-gumstix ARCH_GUMSTIK GUMSTIK 373 ++gumstix ARCH_GUMSTIX GUMSTIX 373 + rcube ARCH_RCUBE RCUBE 374 + rea_olv ARCH_REA_OLV REA_OLV 375 + pxa_iphone ARCH_PXA_IPHONE PXA_IPHONE 376 +@@ -910,7 +910,7 @@ nadia2vb MACH_NADIA2VB NADIA2VB 897 + r1000 MACH_R1000 R1000 898 + hw90250 MACH_HW90250 HW90250 899 + omap_2430sdp MACH_OMAP_2430SDP OMAP_2430SDP 900 +-davinci_evm MACH_DAVINCI_EVM DAVINCI_EVM 901 ++davinci_evm MACH_DAVINCI_EVM DAVINCI_EVM 1657 + omap_tornado MACH_OMAP_TORNADO OMAP_TORNADO 902 + olocreek MACH_OLOCREEK OLOCREEK 903 + palmz72 MACH_PALMZ72 PALMZ72 904 +@@ -1384,6 +1384,7 @@ olip8 MACH_OLIP8 OLIP8 1378 + ghi270hg MACH_GHI270HG GHI270HG 1379 + davinci_dm6467_evm MACH_DAVINCI_DM6467_EVM DAVINCI_DM6467_EVM 1380 + davinci_dm355_evm MACH_DAVINCI_DM350_EVM DAVINCI_DM350_EVM 1381 ++ocearm MACH_OCEARMTEST OCEARMTEST 1382 + blackriver MACH_BLACKRIVER BLACKRIVER 1383 + sandgate_wp MACH_SANDGATEWP SANDGATEWP 1384 + cdotbwsg MACH_CDOTBWSG CDOTBWSG 1385 +@@ -1463,7 +1464,7 @@ artemis MACH_ARTEMIS ARTEMIS 1462 + htctitan MACH_HTCTITAN HTCTITAN 1463 + qranium MACH_QRANIUM QRANIUM 1464 + adx_wsc2 MACH_ADX_WSC2 ADX_WSC2 1465 +-adx_medinet MACH_ADX_MEDINET ADX_MEDINET 1466 ++adx_medcom MACH_ADX_MEDINET ADX_MEDINET 1466 + bboard MACH_BBOARD BBOARD 1467 + cambria MACH_CAMBRIA CAMBRIA 1468 + mt7xxx MACH_MT7XXX MT7XXX 1469 +@@ -1611,3 +1612,104 @@ kb9263 MACH_KB9263 KB9263 1612 + mt7108 MACH_MT7108 MT7108 1613 + smtr2440 MACH_SMTR2440 SMTR2440 1614 + manao MACH_MANAO MANAO 1615 ++cm_x300 MACH_CM_X300 CM_X300 1616 ++gulfstream_kp MACH_GULFSTREAM_KP GULFSTREAM_KP 1617 ++lanreadyfn522 MACH_LANREADYFN522 LANREADYFN522 1618 ++arma37 MACH_ARMA37 ARMA37 1619 ++mendel MACH_MENDEL MENDEL 1620 ++pelco_iliad MACH_PELCO_ILIAD PELCO_ILIAD 1621 ++unit2p MACH_UNIT2P UNIT2P 1622 ++inc20otter MACH_INC20OTTER INC20OTTER 1623 ++at91sam9g20ek MACH_AT91SAM9G20EK AT91SAM9G20EK 1624 ++sc_ge2 MACH_STORCENTER STORCENTER 1625 ++smdk6410 MACH_SMDK6410 SMDK6410 1626 ++u300 MACH_U300 U300 1627 ++u500 MACH_U500 U500 1628 ++ds9260 MACH_DS9260 DS9260 1629 ++riverrock MACH_RIVERROCK RIVERROCK 1630 ++scibath MACH_SCIBATH SCIBATH 1631 ++at91sam7se MACH_AT91SAM7SE512EK AT91SAM7SE512EK 1632 ++wrt350n_v2 MACH_WRT350N_V2 WRT350N_V2 1633 ++multimedia MACH_MULTIMEDIA MULTIMEDIA 1634 ++marvin MACH_MARVIN MARVIN 1635 ++x500 MACH_X500 X500 1636 ++awlug4lcu MACH_AWLUG4LCU AWLUG4LCU 1637 ++palermoc MACH_PALERMOC PALERMOC 1638 ++omap_zoom MACH_OMAP_3430LABRADOR OMAP_3430LABRADOR 1639 ++ip500 MACH_IP500 IP500 1640 ++mx35ads MACH_MACH_MX35ADS MACH_MX35ADS 1641 ++ase2 MACH_ASE2 ASE2 1642 ++mx35evb MACH_MX35EVB MX35EVB 1643 ++aml_m8050 MACH_AML_M8050 AML_M8050 1644 ++mx35_3ds MACH_MX35_3DS MX35_3DS 1645 ++mars MACH_MARS MARS 1646 ++ntosd_644xa MACH_NTOSD_644XA NTOSD_644XA 1647 ++badger MACH_BADGER BADGER 1648 ++trizeps4wl MACH_TRIZEPS4WL TRIZEPS4WL 1649 ++trizeps5 MACH_TRIZEPS5 TRIZEPS5 1650 ++marlin MACH_MARLIN MARLIN 1651 ++ts7800 MACH_TS7800 TS7800 1652 ++hpipaq214 MACH_HPIPAQ214 HPIPAQ214 1653 ++at572d940dcm MACH_AT572D940DCM AT572D940DCM 1654 ++ne1board MACH_NE1BOARD NE1BOARD 1655 ++zante MACH_ZANTE ZANTE 1656 ++sffsdr MACH_SFFSDR SFFSDR 1657 ++tw2662 MACH_TW2662 TW2662 1658 ++vf10xx MACH_VF10XX VF10XX 1659 ++zoran43xx MACH_ZORAN43XX ZORAN43XX 1660 ++sonix926 MACH_SONIX926 SONIX926 1661 ++celestialsemi MACH_CELESTIALSEMI CELESTIALSEMI 1662 ++cc9m2443 MACH_CC9M2443 CC9M2443 1663 ++tw5334 MACH_TW5334 TW5334 1664 ++omap_htcartemis MACH_HTCARTEMIS HTCARTEMIS 1665 ++nal_hlite MACH_NAL_HLITE NAL_HLITE 1666 ++htcvogue MACH_HTCVOGUE HTCVOGUE 1667 ++smartweb MACH_SMARTWEB SMARTWEB 1668 ++mv86xx MACH_MV86XX MV86XX 1669 ++mv87xx MACH_MV87XX MV87XX 1670 ++songyoungho MACH_SONGYOUNGHO SONGYOUNGHO 1671 ++younghotema MACH_YOUNGHOTEMA YOUNGHOTEMA 1672 ++pcm037 MACH_PCM037 PCM037 1673 ++mmvp MACH_MMVP MMVP 1674 ++mmap MACH_MMAP MMAP 1675 ++ptid2410 MACH_PTID2410 PTID2410 1676 ++james_926 MACH_JAMES_926 JAMES_926 1677 ++fm6000 MACH_FM6000 FM6000 1678 ++db88f6281_bp MACH_DB88F6281_BP DB88F6281_BP 1680 ++rd88f6192_nas MACH_RD88F6192_NAS RD88F6192_NAS 1681 ++rd88f6281 MACH_RD88F6281 RD88F6281 1682 ++db78x00_bp MACH_DB78X00_BP DB78X00_BP 1683 ++smdk2416 MACH_SMDK2416 SMDK2416 1685 ++oce_spider_si MACH_OCE_SPIDER_SI OCE_SPIDER_SI 1686 ++oce_spider_sk MACH_OCE_SPIDER_SK OCE_SPIDER_SK 1687 ++rovern6 MACH_ROVERN6 ROVERN6 1688 ++pelco_evolution MACH_PELCO_EVOLUTION PELCO_EVOLUTION 1689 ++wbd111 MACH_WBD111 WBD111 1690 ++elaracpe MACH_ELARACPE ELARACPE 1691 ++mabv3 MACH_MABV3 MABV3 1692 ++mv2120 MACH_MV2120 MV2120 1693 ++csb737 MACH_CSB737 CSB737 1695 ++mx51_3ds MACH_MX51_3DS MX51_3DS 1696 ++g900 MACH_G900 G900 1697 ++apf27 MACH_APF27 APF27 1698 ++ggus2000 MACH_GGUS2000 GGUS2000 1699 ++omap_2430_mimic MACH_OMAP_2430_MIMIC OMAP_2430_MIMIC 1700 ++imx27lite MACH_IMX27LITE IMX27LITE 1701 ++almex MACH_ALMEX ALMEX 1702 ++control MACH_CONTROL CONTROL 1703 ++mba2410 MACH_MBA2410 MBA2410 1704 ++volcano MACH_VOLCANO VOLCANO 1705 ++zenith MACH_ZENITH ZENITH 1706 ++muchip MACH_MUCHIP MUCHIP 1707 ++magellan MACH_MAGELLAN MAGELLAN 1708 ++usb_a9260 MACH_USB_A9260 USB_A9260 1709 ++usb_a9263 MACH_USB_A9263 USB_A9263 1710 ++qil_a9260 MACH_QIL_A9260 QIL_A9260 1711 ++cme9210 MACH_CME9210 CME9210 1712 ++hczh4 MACH_HCZH4 HCZH4 1713 ++spearbasic MACH_SPEARBASIC SPEARBASIC 1714 ++dep2440 MACH_DEP2440 DEP2440 1715 ++hdl_gxr MACH_HDL_GXR HDL_GXR 1716 ++hdl_gt MACH_HDL_GT HDL_GT 1717 ++hdl_4g MACH_HDL_4G HDL_4G 1718 ++s3c6000 MACH_S3C6000 S3C6000 1719 diff --git a/packages/linux/linux-davinci_2.6.x+git-davinci.bb b/packages/linux/linux-davinci_2.6.x+git-davinci.bb index 916b4e252c..0719b47466 100644 --- a/packages/linux/linux-davinci_2.6.x+git-davinci.bb +++ b/packages/linux/linux-davinci_2.6.x+git-davinci.bb @@ -1,13 +1,19 @@ require linux-omap.inc -PV = "2.6.x+git${SRCDATE}" +# uncomment the below to get the latest and greatest and avoid a full reparse +# or override in it local.conf like this: DAVINCI_SRCREV_pn-linux-davinci = "${@bb.fetch.get_srcrev(d)}" +#DAVINCI_SRCREV = "${@bb.fetch.get_srcrev(d)}" +DAVINCI_SRCREV ?= "758eda6a823eacb2412b3c71da5f0ad07a16469d" +SRCREV = "${DAVINCI_SRCREV}" + +PV = "2.6.24+2.6.25-rc8-git${SRCREV}" PR = "r1" COMPATIBLE_MACHINE = "(davinci-dvevm|davinci-sffsdr)" SRC_URI = "git://source.mvista.com/git/linux-davinci-2.6.git;protocol=git \ - file://binutils-buildid-arm.patch;patch=1 \ - file://davinci-nand.patch;patch=1 \ file://defconfig" +SRC_URI_append_davinci-sffsdr = " file://sffsdr.patch;patch=1" + S = "${WORKDIR}/git" diff --git a/packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch b/packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch new file mode 100644 index 0000000000..a118a08f0d --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch @@ -0,0 +1,30 @@ +Re-arranging OMAP2 and OMAP3 boards + +Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> +--- + arch/arm/mach-omap2/Kconfig | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +Index: my_branch/arch/arm/mach-omap2/Kconfig +=================================================================== +--- my_branch.orig/arch/arm/mach-omap2/Kconfig 2008-04-16 14:39:51.000000000 +0530 ++++ my_branch/arch/arm/mach-omap2/Kconfig 2008-04-16 14:40:02.000000000 +0530 +@@ -98,10 +98,11 @@ + bool "OMAP 2430 SDP board" + depends on ARCH_OMAP2 && ARCH_OMAP2430 + ++config MACH_OMAP_2430OSK ++ bool "OMAP 2430 OSK board" ++ depends on ARCH_OMAP2 && ARCH_OMAP24XX ++ + config MACH_OMAP_3430SDP + bool "OMAP 3430 SDP board" + depends on ARCH_OMAP3 && ARCH_OMAP34XX + +-config MACH_OMAP_2430OSK +- bool "OMAP 2430 OSK board" +- depends on ARCH_OMAP2 && ARCH_OMAP24XX +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch b/packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch new file mode 100644 index 0000000000..6b9d719ceb --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch @@ -0,0 +1,37 @@ + +Updated Kconfig and Makefile to add OMAP3 EVM Board + +Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> +--- + arch/arm/mach-omap2/Kconfig | 3 +++ + arch/arm/mach-omap2/Makefile | 1 + + 2 files changed, 4 insertions(+) + +Index: my_branch/arch/arm/mach-omap2/Makefile +=================================================================== +--- my_branch.orig/arch/arm/mach-omap2/Makefile 2008-04-16 14:39:51.000000000 +0530 ++++ my_branch/arch/arm/mach-omap2/Makefile 2008-04-16 14:41:28.000000000 +0530 +@@ -34,6 +34,7 @@ + board-sdp-hsmmc.o \ + board-3430sdp-usb.o \ + board-3430sdp-flash.o ++obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o + obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \ + board-apollon-mmc.o \ + board-apollon-keys.o + +Index: my_branch/arch/arm/mach-omap2/Kconfig +=================================================================== +--- my_branch.orig/arch/arm/mach-omap2/Kconfig 2008-04-16 14:40:02.000000000 +0530 ++++ my_branch/arch/arm/mach-omap2/Kconfig 2008-04-16 14:41:28.000000000 +0530 +@@ -106,3 +106,6 @@ + bool "OMAP 3430 SDP board" + depends on ARCH_OMAP3 && ARCH_OMAP34XX + ++config MACH_OMAP3EVM ++ bool "OMAP 3530 EVM board" ++ depends on ARCH_OMAP3 && ARCH_OMAP34XX +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch b/packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch new file mode 100644 index 0000000000..bc0efbcc12 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch @@ -0,0 +1,96 @@ + +New board file for OMAP3 EVM + +Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> +--- + arch/arm/mach-omap2/board-omap3evm.c | 79 +++++++++++++++++++++++++++++++++++ + 1 file changed, 79 insertions(+) + +Index: my_branch/arch/arm/mach-omap2/board-omap3evm.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ my_branch/arch/arm/mach-omap2/board-omap3evm.c 2008-04-16 14:42:30.000000000 +0530 +@@ -0,0 +1,79 @@ ++/* ++ * linux/arch/arm/mach-omap2/board-omap3evm.c ++ * ++ * Copyright (C) 2008 Texas Instruments ++ * ++ * Modified from mach-omap2/board-3430sdp.c ++ * ++ * Initial code: Syed Mohammed Khasim ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/platform_device.h> ++#include <linux/delay.h> ++#include <linux/err.h> ++#include <linux/clk.h> ++#include <linux/io.h> ++ ++#include <asm/hardware.h> ++#include <asm/mach-types.h> ++#include <asm/mach/arch.h> ++#include <asm/mach/map.h> ++ ++#include <asm/arch/gpio.h> ++#include <asm/arch/board.h> ++#include <asm/arch/common.h> ++ ++static struct omap_uart_config omap3_evm_uart_config __initdata = { ++ .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), ++}; ++ ++static int __init omap3_evm_i2c_init(void) ++{ ++ omap_register_i2c_bus(1, 2600, NULL, 0); ++ omap_register_i2c_bus(2, 400, NULL, 0); ++ omap_register_i2c_bus(3, 400, NULL, 0); ++ return 0; ++} ++ ++static void __init omap3_evm_init_irq(void) ++{ ++ omap2_init_common_hw(); ++ omap_init_irq(); ++ omap_gpio_init(); ++} ++ ++static struct omap_board_config_kernel omap3_evm_config[] __initdata = { ++ {OMAP_TAG_UART, &omap3_evm_uart_config }, ++}; ++ ++static void __init omap3_evm_init(void) ++{ ++ omap_board_config = omap3_evm_config; ++ omap_board_config_size = ARRAY_SIZE(omap3_evm_config); ++ omap_serial_init(); ++} ++ ++arch_initcall(omap3_evm_i2c_init); ++ ++static void __init omap3_evm_map_io(void) ++{ ++ omap2_set_globals_343x(); ++ omap2_map_common_io(); ++} ++ ++MACHINE_START(OMAP3EVM, "OMAP3 EVM") ++ /* Maintainer: Syed Mohammed Khasim - Texas Instruments */ ++ .phys_io = 0x48000000, ++ .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, ++ .boot_params = 0x80000100, ++ .map_io = omap3_evm_map_io, ++ .init_irq = omap3_evm_init_irq, ++ .init_machine = omap3_evm_init, ++ .timer = &omap_timer, ++MACHINE_END +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch b/packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch new file mode 100644 index 0000000000..19294ec68b --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch @@ -0,0 +1,976 @@ +New default configuration file for OMAP3 EVM + +Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> +--- + arch/arm/configs/omap3_evm_defconfig | 960 +++++++++++++++++++++++++++++++++++ + 1 file changed, 960 insertions(+) + +Index: my_branch/arch/arm/configs/omap3_evm_defconfig +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ my_branch/arch/arm/configs/omap3_evm_defconfig 2008-04-16 14:43:02.000000000 +0530 +@@ -0,0 +1,960 @@ ++# ++# Automatically generated make config: don't edit ++# Linux kernel version: 2.6.25-rc9-omap1 ++# Mon Apr 14 12:24:20 2008 ++# ++CONFIG_ARM=y ++CONFIG_SYS_SUPPORTS_APM_EMULATION=y ++CONFIG_GENERIC_GPIO=y ++CONFIG_GENERIC_TIME=y ++CONFIG_GENERIC_CLOCKEVENTS=y ++CONFIG_MMU=y ++# CONFIG_NO_IOPORT is not set ++CONFIG_GENERIC_HARDIRQS=y ++CONFIG_STACKTRACE_SUPPORT=y ++CONFIG_LOCKDEP_SUPPORT=y ++CONFIG_TRACE_IRQFLAGS_SUPPORT=y ++CONFIG_HARDIRQS_SW_RESEND=y ++CONFIG_GENERIC_IRQ_PROBE=y ++CONFIG_RWSEM_GENERIC_SPINLOCK=y ++# CONFIG_ARCH_HAS_ILOG2_U32 is not set ++# CONFIG_ARCH_HAS_ILOG2_U64 is not set ++CONFIG_GENERIC_HWEIGHT=y ++CONFIG_GENERIC_CALIBRATE_DELAY=y ++CONFIG_ARCH_SUPPORTS_AOUT=y ++CONFIG_ZONE_DMA=y ++CONFIG_VECTORS_BASE=0xffff0000 ++CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" ++ ++# ++# General setup ++# ++CONFIG_EXPERIMENTAL=y ++CONFIG_BROKEN_ON_SMP=y ++CONFIG_INIT_ENV_ARG_LIMIT=32 ++CONFIG_LOCALVERSION="" ++CONFIG_LOCALVERSION_AUTO=y ++CONFIG_SWAP=y ++CONFIG_SYSVIPC=y ++CONFIG_SYSVIPC_SYSCTL=y ++# CONFIG_POSIX_MQUEUE is not set ++CONFIG_BSD_PROCESS_ACCT=y ++# CONFIG_BSD_PROCESS_ACCT_V3 is not set ++# CONFIG_TASKSTATS is not set ++# CONFIG_AUDIT is not set ++# CONFIG_IKCONFIG is not set ++CONFIG_LOG_BUF_SHIFT=14 ++# CONFIG_CGROUPS is not set ++CONFIG_GROUP_SCHED=y ++CONFIG_FAIR_GROUP_SCHED=y ++# CONFIG_RT_GROUP_SCHED is not set ++CONFIG_USER_SCHED=y ++# CONFIG_CGROUP_SCHED is not set ++CONFIG_SYSFS_DEPRECATED=y ++CONFIG_SYSFS_DEPRECATED_V2=y ++# CONFIG_RELAY is not set ++# CONFIG_NAMESPACES is not set ++CONFIG_BLK_DEV_INITRD=y ++CONFIG_INITRAMFS_SOURCE="" ++CONFIG_CC_OPTIMIZE_FOR_SIZE=y ++CONFIG_SYSCTL=y ++CONFIG_EMBEDDED=y ++CONFIG_UID16=y ++# CONFIG_SYSCTL_SYSCALL is not set ++CONFIG_KALLSYMS=y ++# CONFIG_KALLSYMS_ALL is not set ++CONFIG_KALLSYMS_EXTRA_PASS=y ++CONFIG_HOTPLUG=y ++CONFIG_PRINTK=y ++CONFIG_BUG=y ++CONFIG_ELF_CORE=y ++CONFIG_COMPAT_BRK=y ++CONFIG_BASE_FULL=y ++CONFIG_FUTEX=y ++CONFIG_ANON_INODES=y ++CONFIG_EPOLL=y ++CONFIG_SIGNALFD=y ++CONFIG_TIMERFD=y ++CONFIG_EVENTFD=y ++CONFIG_SHMEM=y ++CONFIG_VM_EVENT_COUNTERS=y ++CONFIG_SLAB=y ++# CONFIG_SLUB is not set ++# CONFIG_SLOB is not set ++# CONFIG_PROFILING is not set ++# CONFIG_MARKERS is not set ++CONFIG_HAVE_OPROFILE=y ++# CONFIG_KPROBES is not set ++CONFIG_HAVE_KPROBES=y ++CONFIG_HAVE_KRETPROBES=y ++CONFIG_PROC_PAGE_MONITOR=y ++CONFIG_SLABINFO=y ++CONFIG_RT_MUTEXES=y ++# CONFIG_TINY_SHMEM is not set ++CONFIG_BASE_SMALL=0 ++CONFIG_MODULES=y ++CONFIG_MODULE_UNLOAD=y ++# CONFIG_MODULE_FORCE_UNLOAD is not set ++CONFIG_MODVERSIONS=y ++CONFIG_MODULE_SRCVERSION_ALL=y ++CONFIG_KMOD=y ++CONFIG_BLOCK=y ++# CONFIG_LBD is not set ++# CONFIG_BLK_DEV_IO_TRACE is not set ++# CONFIG_LSF is not set ++# CONFIG_BLK_DEV_BSG is not set ++ ++# ++# IO Schedulers ++# ++CONFIG_IOSCHED_NOOP=y ++CONFIG_IOSCHED_AS=y ++CONFIG_IOSCHED_DEADLINE=y ++CONFIG_IOSCHED_CFQ=y ++CONFIG_DEFAULT_AS=y ++# CONFIG_DEFAULT_DEADLINE is not set ++# CONFIG_DEFAULT_CFQ is not set ++# CONFIG_DEFAULT_NOOP is not set ++CONFIG_DEFAULT_IOSCHED="anticipatory" ++CONFIG_CLASSIC_RCU=y ++ ++# ++# System Type ++# ++# CONFIG_ARCH_AAEC2000 is not set ++# CONFIG_ARCH_INTEGRATOR is not set ++# CONFIG_ARCH_REALVIEW is not set ++# CONFIG_ARCH_VERSATILE is not set ++# CONFIG_ARCH_AT91 is not set ++# CONFIG_ARCH_CLPS7500 is not set ++# CONFIG_ARCH_CLPS711X is not set ++# CONFIG_ARCH_CO285 is not set ++# CONFIG_ARCH_EBSA110 is not set ++# CONFIG_ARCH_EP93XX is not set ++# CONFIG_ARCH_FOOTBRIDGE is not set ++# CONFIG_ARCH_NETX is not set ++# CONFIG_ARCH_H720X is not set ++# CONFIG_ARCH_IMX is not set ++# CONFIG_ARCH_IOP13XX is not set ++# CONFIG_ARCH_IOP32X is not set ++# CONFIG_ARCH_IOP33X is not set ++# CONFIG_ARCH_IXP23XX is not set ++# CONFIG_ARCH_IXP2000 is not set ++# CONFIG_ARCH_IXP4XX is not set ++# CONFIG_ARCH_L7200 is not set ++# CONFIG_ARCH_KS8695 is not set ++# CONFIG_ARCH_NS9XXX is not set ++# CONFIG_ARCH_MXC is not set ++# CONFIG_ARCH_ORION is not set ++# CONFIG_ARCH_PNX4008 is not set ++# CONFIG_ARCH_PXA is not set ++# CONFIG_ARCH_RPC is not set ++# CONFIG_ARCH_SA1100 is not set ++# CONFIG_ARCH_S3C2410 is not set ++# CONFIG_ARCH_SHARK is not set ++# CONFIG_ARCH_LH7A40X is not set ++# CONFIG_ARCH_DAVINCI is not set ++CONFIG_ARCH_OMAP=y ++# CONFIG_ARCH_MSM7X00A is not set ++ ++# ++# TI OMAP Implementations ++# ++CONFIG_ARCH_OMAP_OTG=y ++# CONFIG_ARCH_OMAP1 is not set ++# CONFIG_ARCH_OMAP2 is not set ++CONFIG_ARCH_OMAP3=y ++ ++# ++# OMAP Feature Selections ++# ++CONFIG_OMAP_DEBUG_SRAM_PATCH=y ++# CONFIG_OMAP_RESET_CLOCKS is not set ++CONFIG_OMAP_BOOT_TAG=y ++CONFIG_OMAP_BOOT_REASON=y ++# CONFIG_OMAP_COMPONENT_VERSION is not set ++# CONFIG_OMAP_GPIO_SWITCH is not set ++# CONFIG_OMAP_MUX is not set ++# CONFIG_OMAP_MCBSP is not set ++# CONFIG_OMAP_MMU_FWK is not set ++# CONFIG_OMAP_MBOX_FWK is not set ++# CONFIG_OMAP_MPU_TIMER is not set ++CONFIG_OMAP_32K_TIMER=y ++CONFIG_OMAP_32K_TIMER_HZ=128 ++CONFIG_OMAP_DM_TIMER=y ++CONFIG_OMAP_LL_DEBUG_UART1=y ++# CONFIG_OMAP_LL_DEBUG_UART2 is not set ++# CONFIG_OMAP_LL_DEBUG_UART3 is not set ++CONFIG_ARCH_OMAP34XX=y ++CONFIG_ARCH_OMAP3430=y ++ ++# ++# OMAP Board Type ++# ++# CONFIG_MACH_OMAP_3430SDP is not set ++CONFIG_MACH_OMAP3EVM=y ++ ++# ++# Boot options ++# ++ ++# ++# Power management ++# ++ ++# ++# Processor Type ++# ++CONFIG_CPU_32=y ++CONFIG_CPU_32v6K=y ++CONFIG_CPU_V7=y ++CONFIG_CPU_32v7=y ++CONFIG_CPU_ABRT_EV7=y ++CONFIG_CPU_PABRT_IFAR=y ++CONFIG_CPU_CACHE_V7=y ++CONFIG_CPU_CACHE_VIPT=y ++CONFIG_CPU_COPY_V6=y ++CONFIG_CPU_TLB_V7=y ++CONFIG_CPU_HAS_ASID=y ++CONFIG_CPU_CP15=y ++CONFIG_CPU_CP15_MMU=y ++ ++# ++# Processor Features ++# ++CONFIG_ARM_THUMB=y ++# CONFIG_ARM_XENON is not set ++# CONFIG_CPU_ICACHE_DISABLE is not set ++# CONFIG_CPU_DCACHE_DISABLE is not set ++# CONFIG_CPU_BPREDICT_DISABLE is not set ++CONFIG_HAS_TLS_REG=y ++# CONFIG_OUTER_CACHE is not set ++ ++# ++# Bus support ++# ++# CONFIG_PCI_SYSCALL is not set ++# CONFIG_ARCH_SUPPORTS_MSI is not set ++# CONFIG_PCCARD is not set ++ ++# ++# Kernel Features ++# ++CONFIG_TICK_ONESHOT=y ++CONFIG_NO_HZ=y ++CONFIG_HIGH_RES_TIMERS=y ++CONFIG_GENERIC_CLOCKEVENTS_BUILD=y ++# CONFIG_PREEMPT is not set ++CONFIG_HZ=128 ++CONFIG_AEABI=y ++CONFIG_OABI_COMPAT=y ++# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set ++CONFIG_SELECT_MEMORY_MODEL=y ++CONFIG_FLATMEM_MANUAL=y ++# CONFIG_DISCONTIGMEM_MANUAL is not set ++# CONFIG_SPARSEMEM_MANUAL is not set ++CONFIG_FLATMEM=y ++CONFIG_FLAT_NODE_MEM_MAP=y ++# CONFIG_SPARSEMEM_STATIC is not set ++# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set ++CONFIG_SPLIT_PTLOCK_CPUS=4 ++# CONFIG_RESOURCES_64BIT is not set ++CONFIG_ZONE_DMA_FLAG=1 ++CONFIG_BOUNCE=y ++CONFIG_VIRT_TO_BUS=y ++# CONFIG_LEDS is not set ++CONFIG_ALIGNMENT_TRAP=y ++ ++# ++# Boot options ++# ++CONFIG_ZBOOT_ROM_TEXT=0x0 ++CONFIG_ZBOOT_ROM_BSS=0x0 ++CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8" ++# CONFIG_XIP_KERNEL is not set ++# CONFIG_KEXEC is not set ++ ++# ++# CPU Frequency scaling ++# ++# CONFIG_CPU_FREQ is not set ++ ++# ++# Floating point emulation ++# ++ ++# ++# At least one emulation must be selected ++# ++CONFIG_FPE_NWFPE=y ++# CONFIG_FPE_NWFPE_XP is not set ++# CONFIG_FPE_FASTFPE is not set ++CONFIG_VFP=y ++CONFIG_VFPv3=y ++# CONFIG_NEON is not set ++ ++# ++# Userspace binary formats ++# ++CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_AOUT is not set ++CONFIG_BINFMT_MISC=y ++ ++# ++# Power management options ++# ++CONFIG_PM=y ++# CONFIG_PM_LEGACY is not set ++# CONFIG_PM_DEBUG is not set ++# CONFIG_SUSPEND is not set ++# CONFIG_APM_EMULATION is not set ++CONFIG_ARCH_SUSPEND_POSSIBLE=y ++ ++# ++# Networking ++# ++CONFIG_NET=y ++ ++# ++# Networking options ++# ++CONFIG_PACKET=y ++# CONFIG_PACKET_MMAP is not set ++CONFIG_UNIX=y ++CONFIG_XFRM=y ++# CONFIG_XFRM_USER is not set ++# CONFIG_XFRM_SUB_POLICY is not set ++# CONFIG_XFRM_MIGRATE is not set ++# CONFIG_XFRM_STATISTICS is not set ++CONFIG_NET_KEY=y ++# CONFIG_NET_KEY_MIGRATE is not set ++CONFIG_INET=y ++# CONFIG_IP_MULTICAST is not set ++# CONFIG_IP_ADVANCED_ROUTER is not set ++CONFIG_IP_FIB_HASH=y ++CONFIG_IP_PNP=y ++CONFIG_IP_PNP_DHCP=y ++CONFIG_IP_PNP_BOOTP=y ++CONFIG_IP_PNP_RARP=y ++# CONFIG_NET_IPIP is not set ++# CONFIG_NET_IPGRE is not set ++# CONFIG_ARPD is not set ++# CONFIG_SYN_COOKIES is not set ++# CONFIG_INET_AH is not set ++# CONFIG_INET_ESP is not set ++# CONFIG_INET_IPCOMP is not set ++# CONFIG_INET_XFRM_TUNNEL is not set ++# CONFIG_INET_TUNNEL is not set ++CONFIG_INET_XFRM_MODE_TRANSPORT=y ++CONFIG_INET_XFRM_MODE_TUNNEL=y ++CONFIG_INET_XFRM_MODE_BEET=y ++# CONFIG_INET_LRO is not set ++CONFIG_INET_DIAG=y ++CONFIG_INET_TCP_DIAG=y ++# CONFIG_TCP_CONG_ADVANCED is not set ++CONFIG_TCP_CONG_CUBIC=y ++CONFIG_DEFAULT_TCP_CONG="cubic" ++# CONFIG_TCP_MD5SIG is not set ++# CONFIG_IPV6 is not set ++# CONFIG_INET6_XFRM_TUNNEL is not set ++# CONFIG_INET6_TUNNEL is not set ++# CONFIG_NETWORK_SECMARK is not set ++# CONFIG_NETFILTER is not set ++# CONFIG_IP_DCCP is not set ++# CONFIG_IP_SCTP is not set ++# CONFIG_TIPC is not set ++# CONFIG_ATM is not set ++# CONFIG_BRIDGE is not set ++# CONFIG_VLAN_8021Q is not set ++# CONFIG_DECNET is not set ++# CONFIG_LLC2 is not set ++# CONFIG_IPX is not set ++# CONFIG_ATALK is not set ++# CONFIG_X25 is not set ++# CONFIG_LAPB is not set ++# CONFIG_ECONET is not set ++# CONFIG_WAN_ROUTER is not set ++# CONFIG_NET_SCHED is not set ++ ++# ++# Network testing ++# ++# CONFIG_NET_PKTGEN is not set ++# CONFIG_HAMRADIO is not set ++# CONFIG_CAN is not set ++# CONFIG_IRDA is not set ++# CONFIG_BT is not set ++# CONFIG_AF_RXRPC is not set ++ ++# ++# Wireless ++# ++# CONFIG_CFG80211 is not set ++# CONFIG_WIRELESS_EXT is not set ++# CONFIG_MAC80211 is not set ++# CONFIG_IEEE80211 is not set ++# CONFIG_RFKILL is not set ++# CONFIG_NET_9P is not set ++ ++# ++# Device Drivers ++# ++ ++# ++# Generic Driver Options ++# ++CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" ++CONFIG_STANDALONE=y ++CONFIG_PREVENT_FIRMWARE_BUILD=y ++# CONFIG_FW_LOADER is not set ++# CONFIG_DEBUG_DRIVER is not set ++# CONFIG_DEBUG_DEVRES is not set ++# CONFIG_SYS_HYPERVISOR is not set ++# CONFIG_CONNECTOR is not set ++# CONFIG_MTD is not set ++# CONFIG_PARPORT is not set ++CONFIG_BLK_DEV=y ++# CONFIG_BLK_DEV_COW_COMMON is not set ++CONFIG_BLK_DEV_LOOP=y ++# CONFIG_BLK_DEV_CRYPTOLOOP is not set ++# CONFIG_BLK_DEV_NBD is not set ++CONFIG_BLK_DEV_RAM=y ++CONFIG_BLK_DEV_RAM_COUNT=16 ++CONFIG_BLK_DEV_RAM_SIZE=16384 ++# CONFIG_BLK_DEV_XIP is not set ++# CONFIG_CDROM_PKTCDVD is not set ++# CONFIG_ATA_OVER_ETH is not set ++# CONFIG_MISC_DEVICES is not set ++# CONFIG_HAVE_IDE is not set ++ ++# ++# SCSI device support ++# ++# CONFIG_RAID_ATTRS is not set ++CONFIG_SCSI=y ++CONFIG_SCSI_DMA=y ++# CONFIG_SCSI_TGT is not set ++# CONFIG_SCSI_NETLINK is not set ++CONFIG_SCSI_PROC_FS=y ++ ++# ++# SCSI support type (disk, tape, CD-ROM) ++# ++CONFIG_BLK_DEV_SD=y ++# CONFIG_CHR_DEV_ST is not set ++# CONFIG_CHR_DEV_OSST is not set ++# CONFIG_BLK_DEV_SR is not set ++# CONFIG_CHR_DEV_SG is not set ++# CONFIG_CHR_DEV_SCH is not set ++ ++# ++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs ++# ++# CONFIG_SCSI_MULTI_LUN is not set ++# CONFIG_SCSI_CONSTANTS is not set ++# CONFIG_SCSI_LOGGING is not set ++# CONFIG_SCSI_SCAN_ASYNC is not set ++CONFIG_SCSI_WAIT_SCAN=m ++ ++# ++# SCSI Transports ++# ++# CONFIG_SCSI_SPI_ATTRS is not set ++# CONFIG_SCSI_FC_ATTRS is not set ++# CONFIG_SCSI_ISCSI_ATTRS is not set ++# CONFIG_SCSI_SAS_LIBSAS is not set ++# CONFIG_SCSI_SRP_ATTRS is not set ++CONFIG_SCSI_LOWLEVEL=y ++# CONFIG_ISCSI_TCP is not set ++# CONFIG_SCSI_DEBUG is not set ++# CONFIG_ATA is not set ++# CONFIG_MD is not set ++CONFIG_NETDEVICES=y ++# CONFIG_NETDEVICES_MULTIQUEUE is not set ++# CONFIG_DUMMY is not set ++# CONFIG_BONDING is not set ++# CONFIG_MACVLAN is not set ++# CONFIG_EQUALIZER is not set ++# CONFIG_TUN is not set ++# CONFIG_VETH is not set ++# CONFIG_NET_ETHERNET is not set ++# CONFIG_NETDEV_1000 is not set ++# CONFIG_NETDEV_10000 is not set ++ ++# ++# Wireless LAN ++# ++# CONFIG_WLAN_PRE80211 is not set ++# CONFIG_WLAN_80211 is not set ++# CONFIG_WAN is not set ++# CONFIG_PPP is not set ++# CONFIG_SLIP is not set ++# CONFIG_NETCONSOLE is not set ++# CONFIG_NETPOLL is not set ++# CONFIG_NET_POLL_CONTROLLER is not set ++# CONFIG_ISDN is not set ++ ++# ++# Input device support ++# ++CONFIG_INPUT=y ++# CONFIG_INPUT_FF_MEMLESS is not set ++# CONFIG_INPUT_POLLDEV is not set ++ ++# ++# Userland interfaces ++# ++# CONFIG_INPUT_MOUSEDEV is not set ++# CONFIG_INPUT_JOYDEV is not set ++# CONFIG_INPUT_EVDEV is not set ++# CONFIG_INPUT_EVBUG is not set ++ ++# ++# Input Device Drivers ++# ++# CONFIG_INPUT_KEYBOARD is not set ++# CONFIG_INPUT_MOUSE is not set ++# CONFIG_INPUT_JOYSTICK is not set ++# CONFIG_INPUT_TABLET is not set ++# CONFIG_INPUT_TOUCHSCREEN is not set ++# CONFIG_INPUT_MISC is not set ++ ++# ++# Hardware I/O ports ++# ++# CONFIG_SERIO is not set ++# CONFIG_GAMEPORT is not set ++ ++# ++# Character devices ++# ++CONFIG_VT=y ++CONFIG_VT_CONSOLE=y ++CONFIG_HW_CONSOLE=y ++# CONFIG_VT_HW_CONSOLE_BINDING is not set ++# CONFIG_SERIAL_NONSTANDARD is not set ++ ++# ++# Serial drivers ++# ++CONFIG_SERIAL_8250=y ++CONFIG_SERIAL_8250_CONSOLE=y ++CONFIG_SERIAL_8250_NR_UARTS=32 ++CONFIG_SERIAL_8250_RUNTIME_UARTS=4 ++CONFIG_SERIAL_8250_EXTENDED=y ++CONFIG_SERIAL_8250_MANY_PORTS=y ++CONFIG_SERIAL_8250_SHARE_IRQ=y ++CONFIG_SERIAL_8250_DETECT_IRQ=y ++CONFIG_SERIAL_8250_RSA=y ++ ++# ++# Non-8250 serial port support ++# ++CONFIG_SERIAL_CORE=y ++CONFIG_SERIAL_CORE_CONSOLE=y ++CONFIG_UNIX98_PTYS=y ++# CONFIG_LEGACY_PTYS is not set ++# CONFIG_IPMI_HANDLER is not set ++CONFIG_HW_RANDOM=y ++# CONFIG_NVRAM is not set ++# CONFIG_R3964 is not set ++# CONFIG_RAW_DRIVER is not set ++# CONFIG_TCG_TPM is not set ++CONFIG_I2C=y ++CONFIG_I2C_BOARDINFO=y ++CONFIG_I2C_CHARDEV=y ++ ++# ++# I2C Algorithms ++# ++# CONFIG_I2C_ALGOBIT is not set ++# CONFIG_I2C_ALGOPCF is not set ++# CONFIG_I2C_ALGOPCA is not set ++ ++# ++# I2C Hardware Bus support ++# ++# CONFIG_I2C_GPIO is not set ++# CONFIG_I2C_OCORES is not set ++CONFIG_I2C_OMAP=y ++# CONFIG_I2C_PARPORT_LIGHT is not set ++# CONFIG_I2C_SIMTEC is not set ++# CONFIG_I2C_TAOS_EVM is not set ++# CONFIG_I2C_STUB is not set ++ ++# ++# Miscellaneous I2C Chip support ++# ++# CONFIG_DS1682 is not set ++# CONFIG_SENSORS_EEPROM is not set ++# CONFIG_SENSORS_PCF8574 is not set ++# CONFIG_PCF8575 is not set ++# CONFIG_SENSORS_PCF8591 is not set ++# CONFIG_ISP1301_OMAP is not set ++# CONFIG_TPS65010 is not set ++# CONFIG_SENSORS_TLV320AIC23 is not set ++CONFIG_TWL4030_CORE=y ++CONFIG_TWL4030_GPIO=y ++# CONFIG_TWL4030_MADC is not set ++CONFIG_TWL4030_USB=y ++# CONFIG_TWL4030_PWRBUTTON is not set ++CONFIG_TWL4030_USB_HS_ULPI=y ++# CONFIG_TWL4030_POWEROFF is not set ++# CONFIG_SENSORS_MAX6875 is not set ++# CONFIG_SENSORS_TSL2550 is not set ++# CONFIG_I2C_DEBUG_CORE is not set ++# CONFIG_I2C_DEBUG_ALGO is not set ++# CONFIG_I2C_DEBUG_BUS is not set ++# CONFIG_I2C_DEBUG_CHIP is not set ++ ++# ++# SPI support ++# ++# CONFIG_SPI is not set ++# CONFIG_SPI_MASTER is not set ++CONFIG_HAVE_GPIO_LIB=y ++ ++# ++# GPIO Support ++# ++# CONFIG_DEBUG_GPIO is not set ++ ++# ++# I2C GPIO expanders: ++# ++# CONFIG_GPIO_PCA953X is not set ++# CONFIG_GPIO_PCF857X is not set ++ ++# ++# SPI GPIO expanders: ++# ++# CONFIG_W1 is not set ++# CONFIG_POWER_SUPPLY is not set ++# CONFIG_HWMON is not set ++# CONFIG_WATCHDOG is not set ++ ++# ++# Sonics Silicon Backplane ++# ++CONFIG_SSB_POSSIBLE=y ++# CONFIG_SSB is not set ++ ++# ++# Multifunction device drivers ++# ++# CONFIG_MFD_SM501 is not set ++# CONFIG_MFD_ASIC3 is not set ++ ++# ++# Multimedia devices ++# ++# CONFIG_VIDEO_DEV is not set ++# CONFIG_DVB_CORE is not set ++CONFIG_DAB=y ++ ++# ++# Graphics support ++# ++# CONFIG_VGASTATE is not set ++# CONFIG_VIDEO_OUTPUT_CONTROL is not set ++# CONFIG_FB is not set ++# CONFIG_BACKLIGHT_LCD_SUPPORT is not set ++ ++# ++# Display device support ++# ++# CONFIG_DISPLAY_SUPPORT is not set ++ ++# ++# Console display driver support ++# ++# CONFIG_VGA_CONSOLE is not set ++CONFIG_DUMMY_CONSOLE=y ++ ++# ++# Sound ++# ++# CONFIG_SOUND is not set ++# CONFIG_HID_SUPPORT is not set ++# CONFIG_USB_SUPPORT is not set ++# CONFIG_MMC is not set ++# CONFIG_NEW_LEDS is not set ++CONFIG_RTC_LIB=y ++# CONFIG_RTC_CLASS is not set ++ ++# ++# CBUS support ++# ++# CONFIG_CBUS is not set ++ ++# ++# File systems ++# ++CONFIG_EXT2_FS=y ++# CONFIG_EXT2_FS_XATTR is not set ++# CONFIG_EXT2_FS_XIP is not set ++CONFIG_EXT3_FS=y ++# CONFIG_EXT3_FS_XATTR is not set ++# CONFIG_EXT4DEV_FS is not set ++CONFIG_JBD=y ++# CONFIG_REISERFS_FS is not set ++# CONFIG_JFS_FS is not set ++# CONFIG_FS_POSIX_ACL is not set ++# CONFIG_XFS_FS is not set ++# CONFIG_GFS2_FS is not set ++# CONFIG_OCFS2_FS is not set ++CONFIG_DNOTIFY=y ++CONFIG_INOTIFY=y ++CONFIG_INOTIFY_USER=y ++CONFIG_QUOTA=y ++# CONFIG_QUOTA_NETLINK_INTERFACE is not set ++CONFIG_PRINT_QUOTA_WARNING=y ++# CONFIG_QFMT_V1 is not set ++CONFIG_QFMT_V2=y ++CONFIG_QUOTACTL=y ++# CONFIG_AUTOFS_FS is not set ++# CONFIG_AUTOFS4_FS is not set ++# CONFIG_FUSE_FS is not set ++ ++# ++# CD-ROM/DVD Filesystems ++# ++# CONFIG_ISO9660_FS is not set ++# CONFIG_UDF_FS is not set ++ ++# ++# DOS/FAT/NT Filesystems ++# ++CONFIG_FAT_FS=y ++CONFIG_MSDOS_FS=y ++CONFIG_VFAT_FS=y ++CONFIG_FAT_DEFAULT_CODEPAGE=437 ++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" ++# CONFIG_NTFS_FS is not set ++ ++# ++# Pseudo filesystems ++# ++CONFIG_PROC_FS=y ++CONFIG_PROC_SYSCTL=y ++CONFIG_SYSFS=y ++CONFIG_TMPFS=y ++# CONFIG_TMPFS_POSIX_ACL is not set ++# CONFIG_HUGETLB_PAGE is not set ++# CONFIG_CONFIGFS_FS is not set ++ ++# ++# Miscellaneous filesystems ++# ++# CONFIG_ADFS_FS is not set ++# CONFIG_AFFS_FS is not set ++# CONFIG_HFS_FS is not set ++# CONFIG_HFSPLUS_FS is not set ++# CONFIG_BEFS_FS is not set ++# CONFIG_BFS_FS is not set ++# CONFIG_EFS_FS is not set ++# CONFIG_CRAMFS is not set ++# CONFIG_VXFS_FS is not set ++# CONFIG_MINIX_FS is not set ++# CONFIG_HPFS_FS is not set ++# CONFIG_QNX4FS_FS is not set ++# CONFIG_ROMFS_FS is not set ++# CONFIG_SYSV_FS is not set ++# CONFIG_UFS_FS is not set ++CONFIG_NETWORK_FILESYSTEMS=y ++CONFIG_NFS_FS=y ++CONFIG_NFS_V3=y ++# CONFIG_NFS_V3_ACL is not set ++CONFIG_NFS_V4=y ++# CONFIG_NFS_DIRECTIO is not set ++# CONFIG_NFSD is not set ++CONFIG_ROOT_NFS=y ++CONFIG_LOCKD=y ++CONFIG_LOCKD_V4=y ++CONFIG_NFS_COMMON=y ++CONFIG_SUNRPC=y ++CONFIG_SUNRPC_GSS=y ++# CONFIG_SUNRPC_BIND34 is not set ++CONFIG_RPCSEC_GSS_KRB5=y ++# CONFIG_RPCSEC_GSS_SPKM3 is not set ++# CONFIG_SMB_FS is not set ++# CONFIG_CIFS is not set ++# CONFIG_NCP_FS is not set ++# CONFIG_CODA_FS is not set ++# CONFIG_AFS_FS is not set ++ ++# ++# Partition Types ++# ++CONFIG_PARTITION_ADVANCED=y ++# CONFIG_ACORN_PARTITION is not set ++# CONFIG_OSF_PARTITION is not set ++# CONFIG_AMIGA_PARTITION is not set ++# CONFIG_ATARI_PARTITION is not set ++# CONFIG_MAC_PARTITION is not set ++CONFIG_MSDOS_PARTITION=y ++# CONFIG_BSD_DISKLABEL is not set ++# CONFIG_MINIX_SUBPARTITION is not set ++# CONFIG_SOLARIS_X86_PARTITION is not set ++# CONFIG_UNIXWARE_DISKLABEL is not set ++# CONFIG_LDM_PARTITION is not set ++# CONFIG_SGI_PARTITION is not set ++# CONFIG_ULTRIX_PARTITION is not set ++# CONFIG_SUN_PARTITION is not set ++# CONFIG_KARMA_PARTITION is not set ++# CONFIG_EFI_PARTITION is not set ++# CONFIG_SYSV68_PARTITION is not set ++CONFIG_NLS=y ++CONFIG_NLS_DEFAULT="iso8859-1" ++CONFIG_NLS_CODEPAGE_437=y ++# CONFIG_NLS_CODEPAGE_737 is not set ++# CONFIG_NLS_CODEPAGE_775 is not set ++# CONFIG_NLS_CODEPAGE_850 is not set ++# CONFIG_NLS_CODEPAGE_852 is not set ++# CONFIG_NLS_CODEPAGE_855 is not set ++# CONFIG_NLS_CODEPAGE_857 is not set ++# CONFIG_NLS_CODEPAGE_860 is not set ++# CONFIG_NLS_CODEPAGE_861 is not set ++# CONFIG_NLS_CODEPAGE_862 is not set ++# CONFIG_NLS_CODEPAGE_863 is not set ++# CONFIG_NLS_CODEPAGE_864 is not set ++# CONFIG_NLS_CODEPAGE_865 is not set ++# CONFIG_NLS_CODEPAGE_866 is not set ++# CONFIG_NLS_CODEPAGE_869 is not set ++# CONFIG_NLS_CODEPAGE_936 is not set ++# CONFIG_NLS_CODEPAGE_950 is not set ++# CONFIG_NLS_CODEPAGE_932 is not set ++# CONFIG_NLS_CODEPAGE_949 is not set ++# CONFIG_NLS_CODEPAGE_874 is not set ++# CONFIG_NLS_ISO8859_8 is not set ++# CONFIG_NLS_CODEPAGE_1250 is not set ++# CONFIG_NLS_CODEPAGE_1251 is not set ++# CONFIG_NLS_ASCII is not set ++CONFIG_NLS_ISO8859_1=y ++# CONFIG_NLS_ISO8859_2 is not set ++# CONFIG_NLS_ISO8859_3 is not set ++# CONFIG_NLS_ISO8859_4 is not set ++# CONFIG_NLS_ISO8859_5 is not set ++# CONFIG_NLS_ISO8859_6 is not set ++# CONFIG_NLS_ISO8859_7 is not set ++# CONFIG_NLS_ISO8859_9 is not set ++# CONFIG_NLS_ISO8859_13 is not set ++# CONFIG_NLS_ISO8859_14 is not set ++# CONFIG_NLS_ISO8859_15 is not set ++# CONFIG_NLS_KOI8_R is not set ++# CONFIG_NLS_KOI8_U is not set ++# CONFIG_NLS_UTF8 is not set ++# CONFIG_DLM is not set ++ ++# ++# Kernel hacking ++# ++# CONFIG_PRINTK_TIME is not set ++CONFIG_ENABLE_WARN_DEPRECATED=y ++CONFIG_ENABLE_MUST_CHECK=y ++CONFIG_MAGIC_SYSRQ=y ++# CONFIG_UNUSED_SYMBOLS is not set ++# CONFIG_DEBUG_FS is not set ++# CONFIG_HEADERS_CHECK is not set ++CONFIG_DEBUG_KERNEL=y ++# CONFIG_DEBUG_SHIRQ is not set ++CONFIG_DETECT_SOFTLOCKUP=y ++CONFIG_SCHED_DEBUG=y ++# CONFIG_SCHEDSTATS is not set ++# CONFIG_TIMER_STATS is not set ++# CONFIG_DEBUG_SLAB is not set ++# CONFIG_DEBUG_RT_MUTEXES is not set ++# CONFIG_RT_MUTEX_TESTER is not set ++# CONFIG_DEBUG_SPINLOCK is not set ++CONFIG_DEBUG_MUTEXES=y ++# CONFIG_DEBUG_LOCK_ALLOC is not set ++# CONFIG_PROVE_LOCKING is not set ++# CONFIG_LOCK_STAT is not set ++# CONFIG_DEBUG_SPINLOCK_SLEEP is not set ++# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set ++# CONFIG_DEBUG_KOBJECT is not set ++# CONFIG_DEBUG_BUGVERBOSE is not set ++CONFIG_DEBUG_INFO=y ++# CONFIG_DEBUG_VM is not set ++# CONFIG_DEBUG_LIST is not set ++# CONFIG_DEBUG_SG is not set ++CONFIG_FRAME_POINTER=y ++# CONFIG_BOOT_PRINTK_DELAY is not set ++# CONFIG_RCU_TORTURE_TEST is not set ++# CONFIG_BACKTRACE_SELF_TEST is not set ++# CONFIG_FAULT_INJECTION is not set ++# CONFIG_SAMPLES is not set ++# CONFIG_DEBUG_USER is not set ++# CONFIG_DEBUG_ERRORS is not set ++# CONFIG_DEBUG_STACK_USAGE is not set ++CONFIG_DEBUG_LL=y ++# CONFIG_DEBUG_ICEDCC is not set ++ ++# ++# Security options ++# ++# CONFIG_KEYS is not set ++# CONFIG_SECURITY is not set ++# CONFIG_SECURITY_FILE_CAPABILITIES is not set ++CONFIG_CRYPTO=y ++CONFIG_CRYPTO_ALGAPI=y ++CONFIG_CRYPTO_BLKCIPHER=y ++# CONFIG_CRYPTO_SEQIV is not set ++CONFIG_CRYPTO_MANAGER=y ++# CONFIG_CRYPTO_HMAC is not set ++# CONFIG_CRYPTO_XCBC is not set ++# CONFIG_CRYPTO_NULL is not set ++# CONFIG_CRYPTO_MD4 is not set ++CONFIG_CRYPTO_MD5=y ++# CONFIG_CRYPTO_SHA1 is not set ++# CONFIG_CRYPTO_SHA256 is not set ++# CONFIG_CRYPTO_SHA512 is not set ++# CONFIG_CRYPTO_WP512 is not set ++# CONFIG_CRYPTO_TGR192 is not set ++# CONFIG_CRYPTO_GF128MUL is not set ++CONFIG_CRYPTO_ECB=m ++CONFIG_CRYPTO_CBC=y ++CONFIG_CRYPTO_PCBC=m ++# CONFIG_CRYPTO_LRW is not set ++# CONFIG_CRYPTO_XTS is not set ++# CONFIG_CRYPTO_CTR is not set ++# CONFIG_CRYPTO_GCM is not set ++# CONFIG_CRYPTO_CCM is not set ++# CONFIG_CRYPTO_CRYPTD is not set ++CONFIG_CRYPTO_DES=y ++# CONFIG_CRYPTO_FCRYPT is not set ++# CONFIG_CRYPTO_BLOWFISH is not set ++# CONFIG_CRYPTO_TWOFISH is not set ++# CONFIG_CRYPTO_SERPENT is not set ++# CONFIG_CRYPTO_AES is not set ++# CONFIG_CRYPTO_CAST5 is not set ++# CONFIG_CRYPTO_CAST6 is not set ++# CONFIG_CRYPTO_TEA is not set ++# CONFIG_CRYPTO_ARC4 is not set ++# CONFIG_CRYPTO_KHAZAD is not set ++# CONFIG_CRYPTO_ANUBIS is not set ++# CONFIG_CRYPTO_SEED is not set ++# CONFIG_CRYPTO_SALSA20 is not set ++# CONFIG_CRYPTO_DEFLATE is not set ++# CONFIG_CRYPTO_MICHAEL_MIC is not set ++# CONFIG_CRYPTO_CRC32C is not set ++# CONFIG_CRYPTO_CAMELLIA is not set ++# CONFIG_CRYPTO_TEST is not set ++# CONFIG_CRYPTO_AUTHENC is not set ++# CONFIG_CRYPTO_LZO is not set ++CONFIG_CRYPTO_HW=y ++ ++# ++# Library routines ++# ++CONFIG_BITREVERSE=y ++CONFIG_CRC_CCITT=y ++# CONFIG_CRC16 is not set ++# CONFIG_CRC_ITU_T is not set ++CONFIG_CRC32=y ++# CONFIG_CRC7 is not set ++CONFIG_LIBCRC32C=y ++CONFIG_PLIST=y ++CONFIG_HAS_IOMEM=y ++CONFIG_HAS_IOPORT=y ++CONFIG_HAS_DMA=y +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch b/packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch new file mode 100644 index 0000000000..00fd482601 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch @@ -0,0 +1,86 @@ + +Added new board header file for OMAP3 EVM + +Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> +--- + include/asm-arm/arch-omap/board-omap3evm.h | 53 +++++++++++++++++++++++++++++ + include/asm-arm/arch-omap/hardware.h | 4 ++ + 2 files changed, 57 insertions(+) + +Index: my_branch/include/asm-arm/arch-omap/hardware.h +=================================================================== +--- my_branch.orig/include/asm-arm/arch-omap/hardware.h 2008-04-16 14:39:51.000000000 +0530 ++++ my_branch/include/asm-arm/arch-omap/hardware.h 2008-04-16 14:44:09.000000000 +0530 +@@ -335,6 +335,10 @@ + #include "board-3430sdp.h" + #endif + ++#ifdef CONFIG_MACH_OMAP3EVM ++#include "board-omap3evm.h" ++#endif ++ + #ifdef CONFIG_MACH_OMAP_APOLLON + #include "board-apollon.h" + #endif +Index: my_branch/include/asm-arm/arch-omap/board-omap3evm.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ my_branch/include/asm-arm/arch-omap/board-omap3evm.h 2008-04-16 14:44:09.000000000 +0530 +@@ -0,0 +1,53 @@ ++/* ++ * linux/include/asm-arm/arch-omap/board-omap3evm.h ++ * ++ * Hardware definitions for TI OMAP3 EVM. ++ * ++ * Initial creation by Syed Mohammed Khasim <khasim@ti.com> ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#ifndef __ASM_ARCH_OMAP3_EVM_H ++#define __ASM_ARCH_OMAP3_EVM_H ++ ++#ifdef CONFIG_TWL4030_CORE ++ ++#define TWL4030_IRQNUM INT_34XX_SYS_NIRQ ++ ++/* TWL4030 Primary Interrupt Handler (PIH) interrupts */ ++#define IH_TWL4030_BASE IH_BOARD_BASE ++#define IH_TWL4030_END (IH_TWL4030_BASE+8) ++#define IH_TWL4030_PWRBASE (IH_TWL4030_END) ++#define IH_TWL4030_PWRBASE_END (IH_TWL4030_PWRBASE+8) ++ ++#ifdef CONFIG_TWL4030_GPIO ++/* TWL4030 GPIO Interrupts */ ++#define IH_TWL4030_GPIO_BASE (IH_TWL4030_PWRBASE_END) ++#define IH_TWL4030_GPIO_END (IH_TWL4030_GPIO_BASE+18) ++#define NR_IRQS (IH_TWL4030_GPIO_END) ++#else ++#define NR_IRQS (IH_TWL4030_PWRBASE_END) ++#endif /* CONFIG_I2C_TWL4030_GPIO */ ++ ++#endif /* End of support for TWL4030 */ ++#endif /* __ASM_ARCH_OMAP3_EVM_H */ ++ +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff b/packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff new file mode 100644 index 0000000000..26278d381c --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff @@ -0,0 +1,49 @@ +omap3beagle: register SD interface + +Signed-off-by: Koen Kooi <koen@openembedded.org> +--- + Makefile | 3 ++- + board-omap3beagle.c | 12 ++++++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) +--- /tmp/board-omap3beagle.c 2008-04-16 18:12:56.347129861 +0200 ++++ git/arch/arm/mach-omap2/board-omap3beagle.c 2008-04-16 19:02:08.490169463 +0200 +@@ -48,15 +48,27 @@ + omap_gpio_init(); + } + ++ ++static struct omap_mmc_config omap3beagle_mmc_config __initdata = { ++ .mmc [0] = { ++ .enabled = 1, ++ .wire4 = 1, ++ }, ++}; ++ + static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { + {OMAP_TAG_UART, &omap3_beagle_uart_config }, ++ {OMAP_TAG_MMC, &omap3beagle_mmc_config }, + }; + ++extern void __init sdp_mmc_init(void); ++ + static void __init omap3_beagle_init(void) + { + omap_board_config = omap3_beagle_config; + omap_board_config_size = ARRAY_SIZE(omap3_beagle_config); + omap_serial_init(); ++ sdp_mmc_init(); + } + + arch_initcall(omap3_beagle_i2c_init); +--- /tmp/Makefile 2008-04-16 19:08:53.653462476 +0200 ++++ git/arch/arm/mach-omap2/Makefile 2008-04-16 19:09:15.836793250 +0200 +@@ -35,7 +35,8 @@ + board-3430sdp-usb.o \ + board-3430sdp-flash.o + obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o +-obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o ++obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \ ++ board-sdp-hsmmc.o + obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \ + board-apollon-mmc.o \ + board-apollon-keys.o diff --git a/packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff b/packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff new file mode 100644 index 0000000000..aa5f448de6 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff @@ -0,0 +1,98 @@ + +Add new board file for OMAP3 Beagle Board. + +For more info regarding this board visit http://beagleboard.org + +Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> +--- + arch/arm/mach-omap2/board-omap3beagle.c | 79 ++++++++++++++++++++++++++++++++ + 1 file changed, 79 insertions(+) + +Index: my_branch/arch/arm/mach-omap2/board-omap3beagle.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ my_branch/arch/arm/mach-omap2/board-omap3beagle.c 2008-04-16 14:45:52.000000000 +0530 +@@ -0,0 +1,79 @@ ++/* ++ * linux/arch/arm/mach-omap2/board-omap3beagle.c ++ * ++ * Copyright (C) 2008 Texas Instruments ++ * ++ * Modified from mach-omap2/board-3430sdp.c ++ * ++ * Initial code: Syed Mohammed Khasim ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/platform_device.h> ++#include <linux/delay.h> ++#include <linux/err.h> ++#include <linux/clk.h> ++#include <linux/io.h> ++ ++#include <asm/hardware.h> ++#include <asm/mach-types.h> ++#include <asm/mach/arch.h> ++#include <asm/mach/map.h> ++ ++#include <asm/arch/gpio.h> ++#include <asm/arch/board.h> ++#include <asm/arch/common.h> ++ ++static struct omap_uart_config omap3_beagle_uart_config __initdata = { ++ .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), ++}; ++ ++static int __init omap3_beagle_i2c_init(void) ++{ ++ omap_register_i2c_bus(1, 2600, NULL, 0); ++ omap_register_i2c_bus(2, 400, NULL, 0); ++ omap_register_i2c_bus(3, 400, NULL, 0); ++ return 0; ++} ++ ++static void __init omap3_beagle_init_irq(void) ++{ ++ omap2_init_common_hw(); ++ omap_init_irq(); ++ omap_gpio_init(); ++} ++ ++static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { ++ {OMAP_TAG_UART, &omap3_beagle_uart_config }, ++}; ++ ++static void __init omap3_beagle_init(void) ++{ ++ omap_board_config = omap3_beagle_config; ++ omap_board_config_size = ARRAY_SIZE(omap3_beagle_config); ++ omap_serial_init(); ++} ++ ++arch_initcall(omap3_beagle_i2c_init); ++ ++static void __init omap3_beagle_map_io(void) ++{ ++ omap2_set_globals_343x(); ++ omap2_map_common_io(); ++} ++ ++MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") ++ /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */ ++ .phys_io = 0x48000000, ++ .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, ++ .boot_params = 0x80000100, ++ .map_io = omap3_beagle_map_io, ++ .init_irq = omap3_beagle_init_irq, ++ .init_machine = omap3_beagle_init, ++ .timer = &omap_timer, ++MACHINE_END +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff b/packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff new file mode 100644 index 0000000000..8bf4ec8c54 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff @@ -0,0 +1,87 @@ + +New board header file for OMAP3 Beagle Board. + +Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> +--- + include/asm-arm/arch-omap/board-omap3beagle.h | 53 ++++++++++++++++++++++++++ + include/asm-arm/arch-omap/hardware.h | 4 + + 2 files changed, 57 insertions(+) + +Index: my_branch/include/asm-arm/arch-omap/board-omap3beagle.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ my_branch/include/asm-arm/arch-omap/board-omap3beagle.h 2008-04-16 14:47:14.000000000 +0530 +@@ -0,0 +1,53 @@ ++/* ++ * linux/include/asm-arm/arch-omap/board-omap3beagle.h ++ * ++ * Hardware definitions for TI OMAP3 BEAGLE. ++ * ++ * Initial creation by Syed Mohammed Khasim <khasim@ti.com> ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#ifndef __ASM_ARCH_OMAP3_BEAGLE_H ++#define __ASM_ARCH_OMAP3_BEAGLE_H ++ ++#ifdef CONFIG_TWL4030_CORE ++ ++#define TWL4030_IRQNUM INT_34XX_SYS_NIRQ ++ ++/* TWL4030 Primary Interrupt Handler (PIH) interrupts */ ++#define IH_TWL4030_BASE IH_BOARD_BASE ++#define IH_TWL4030_END (IH_TWL4030_BASE+8) ++#define IH_TWL4030_PWRBASE (IH_TWL4030_END) ++#define IH_TWL4030_PWRBASE_END (IH_TWL4030_PWRBASE+8) ++ ++#ifdef CONFIG_TWL4030_GPIO ++/* TWL4030 GPIO Interrupts */ ++#define IH_TWL4030_GPIO_BASE (IH_TWL4030_PWRBASE_END) ++#define IH_TWL4030_GPIO_END (IH_TWL4030_GPIO_BASE+18) ++#define NR_IRQS (IH_TWL4030_GPIO_END) ++#else ++#define NR_IRQS (IH_TWL4030_PWRBASE_END) ++#endif /* CONFIG_I2C_TWL4030_GPIO */ ++ ++#endif /* End of support for TWL4030 */ ++#endif /* __ASM_ARCH_OMAP3_BEAGLE_H */ ++ + +Index: my_branch/include/asm-arm/arch-omap/hardware.h +=================================================================== +--- my_branch.orig/include/asm-arm/arch-omap/hardware.h 2008-04-16 14:44:09.000000000 +0530 ++++ my_branch/include/asm-arm/arch-omap/hardware.h 2008-04-16 14:47:14.000000000 +0530 +@@ -339,6 +339,10 @@ + #include "board-omap3evm.h" + #endif + ++#ifdef CONFIG_MACH_OMAP3_BEAGLE ++#include "board-omap3beagle.h" ++#endif ++ + #ifdef CONFIG_MACH_OMAP_APOLLON + #include "board-apollon.h" + #endif +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff b/packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff new file mode 100644 index 0000000000..804ed92858 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff @@ -0,0 +1,38 @@ + +Updated Kconfig and Makefile to add OMAP3 Beagle Board + +Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> +--- + arch/arm/mach-omap2/Kconfig | 4 ++++ + arch/arm/mach-omap2/Makefile | 1 + + 2 files changed, 5 insertions(+) + +Index: my_branch/arch/arm/mach-omap2/Kconfig +=================================================================== +--- my_branch.orig/arch/arm/mach-omap2/Kconfig 2008-04-16 14:41:28.000000000 +0530 ++++ my_branch/arch/arm/mach-omap2/Kconfig 2008-04-16 14:45:38.000000000 +0530 +@@ -109,3 +109,7 @@ + config MACH_OMAP3EVM + bool "OMAP 3530 EVM board" + depends on ARCH_OMAP3 && ARCH_OMAP34XX ++ ++config MACH_OMAP3_BEAGLE ++ bool "OMAP3 BEAGLE board" ++ depends on ARCH_OMAP3 && ARCH_OMAP34XX + +Index: my_branch/arch/arm/mach-omap2/Makefile +=================================================================== +--- my_branch.orig/arch/arm/mach-omap2/Makefile 2008-04-16 14:41:28.000000000 +0530 ++++ my_branch/arch/arm/mach-omap2/Makefile 2008-04-16 14:45:38.000000000 +0530 +@@ -35,6 +35,7 @@ + board-3430sdp-usb.o \ + board-3430sdp-flash.o + obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o ++obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o + obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \ + board-apollon-mmc.o \ + board-apollon-keys.o +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 6f8534eb3b..80034f0256 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.25-rc7-omap1 -# Tue Apr 1 12:22:43 2008 +# Linux kernel version: 2.6.25-rc9-omap1 +# Thu Apr 17 01:09:30 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -42,7 +42,8 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set CONFIG_GROUP_SCHED=y @@ -94,7 +95,7 @@ CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y @@ -110,7 +111,7 @@ CONFIG_LSF=y CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y -# CONFIG_IOSCHED_CFQ is not set +CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set @@ -174,19 +175,17 @@ CONFIG_OMAP_BOOT_TAG=y CONFIG_OMAP_BOOT_REASON=y # CONFIG_OMAP_COMPONENT_VERSION is not set # CONFIG_OMAP_GPIO_SWITCH is not set -CONFIG_OMAP_MUX=y -CONFIG_OMAP_MUX_DEBUG=y -CONFIG_OMAP_MUX_WARNINGS=y -# CONFIG_OMAP_MCBSP is not set +# CONFIG_OMAP_MUX is not set +CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MMU_FWK is not set # CONFIG_OMAP_MBOX_FWK is not set -CONFIG_OMAP_MPU_TIMER=y -# CONFIG_OMAP_32K_TIMER is not set +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +CONFIG_OMAP_32K_TIMER_HZ=128 CONFIG_OMAP_DM_TIMER=y -CONFIG_OMAP_LL_DEBUG_UART1=y +# CONFIG_OMAP_LL_DEBUG_UART1 is not set # CONFIG_OMAP_LL_DEBUG_UART2 is not set -# CONFIG_OMAP_LL_DEBUG_UART3 is not set -CONFIG_OMAP_SERIAL_WAKE=y +CONFIG_OMAP_LL_DEBUG_UART3=y CONFIG_ARCH_OMAP34XX=y CONFIG_ARCH_OMAP3430=y @@ -194,6 +193,7 @@ CONFIG_ARCH_OMAP3430=y # OMAP Board Type # # CONFIG_MACH_OMAP_3430SDP is not set +# CONFIG_MACH_OMAP3EVM is not set CONFIG_MACH_OMAP3_BEAGLE=y # @@ -242,14 +242,14 @@ CONFIG_HAS_TLS_REG=y # # Kernel Features # -# CONFIG_TICK_ONESHOT is not set -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y # CONFIG_PREEMPT is not set -CONFIG_HZ=100 +CONFIG_HZ=128 CONFIG_AEABI=y -CONFIG_OABI_COMPAT=y +# CONFIG_OABI_COMPAT is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -274,7 +274,8 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling @@ -288,12 +289,9 @@ CONFIG_CMDLINE=" debug " # # At least one emulation must be selected # -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set -# CONFIG_FPE_FASTFPE is not set CONFIG_VFP=y CONFIG_VFPv3=y -# CONFIG_NEON is not set +CONFIG_NEON=y # # Userspace binary formats @@ -305,7 +303,13 @@ CONFIG_BINFMT_MISC=y # # Power management options # -# CONFIG_PM is not set +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_APM_EMULATION is not set CONFIG_ARCH_SUSPEND_POSSIBLE=y # @@ -324,12 +328,16 @@ CONFIG_XFRM=y # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set # CONFIG_XFRM_STATISTICS is not set -# CONFIG_NET_KEY is not set +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_ARPD is not set @@ -372,10 +380,9 @@ CONFIG_IPV6_SIT=m # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set -CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -393,25 +400,25 @@ CONFIG_NET_SCH_FIFO=y # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m +CONFIG_BT=y +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m +CONFIG_BT_BNEP=y CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m +CONFIG_BT_HIDP=y # # Bluetooth device drivers # -# CONFIG_BT_HCIUSB is not set -# CONFIG_BT_HCIBTUSB is not set -CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUSB=y +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIBTSDIO=y # CONFIG_BT_HCIUART is not set -# CONFIG_BT_HCIBCM203X is not set -# CONFIG_BT_HCIBPA10X is not set +CONFIG_BT_HCIBCM203X=y +CONFIG_BT_HCIBPA10X=y # CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIBRF6150 is not set # CONFIG_BT_HCIH4P is not set @@ -421,10 +428,10 @@ CONFIG_BT_HCIBTSDIO=m # # Wireless # -CONFIG_CFG80211=m +CONFIG_CFG80211=y CONFIG_NL80211=y CONFIG_WIRELESS_EXT=y -CONFIG_MAC80211=m +CONFIG_MAC80211=y # # Rate control algorithm selection @@ -445,12 +452,13 @@ CONFIG_MAC80211_RC_PID=y # CONFIG_MAC80211_RC_SIMPLE is not set # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set # CONFIG_MAC80211_DEBUG is not set -CONFIG_IEEE80211=m +CONFIG_IEEE80211=y # CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m -# CONFIG_IEEE80211_CRYPT_CCMP is not set -# CONFIG_IEEE80211_CRYPT_TKIP is not set -# CONFIG_IEEE80211_SOFTMAC is not set +CONFIG_IEEE80211_CRYPT_WEP=y +CONFIG_IEEE80211_CRYPT_CCMP=y +CONFIG_IEEE80211_CRYPT_TKIP=y +CONFIG_IEEE80211_SOFTMAC=y +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -469,22 +477,100 @@ CONFIG_FW_LOADER=y # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set -# CONFIG_MTD is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +CONFIG_FTL=y +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +CONFIG_MTD_NAND_PLATFORM=y +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_CRYPTOLOOP=m # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_BLK_DEV_XIP is not set -# CONFIG_CDROM_PKTCDVD is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_MISC_DEVICES=y -CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93CX6 is not set # CONFIG_OMAP_STI is not set # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_HAVE_IDE is not set @@ -492,22 +578,86 @@ CONFIG_EEPROM_93CX6=m # # SCSI device support # -# CONFIG_RAID_ATTRS is not set -# CONFIG_SCSI is not set -# CONFIG_SCSI_DMA is not set +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_DEBUG is not set # CONFIG_ATA is not set -# CONFIG_MD is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_RAID5_RESHAPE=y +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m +# CONFIG_DM_MULTIPATH_RDAC is not set +# CONFIG_DM_MULTIPATH_HP is not set +CONFIG_DM_DELAY=m +# CONFIG_DM_UEVENT is not set CONFIG_NETDEVICES=y -CONFIG_NETDEVICES_MULTIQUEUE=y -# CONFIG_DUMMY is not set +# CONFIG_NETDEVICES_MULTIQUEUE is not set +CONFIG_DUMMY=m # CONFIG_BONDING is not set # CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set +CONFIG_TUN=m # CONFIG_VETH is not set -# CONFIG_NET_ETHERNET is not set -CONFIG_MII=m +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_ENC28J60 is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_B44 is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set @@ -517,14 +667,13 @@ CONFIG_MII=m # CONFIG_WLAN_PRE80211 is not set CONFIG_WLAN_80211=y CONFIG_LIBERTAS=m -# CONFIG_LIBERTAS_USB is not set -CONFIG_LIBERTAS_SDIO=m +CONFIG_LIBERTAS_USB=m +# CONFIG_LIBERTAS_SDIO is not set # CONFIG_LIBERTAS_DEBUG is not set -# CONFIG_USB_ZD1201 is not set +CONFIG_USB_ZD1201=m # CONFIG_USB_NET_RNDIS_WLAN is not set # CONFIG_RTL8187 is not set -CONFIG_P54_COMMON=m -# CONFIG_P54_USB is not set +# CONFIG_P54_COMMON is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -536,37 +685,38 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y # # USB Network Adapters # -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_CATC=y +CONFIG_USB_KAWETH=y +CONFIG_USB_PEGASUS=y +CONFIG_USB_RTL8150=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_AX8817X=y +CONFIG_USB_NET_CDCETHER=y +CONFIG_USB_NET_DM9601=y +CONFIG_USB_NET_GL620A=y +CONFIG_USB_NET_NET1080=y +CONFIG_USB_NET_PLUSB=y +CONFIG_USB_NET_MCS7830=y +CONFIG_USB_NET_RNDIS_HOST=y +CONFIG_USB_NET_CDC_SUBSET=y CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y CONFIG_USB_ARMLINUX=y CONFIG_USB_EPSON2888=y CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_ZAURUS=y # CONFIG_WAN is not set CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOE=m -CONFIG_PPPOL2TP=m +# CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set CONFIG_SLHC=m # CONFIG_NETCONSOLE is not set @@ -584,7 +734,10 @@ CONFIG_INPUT=y # # Userland interfaces # -# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set @@ -599,27 +752,32 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_GPIO is not set -# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set -CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_FUJITSU is not set -# CONFIG_TOUCHSCREEN_GUNZE is not set -# CONFIG_TOUCHSCREEN_ELO is not set -# CONFIG_TOUCHSCREEN_MTOUCH is not set -# CONFIG_TOUCHSCREEN_MK712 is not set -# CONFIG_TOUCHSCREEN_PENMOUNT is not set -# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set -# CONFIG_TOUCHSCREEN_TOUCHWIN is not set -# CONFIG_TOUCHSCREEN_UCB1400 is not set -# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set # # Hardware I/O ports # -# CONFIG_SERIO is not set +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set # CONFIG_GAMEPORT is not set # @@ -628,7 +786,7 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_SERIAL_NONSTANDARD is not set # @@ -690,14 +848,17 @@ CONFIG_I2C_OMAP=y # CONFIG_SENSORS_PCF8591 is not set # CONFIG_ISP1301_OMAP is not set # CONFIG_TPS65010 is not set -# CONFIG_SENSORS_TLV320AIC23 is not set +CONFIG_SENSORS_TLV320AIC23=y CONFIG_TWL4030_CORE=y CONFIG_TWL4030_GPIO=y +# CONFIG_TWL4030_MADC is not set CONFIG_TWL4030_USB=y +# CONFIG_TWL4030_PWRBUTTON is not set CONFIG_TWL4030_USB_HS_ULPI=y # CONFIG_TWL4030_POWEROFF is not set # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set +# CONFIG_LP5521 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -706,8 +867,26 @@ CONFIG_TWL4030_USB_HS_ULPI=y # # SPI support # -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_OMAP24XX is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set +CONFIG_SPI_TSC2101=y +CONFIG_SPI_TSC2102=y +# CONFIG_SPI_TSC210X is not set +# CONFIG_SPI_TSC2301 is not set +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set CONFIG_HAVE_GPIO_LIB=y # @@ -724,6 +903,7 @@ CONFIG_HAVE_GPIO_LIB=y # # SPI GPIO expanders: # +# CONFIG_GPIO_MCP23S08 is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set @@ -756,16 +936,180 @@ CONFIG_SSB_POSSIBLE=y # # Multimedia devices # -# CONFIG_VIDEO_DEV is not set -# CONFIG_DVB_CORE is not set -CONFIG_DAB=y -# CONFIG_USB_DABUSB is not set +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +# CONFIG_VIDEO_V4L1 is not set +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set + +# +# Encoders/decoders and other helper chips +# + +# +# Audio decoders +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TDA9875 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +# CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_CS5345 is not set +# CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_M52790 is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +# CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set + +# +# Video decoders +# +# CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_TCM825X is not set +# CONFIG_VIDEO_OV9640 is not set +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_TVP5150 is not set + +# +# Video and audio decoders +# +# CONFIG_VIDEO_CX25840 is not set + +# +# MPEG video encoders +# +# CONFIG_VIDEO_CX2341X is not set + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +CONFIG_V4L_USB_DRIVERS=y +# CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_VIDEO_USBVISION is not set +# CONFIG_USB_ET61X251 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_ZC0301 is not set +# CONFIG_USB_ZR364XX is not set +# CONFIG_USB_STKWEBCAM is not set +# CONFIG_RADIO_ADAPTERS is not set +CONFIG_DVB_CORE=m +CONFIG_DVB_CORE_ATTACH=y +CONFIG_DVB_CAPTURE_DRIVERS=y +# CONFIG_TTPCI_EEPROM is not set + +# +# Supported USB Adapters +# +# CONFIG_DVB_USB is not set +# CONFIG_DVB_TTUSB_BUDGET is not set +# CONFIG_DVB_TTUSB_DEC is not set +# CONFIG_DVB_CINERGYT2 is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +# CONFIG_DVB_B2C2_FLEXCOP is not set + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# +# CONFIG_DVB_STV0299 is not set +# CONFIG_DVB_CX24110 is not set +# CONFIG_DVB_CX24123 is not set +# CONFIG_DVB_TDA8083 is not set +# CONFIG_DVB_MT312 is not set +# CONFIG_DVB_VES1X93 is not set +# CONFIG_DVB_S5H1420 is not set +# CONFIG_DVB_TDA10086 is not set + +# +# DVB-T (terrestrial) frontends +# +# CONFIG_DVB_SP8870 is not set +# CONFIG_DVB_SP887X is not set +# CONFIG_DVB_CX22700 is not set +# CONFIG_DVB_CX22702 is not set +# CONFIG_DVB_L64781 is not set +# CONFIG_DVB_TDA1004X is not set +# CONFIG_DVB_NXT6000 is not set +# CONFIG_DVB_MT352 is not set +# CONFIG_DVB_ZL10353 is not set +# CONFIG_DVB_DIB3000MB is not set +# CONFIG_DVB_DIB3000MC is not set +# CONFIG_DVB_DIB7000M is not set +# CONFIG_DVB_DIB7000P is not set + +# +# DVB-C (cable) frontends +# +# CONFIG_DVB_VES1820 is not set +# CONFIG_DVB_TDA10021 is not set +# CONFIG_DVB_TDA10023 is not set +# CONFIG_DVB_STV0297 is not set + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +# CONFIG_DVB_NXT200X is not set +# CONFIG_DVB_OR51211 is not set +# CONFIG_DVB_OR51132 is not set +# CONFIG_DVB_BCM3510 is not set +# CONFIG_DVB_LGDT330X is not set +# CONFIG_DVB_S5H1409 is not set + +# +# Tuners/PLL support +# +# CONFIG_DVB_PLL is not set +# CONFIG_DVB_TDA826X is not set +# CONFIG_DVB_TDA827X is not set +# CONFIG_DVB_TDA18271 is not set +# CONFIG_DVB_TUNER_QT1010 is not set +# CONFIG_DVB_TUNER_MT2060 is not set +# CONFIG_DVB_TUNER_MT2266 is not set +# CONFIG_DVB_TUNER_MT2131 is not set +# CONFIG_DVB_TUNER_DIB0070 is not set +# CONFIG_DVB_TUNER_XC5000 is not set + +# +# Miscellaneous devices +# +# CONFIG_DVB_LNBP21 is not set +# CONFIG_DVB_ISL6421 is not set +# CONFIG_DVB_TUA6100 is not set +# CONFIG_DAB is not set # # Graphics support # # CONFIG_VGASTATE is not set -CONFIG_VIDEO_OUTPUT_CONTROL=m +# CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set @@ -781,8 +1125,8 @@ CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set # # Frame buffer hardware drivers @@ -816,10 +1160,75 @@ CONFIG_FONT_8x16=y # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +# CONFIG_SND_OMAP_AIC23 is not set +# CONFIG_SND_OMAP_TSC2101 is not set +# CONFIG_SND_SX1 is not set +# CONFIG_SND_OMAP_TSC2102 is not set +CONFIG_SND_OMAP24XX_EAC=y + +# +# SPI devices +# + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_CAIAQ=m +# CONFIG_SND_USB_CAIAQ_INPUT is not set + +# +# System on Chip audio support +# +CONFIG_SND_SOC=y + +# +# SoC Audio support for SuperH +# + +# +# ALSA SoC audio for Freescale SOCs +# + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y -# CONFIG_HID_DEBUG is not set +CONFIG_HID_DEBUG=y # CONFIG_HIDRAW is not set # @@ -840,9 +1249,11 @@ CONFIG_USB=y # # Miscellaneous USB options # -# CONFIG_USB_DEVICEFS is not set +CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_PERSIST is not set # CONFIG_USB_OTG is not set # @@ -853,24 +1264,20 @@ CONFIG_OMAP_EHCI_PHY_MODE=y # CONFIG_OMAP_EHCI_TLL_MODE is not set # CONFIG_USB_EHCI_ROOT_HUB_TT is not set # CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_ISP116X_HCD=y -CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_SL811_HCD=y -CONFIG_USB_R8A66597_HCD=y -CONFIG_USB_MUSB_HDRC=m +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +CONFIG_USB_MUSB_HDRC=y CONFIG_USB_MUSB_SOC=y # # OMAP 343x high speed USB support # -CONFIG_USB_MUSB_HOST=y -# CONFIG_USB_MUSB_PERIPHERAL is not set +# CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_MUSB_PERIPHERAL=y # CONFIG_USB_MUSB_OTG is not set -# CONFIG_USB_GADGET_MUSB_HDRC is not set -CONFIG_USB_MUSB_HDRC_HCD=y +CONFIG_USB_GADGET_MUSB_HDRC=y # CONFIG_MUSB_PIO_ONLY is not set CONFIG_USB_INVENTRA_DMA=y # CONFIG_USB_TI_CPPI_DMA is not set @@ -879,7 +1286,7 @@ CONFIG_USB_MUSB_LOGLEVEL=0 # # USB Device Class drivers # -# CONFIG_USB_ACM is not set +CONFIG_USB_ACM=y # CONFIG_USB_PRINTER is not set # @@ -889,12 +1296,25 @@ CONFIG_USB_MUSB_LOGLEVEL=0 # # may also be needed; see USB_STORAGE Help for more information # +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices # # CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set CONFIG_USB_MON=y # @@ -920,11 +1340,13 @@ CONFIG_USB_MON=y # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_SISUSBVGA is not set +CONFIG_USB_SISUSBVGA=y +CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set -CONFIG_USB_GADGET=m +# CONFIG_USB_TEST is not set +CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y @@ -936,21 +1358,19 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_M66592 is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set -CONFIG_USB_GADGET_OMAP=y -CONFIG_USB_OMAP=m +# CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_S3C2410 is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set -# CONFIG_USB_GADGET_DUALSPEED is not set +CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=m +CONFIG_USB_ETH=y CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set -CONFIG_USB_G_PRINTER=m +# CONFIG_USB_G_PRINTER is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y @@ -960,15 +1380,67 @@ CONFIG_MMC_UNSAFE_RESUME=y # CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_SDIO_UART=m +CONFIG_SDIO_UART=y # # MMC/SD Host Controller Drivers # CONFIG_MMC_OMAP_HS=y +CONFIG_MMC_SPI=y # CONFIG_NEW_LEDS is not set CONFIG_RTC_LIB=y -# CONFIG_RTC_CLASS is not set +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +CONFIG_RTC_DRV_TWL4030=y +# CONFIG_RTC_DRV_S35390A is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# # # CBUS support @@ -988,11 +1460,7 @@ CONFIG_JBD=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -# CONFIG_XFS_SECURITY is not set -# CONFIG_XFS_POSIX_ACL is not set -# CONFIG_XFS_RT is not set +# CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set CONFIG_DNOTIFY=y @@ -1006,16 +1474,13 @@ CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set -CONFIG_FUSE_FS=m +# CONFIG_FUSE_FS is not set # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set # # DOS/FAT/NT Filesystems @@ -1025,9 +1490,7 @@ CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set +# CONFIG_NTFS_FS is not set # # Pseudo filesystems @@ -1046,11 +1509,12 @@ CONFIG_TMPFS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set -CONFIG_HFSPLUS_FS=m +# CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_CRAMFS=m +# CONFIG_JFFS2_FS is not set +# CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_HPFS_FS is not set @@ -1059,8 +1523,21 @@ CONFIG_CRAMFS=m # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -# CONFIG_NFS_FS is not set +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +# CONFIG_SUNRPC_BIND34 is not set +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set @@ -1075,9 +1552,9 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_OSF_PARTITION is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ATARI_PARTITION is not set -CONFIG_MAC_PARTITION=y +# CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y +# CONFIG_BSD_DISKLABEL is not set # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set @@ -1114,7 +1591,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set -# CONFIG_NLS_ISO8859_1 is not set +CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -1127,7 +1604,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set -CONFIG_NLS_UTF8=m +# CONFIG_NLS_UTF8 is not set # CONFIG_DLM is not set # @@ -1180,50 +1657,57 @@ CONFIG_DEBUG_LL=y # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_BLKCIPHER=y # CONFIG_CRYPTO_SEQIV is not set +CONFIG_CRYPTO_HASH=m CONFIG_CRYPTO_MANAGER=y -# CONFIG_CRYPTO_HMAC is not set -# CONFIG_CRYPTO_XCBC is not set -# CONFIG_CRYPTO_NULL is not set -# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_SHA1=m -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_WP512 is not set -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_GF128MUL is not set -CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_PCBC=m -# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_LRW=m # CONFIG_CRYPTO_XTS is not set # CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_GCM is not set # CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_DES=y -# CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_TWOFISH is not set -# CONFIG_CRYPTO_SERPENT is not set -CONFIG_CRYPTO_AES=m -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_TEA is not set -CONFIG_CRYPTO_ARC4=m -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_DEFLATE is not set -CONFIG_CRYPTO_MICHAEL_MIC=m -# CONFIG_CRYPTO_CRC32C is not set -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_TEST is not set +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_TEST=m # CONFIG_CRYPTO_AUTHENC is not set # CONFIG_CRYPTO_LZO is not set CONFIG_CRYPTO_HW=y @@ -1234,9 +1718,9 @@ CONFIG_CRYPTO_HW=y CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y # CONFIG_CRC16 is not set -# CONFIG_CRC_ITU_T is not set +CONFIG_CRC_ITU_T=y CONFIG_CRC32=y -# CONFIG_CRC7 is not set +CONFIG_CRC7=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index bb69b4e125..75c17eea10 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -2,15 +2,25 @@ require linux-omap.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}" -SRCREV = "039ced63db6a3f90f8b8f23a74499e38c0462b27" -PV = "2.6.24+2.6.25rc7-git${SRCREV}" -PR = "r2" +SRCREV = "8eef374ecb0010acceda6571a46be131f1dc0b86" +PV = "2.6.24+2.6.25rc9-git${SRCREV}" +PR = "r4" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ file://defconfig" -SRC_URI_append_beagleboard = " file://beagle-board-patch-dirk.diff;patch=1 " +SRC_URI_append_beagleboard = " file://1-rearrange-omap3.patch;patch=1 \ + file://2-update-omap3evm-kconfig.patch;patch=1 \ + file://3-omap3evm-board.patch;patch=1 \ + file://4-omap3evm-config.patch;patch=1 \ + file://5-omap3evm-header.patch;patch=1 \ + file://beagle-board-file.diff;patch=1 \ + file://beagle-board-header.diff;patch=1 \ + file://beagle-kconfig-makefile.diff;patch=1 \ + file://add-beagle-sd-support.diff;patch=1 \ + file://add-beagle-usb-support.diff;patch=1 \ +" COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard" diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb index fa255403e9..12ed8d8079 100644 --- a/packages/linux/linux_2.6.24.bb +++ b/packages/linux/linux_2.6.24.bb @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE_atngw100 = "1" DEFAULT_PREFERENCE_at32stk1000 = "1" DEFAULT_PREFERENCE_ts72xx = "1" -PR = "r11" +PR = "r12" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \ @@ -47,7 +47,9 @@ SRC_URI_append_gesbc-9302 = " \ SRC_URI_append_mpc8313e-rdb = "\ file://mpc831x-nand.patch;patch=1 \ file://mpc8313e-rdb-leds.patch;patch=1 \ - file://mpc8313e-rdb-rtc.patch;patch=1" + file://mpc8313e-rdb-rtc.patch;patch=1 \ + file://mpc8313e-rdb-cardbus.patch;patch=1 \ + " CMDLINE_gesbc-9302 = "console=ttyAM0 root=mtd5 rootfstype=jffs2 mtdparts=GESBC-NAND:64m(app),-(data)" diff --git a/packages/swt/swt-gtk.inc b/packages/swt/swt-gtk.inc index 9c978950c8..56e77faefa 100644 --- a/packages/swt/swt-gtk.inc +++ b/packages/swt/swt-gtk.inc @@ -32,9 +32,7 @@ do_compile() { addtask unpackpost after do_unpack before do_patch do_install() { - oe_jarinstall swt-pi.jar - oe_jarinstall swt.jar - oe_jarinstall swt-gtk-${PV}.jar swt-gtk.jar + oe_jarinstall swt-gtk-${PV}.jar swt-gtk.jar swt.jar oe_libinstall -so libswt-atk-gtk-${SWTVERSION} ${D}/${libdir_jni} oe_libinstall -so libswt-cairo-gtk-${SWTVERSION} ${D}/${libdir_jni} @@ -43,9 +41,7 @@ do_install() { } do_stage() { - oe_jarinstall -s swt-pi.jar - oe_jarinstall -s swt.jar - oe_jarinstall -s swt-gtk-${PV}.jar swt-gtk.jar + oe_jarinstall -s swt-gtk-${PV}.jar swt-gtk.jar swt.jar } PACKAGES += "lib${PN}-jni" diff --git a/packages/swt/swt3.3-gtk_3.3.1.bb b/packages/swt/swt3.3-gtk_3.3.1.bb index 5b17853725..82860edfb3 100644 --- a/packages/swt/swt3.3-gtk_3.3.1.bb +++ b/packages/swt/swt3.3-gtk_3.3.1.bb @@ -1,5 +1,7 @@ require swt-gtk.inc +PR = "r1" + SRC_URI = "http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-${PV}-200710231652/swt-${PV}-gtk-linux-x86.zip \ file://Makefile" diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb index d3dfe4d216..7033d0c854 100644 --- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb +++ b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb @@ -1,6 +1,6 @@ require swt3.4-gtk_${PV}.bb -PR = "r2" +PR = "r3" DEPENDS += "libhildon libhildonfm" diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb index 17d85b46f3..9a74844f59 100644 --- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb +++ b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb @@ -1,6 +1,6 @@ require swt3.4-gtk_${PV}.bb -PR = "r0" +PR = "r1" DEPENDS += "libhildon libhildonfm" diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb index 701339d374..eda136b329 100644 --- a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb +++ b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb @@ -1,5 +1,7 @@ require swt-gtk.inc +PR = "r1" + SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip \ file://Makefile \ file://make_linux-fix.patch;patch=1" diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk_3.3+3.4M5.bb index 4035d083f7..4cdd7c0f94 100644 --- a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb +++ b/packages/swt/swt3.4-gtk_3.3+3.4M5.bb @@ -1,5 +1,7 @@ require swt-gtk.inc +PR = "r1" + SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M5-200802071530/swt-3.4M5-gtk-linux-x86.zip \ file://Makefile" diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in deleted file mode 100644 index 5b9b7c780c..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=1 -WLAN_EXTRAVERSION=-pre26 -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC= -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch deleted file mode 100644 index 4f59f0fa5d..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h~no-compat -+++ linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h -@@ -351,14 +351,14 @@ - - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20)) - #ifdef _LINUX_LIST_H -- -+/* - static inline void list_move_tail(struct list_head *list, - struct list_head *head) - { - __list_del(list->prev, list->next); - list_add_tail(list, head); - } -- -+*/ - static inline void __list_splice(struct list_head *list, - struct list_head *head) - { -@@ -372,13 +372,13 @@ - last->next = at; - at->prev = last; - } -- -+/* - static inline void list_move(struct list_head *list, struct list_head *head) - { - __list_del(list->prev, list->next); - list_add(list, head); - } -- -+*/ - static inline void list_splice_init(struct list_head *list, - struct list_head *head) - { -@@ -388,7 +388,6 @@ - } - } - -- - #endif // LIST_H - #endif diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch deleted file mode 100644 index a119460a1d..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch +++ /dev/null @@ -1,31 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-modules.patch -+++ linux-wlan-ng-0.2.1-pre26/src/Makefile -@@ -44,10 +44,8 @@ - - include ../config.mk - --DIRS=p80211 prism2 shared wlanctl wland nwepgen \ -- mkmeta wlancfg --ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \ -- nwepgen wlancfg -+DIRS=p80211 prism2 shared mkmeta -+ALL_DIRS=mkmeta p80211 prism2 shared - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` ---- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-modules.patch -+++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile -@@ -44,7 +44,7 @@ - - include ../../config.mk - --DIRS=driver ridlist download -+DIRS=driver ridlist - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.3/config.in deleted file mode 100644 index 27baca26fb..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=3 -WLAN_EXTRAVERSION= -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC= -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=n -PRISM2_PCMCIA=n -PRISM2_PCI=n -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch deleted file mode 100644 index 93d0c01bdd..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: linux-wlan-ng-0.2.3/src/prism2/driver/prism2_cs.c -=================================================================== ---- linux-wlan-ng-0.2.3.orig/src/prism2/driver/prism2_cs.c 2005-09-30 18:19:26.000000000 +0200 -+++ linux-wlan-ng-0.2.3/src/prism2/driver/prism2_cs.c 2006-02-06 20:23:23.902133136 +0100 -@@ -22,12 +22,16 @@ - * says. - */ - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) ) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,8)) - static int numlist = 4; - module_param_array(irq_list, int, numlist, 0444); - #else - module_param_array(irq_list, int, NULL, 0444); - #endif -+#else -+MODULE_PARM( irq_list, "1-4i" ); -+#endif - module_param( irq_mask, int, 0644); - #endif - diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch deleted file mode 100644 index 77b33e6573..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: Configure -=================================================================== ---- linux-wlan-ng-devel.orig/Configure (revision 1772) -+++ linux-wlan-ng-devel/Configure (working copy) -@@ -269,6 +269,12 @@ - write_bool KERN_25 - fi - -+# flag to indicate new kbuild for modules in 2-6-17 -+if [ $VERSION_CODE -gt `version 2 6 16` ] ; then -+ KERN_26=y -+ write_bool KERN_26 -+fi -+ - if [ "$SRC_RELEASE" != "$CUR_RELEASE" ] ; then - $ECHO "WARNING: the current running kernel is actually version $CUR_RELEASE." - fi -Index: src/p80211/Makefile -=================================================================== ---- linux-wlan-ng-devel.orig/src/p80211/Makefile (revision 1772) -+++ linux-wlan-ng-devel/src/p80211/Makefile (working copy) -@@ -72,15 +72,18 @@ - - PWD := $(shell pwd) - default: -- -+ifeq ($(KERN_26),y) -+ $(MAKE) -C $(LINUX_SRC) M='$(PWD)' WLAN_SRC=$(WLAN_SRC) -+ cp Modules.symvers ../prism2/driver -+else - ifeq ($(KERN_25), y) - $(MAKE) -C $(LINUX_SRC) M='$(PWD)/.. $(PWD)' WLAN_SRC=$(WLAN_SRC) modules - else - $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(WLAN_SRC) modules - endif # KERN_25 -- -+endif # KERN_26 - clean: -- rm -f *.o *.ko .*.cmd *.mod.c *.flags .*.flags -+ rm -f *.o *.ko .*.cmd *.mod.c *.flags .*.flags Modules.symvers - - install: - mkdir -p $(TARGET_MODDIR) -Index: src/prism2/driver/Makefile -=================================================================== ---- linux-wlan-ng-devel.orig/src/prism2/driver/Makefile (revision 1772) -+++ linux-wlan-ng-devel/src/prism2/driver/Makefile (working copy) -@@ -83,19 +83,26 @@ - PWD := $(shell pwd) - - default: -+#if new kbuild in 2.6.17 or later -+ifeq ($(KERN_26), y) -+ $(MAKE) -C $(LINUX_SRC) M='$(PWD)' WLAN_SRC=$(WLAN_SRC) -+ -+else - ifeq ($(KERN_25), y) - $(MAKE) -C $(LINUX_SRC) M='$(PWD)/../.. $(PWD)' WLAN_SRC=$(WLAN_SRC) \ - modules -+ - else # kbuild 2.4 - $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(WLAN_SRC) \ - modules - - endif # kbuild switch -+endif # KERN_26 - - endif #KERNELRELEASE - - clean: -- rm -f *.o *.ko .*.cmd *.mod.c *.flags .*.flags -+ rm -f *.o *.ko .*.cmd *.mod.c *.flags .*.flags Modules.symvers - - install: - ifeq ($(KERN_25), y) diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch deleted file mode 100644 index a119460a1d..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch +++ /dev/null @@ -1,31 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-modules.patch -+++ linux-wlan-ng-0.2.1-pre26/src/Makefile -@@ -44,10 +44,8 @@ - - include ../config.mk - --DIRS=p80211 prism2 shared wlanctl wland nwepgen \ -- mkmeta wlancfg --ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \ -- nwepgen wlancfg -+DIRS=p80211 prism2 shared mkmeta -+ALL_DIRS=mkmeta p80211 prism2 shared - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` ---- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-modules.patch -+++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile -@@ -44,7 +44,7 @@ - - include ../../config.mk - --DIRS=driver ridlist download -+DIRS=driver ridlist - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch deleted file mode 100644 index 65e34a326b..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: linux-wlan-ng-0.2.3/src/prism2/driver/prism2sta.c -=================================================================== ---- linux-wlan-ng-0.2.3.orig/src/prism2/driver/prism2sta.c 2005-10-07 23:32:44.000000000 +0200 -+++ linux-wlan-ng-0.2.3/src/prism2/driver/prism2sta.c 2006-02-21 09:02:21.338239744 +0100 -@@ -2427,11 +2427,7 @@ - hfa384x2host_16(hw->qual.ANL_currFC)); - - /* Reschedule timer */ -- //if (!hw->timer_running) { -- hw->commsqual_timer.expires = jiffies + HZ; -- add_timer(&hw->commsqual_timer); -- hw->timer_running = 1; -- //} -+ mod_timer(&hw->commsqual_timer, jiffies + HZ); - - done: - DBFEXIT; diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch deleted file mode 100644 index abb3b137da..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: trunk/src/Makefile -=================================================================== ---- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200 -+++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../config.mk - --DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 -+DIRS=mkmeta shared p80211 prism2 - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` -Index: trunk/src/prism2/Makefile -=================================================================== ---- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200 -+++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../../config.mk - --DIRS=driver ridlist download -+DIRS=driver ridlist - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch deleted file mode 100644 index abb3b137da..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: trunk/src/Makefile -=================================================================== ---- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200 -+++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../config.mk - --DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 -+DIRS=mkmeta shared p80211 prism2 - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` -Index: trunk/src/prism2/Makefile -=================================================================== ---- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200 -+++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../../config.mk - --DIRS=driver ridlist download -+DIRS=driver ridlist - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb deleted file mode 100644 index f2ead8d8b3..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb +++ /dev/null @@ -1,32 +0,0 @@ -require wlan-ng-modules.inc - -PR = "r4" - -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/older/linux-wlan-ng-${PV}.tar.bz2 \ - file://no-compat.patch;patch=1 \ - file://only-the-modules.patch;patch=1 \ - file://config.in" - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "CC=${KERNEL_CC}" >> config.mk - echo "LD=${KERNEL_LD}" >> config.mk - - # Listen closely... sssshhh... can you hear the wlan-ng build system suck? - rm -f ${KERNEL_SOURCE}/../config.mk - rm -f ${KERNEL_SOURCE}/../../config.mk - ln -sf ${S}/config.mk ${KERNEL_SOURCE}/.. - ln -sf ${S}/config.mk ${KERNEL_SOURCE}/../.. - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb deleted file mode 100644 index 6dc9be552d..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -require wlan-ng-modules.inc -PR = "r4" - -SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://prism2sta_commsqual_defer.patch;patch=1 \ - file://modules-symvers.patch;patch=1 \ - file://usb-owner.patch;patch=1 " -S = "${WORKDIR}/linux-wlan-ng-${PV}" diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb deleted file mode 100644 index 9639389501..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb +++ /dev/null @@ -1,10 +0,0 @@ -require wlan-ng-modules.inc - -PR = "r1" - -SRCDATE = "20060823" -PV = "0.2.4+svn${SRCDATE}" - -SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " -S = "${WORKDIR}/trunk" - diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb deleted file mode 100644 index f322848d59..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb +++ /dev/null @@ -1,9 +0,0 @@ -require wlan-ng-modules.inc - -PR = "r1" - -SRCDATE = "20061109" -PV = "0.2.5+svn${SRCDATE}" - -SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " -S = "${WORKDIR}/trunk" diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb deleted file mode 100644 index 1368729826..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_svn.bb +++ /dev/null @@ -1,10 +0,0 @@ -require wlan-ng-modules.inc -PR = "r1" -PV = "0.2.4+svn${SRCDATE}" - -SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " -S = "${WORKDIR}/trunk" - -DEFAULT_PREFERENCE = "-1" - -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-modules' ], d)}" diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in deleted file mode 100644 index 5b9b7c780c..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=1 -WLAN_EXTRAVERSION=-pre26 -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC= -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch deleted file mode 100644 index 43c9c1320d..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch +++ /dev/null @@ -1,37 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.1-pre26/src/Makefile -@@ -42,12 +42,10 @@ - # - # -------------------------------------------------------------------- - --include ../config.mk -+include ../config.mk - --DIRS=p80211 prism2 shared wlanctl wland nwepgen \ -- mkmeta wlancfg --ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \ -- nwepgen wlancfg -+DIRS=prism2 shared wlanctl wland nwepgen mkmeta wlancfg -+ALL_DIRS=mkmeta prism2 shared wlanctl wland nwepgen wlancfg - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` ---- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile -@@ -42,9 +42,9 @@ - # - # -------------------------------------------------------------------- - --include ../../config.mk -+include ../../config.mk - --DIRS=driver ridlist download -+DIRS=ridlist download - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.2/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in deleted file mode 100644 index 1fadad5560..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=2 -WLAN_EXTRAVERSION= -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC=. -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch deleted file mode 100644 index 2a4369b931..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.2/src/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.2/src/Makefile -@@ -44,9 +44,9 @@ - - -include ../config.mk - --DIRS=p80211 prism2 shared wlanctl wland nwepgen \ -+DIRS=prism2 shared wlanctl wland nwepgen \ - mkmeta wlancfg --ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \ -+ALL_DIRS=mkmeta prism2 shared wlanctl wland \ - nwepgen wlancfg - - ifneq ($(wildcard *.addon),) ---- linux-wlan-ng-0.2.2/src/prism2/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.2/src/prism2/Makefile -@@ -44,7 +44,7 @@ - - -include ../../config.mk - --DIRS=driver ridlist download -+DIRS=ridlist download - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.3/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.3/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.3/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.3/config.in deleted file mode 100644 index be01488a92..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.3/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=3 -WLAN_EXTRAVERSION= -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC=. -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch deleted file mode 100644 index 2a4369b931..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.2/src/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.2/src/Makefile -@@ -44,9 +44,9 @@ - - -include ../config.mk - --DIRS=p80211 prism2 shared wlanctl wland nwepgen \ -+DIRS=prism2 shared wlanctl wland nwepgen \ - mkmeta wlancfg --ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \ -+ALL_DIRS=mkmeta prism2 shared wlanctl wland \ - nwepgen wlancfg - - ifneq ($(wildcard *.addon),) ---- linux-wlan-ng-0.2.2/src/prism2/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.2/src/prism2/Makefile -@@ -44,7 +44,7 @@ - - -include ../../config.mk - --DIRS=driver ridlist download -+DIRS=ridlist download - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in deleted file mode 100644 index be01488a92..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=3 -WLAN_EXTRAVERSION= -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC=. -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch deleted file mode 100644 index af1f442a4c..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: trunk/src/Makefile -=================================================================== ---- trunk.orig/src/Makefile 2006-08-21 16:24:58.000000000 +0200 -+++ trunk/src/Makefile 2006-08-23 12:49:08.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../config.mk - --DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 -+DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2 - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` -Index: trunk/src/prism2/Makefile -=================================================================== ---- trunk.orig/src/prism2/Makefile 2006-08-21 16:24:57.000000000 +0200 -+++ trunk/src/prism2/Makefile 2006-08-23 12:48:32.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../../config.mk - --DIRS=driver ridlist download -+DIRS=ridlist download - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb deleted file mode 100644 index ff41097393..0000000000 --- a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb +++ /dev/null @@ -1,3 +0,0 @@ -require wlan-ng-utils.inc - -PR = "r2" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb deleted file mode 100644 index 7e28b417c9..0000000000 --- a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require wlan-ng-utils.inc - -PR = "r3" - -SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ - file://pcmciasrc.patch;patch=1 \ - file://hostldflags.patch;patch=1" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb deleted file mode 100644 index 6f7c75cf7d..0000000000 --- a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb +++ /dev/null @@ -1,20 +0,0 @@ -require wlan-ng-utils.inc - -PR = "r1" - -SRCDATE = "20060823" -PV = "0.2.4+svn${SRCDATE}" - -SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ - file://only-the-utils.patch;patch=1 \ - file://scripts-makefile-hostcc.patch;patch=1 \ - file://pcmciasrc.patch;patch=1 \ - file://hostldflags.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down \ - file://config.in" -S = "${WORKDIR}/trunk" diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb deleted file mode 100644 index 9de024f006..0000000000 --- a/packages/wlan-ng/wlan-ng-utils_svn.bb +++ /dev/null @@ -1,24 +0,0 @@ -require wlan-ng-utils.inc - -PR = "r3" -PV = "0.2.4+svn${SRCDATE}" - -SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ - file://only-the-utils.patch;patch=1 \ - file://scripts-makefile-hostcc.patch;patch=1 \ - file://pcmciasrc.patch;patch=1 \ - file://hostldflags.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down \ - file://config.in" -S = "${WORKDIR}/trunk" - -FILES_${PN} = "/etc /sbin" - -DEFAULT_PREFERENCE = "-1" - -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-utils' ], d)}" diff --git a/packages/linux/linux-beagleboard/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-beagleboard/.mtn2git_empty +++ b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/.mtn2git_empty diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..ccc19139c8 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/disable-xf86-dga-xorgcfg.patch @@ -0,0 +1,39 @@ +Index: xorg-server-1.3.0.0/configure.ac +=================================================================== +--- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200 ++++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200 +@@ -520,7 +520,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1603,7 +1607,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + AC_TRY_COMPILE([ +@@ -1616,10 +1622,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-tslib.patch new file mode 100644 index 0000000000..3746be5f53 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-tslib.patch @@ -0,0 +1,24 @@ +Index: xorg-server-1.4/configure.ac +=================================================================== +--- xorg-server-1.4.orig/configure.ac 2007-09-08 16:36:37.000000000 +0200 ++++ xorg-server-1.4/configure.ac 2007-09-08 16:38:10.000000000 +0200 +@@ -1816,7 +1816,7 @@ + AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt")) + + if test "x$TSLIB" = xyes; then +- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) ++ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) + if test "x$HAVE_TSLIB" = xno; then + AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/]) + fi +@@ -1840,8 +1840,8 @@ + ;; + esac + KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' +- KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $TSLIB_LIBS $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB" +- KDRIVE_LIBS="$XSERVERLIBS_LIBS $KDRIVE_LOCAL_LIBS" ++ KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB" ++ KDRIVE_LIBS="$XSERVERLIBS_LIBS $TSLIB_LIBS $KDRIVE_LOCAL_LIBS" + + # check if we can build Xephyr + PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch new file mode 100644 index 0000000000..113f1cc584 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch @@ -0,0 +1,77 @@ +--- + Xext/Makefile.am | 6 ++++++ + configure.ac | 9 ++++++++- + include/kdrive-config.h.in | 3 +++ + mi/miinitext.c | 6 ++++++ + 4 files changed, 23 insertions(+), 1 deletion(-) + +Index: xorg-server-1.4/mi/miinitext.c +=================================================================== +--- xorg-server-1.4.orig/mi/miinitext.c 2007-08-23 21:04:54.000000000 +0200 ++++ xorg-server-1.4/mi/miinitext.c 2007-09-06 23:25:35.000000000 +0200 +@@ -374,6 +374,9 @@ + #ifdef DMXEXT + extern void DMXExtensionInit(INITARGS); + #endif ++#ifdef XCALIBRATE ++extern void XCalibrateExtensionInit(INITARGS); ++#endif + #ifdef XEVIE + extern void XevieExtensionInit(INITARGS); + #endif +@@ -666,6 +669,9 @@ + #ifdef DAMAGE + if (!noDamageExtension) DamageExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void +Index: xorg-server-1.4/configure.ac +=================================================================== +--- xorg-server-1.4.orig/configure.ac 2007-09-06 23:25:15.000000000 +0200 ++++ xorg-server-1.4/configure.ac 2007-09-06 23:26:40.000000000 +0200 +@@ -500,6 +500,7 @@ + AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: auto)]), [XF86MISC=$enableval], [XF86MISC=auto]) + AC_ARG_ENABLE(xace, AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes]) + AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=$XACE]) ++AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no]) + AC_ARG_ENABLE(appgroup, AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=$XCSECURITY]) + AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no]) + AC_ARG_ENABLE(tslib, AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no]) +@@ -787,6 +788,12 @@ + AC_DEFINE(XCSECURITY, 1, [Build Security extension]) + fi + ++AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes]) ++if test "x$XCALIBRATE" = xyes; then ++ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto" ++fi ++ + AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes]) + if test "x$XEVIE" = xyes; then + AC_DEFINE(XEVIE, 1, [Build XEvIE extension]) +@@ -1841,7 +1848,7 @@ + ;; + esac + KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' +- KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB" ++ KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB" + KDRIVE_LIBS="$XSERVERLIBS_LIBS $TSLIB_LIBS $KDRIVE_LOCAL_LIBS" + + # check if we can build Xephyr +Index: xorg-server-1.4/include/kdrive-config.h.in +=================================================================== +--- xorg-server-1.4.orig/include/kdrive-config.h.in 2007-08-23 21:04:54.000000000 +0200 ++++ xorg-server-1.4/include/kdrive-config.h.in 2007-09-06 23:25:35.000000000 +0200 +@@ -31,4 +31,7 @@ + /* Have execinfo.h for backtrace(). */ + #undef HAVE_EXECINFO_H + ++/* Enable XCalibrate extension */ ++#undef XCALIBRATE ++ + #endif /* _KDRIVE_CONFIG_H_ */ diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/keyboard-resume-workaround.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/keyboard-resume-workaround.patch new file mode 100644 index 0000000000..4964ff5479 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/keyboard-resume-workaround.patch @@ -0,0 +1,16 @@ +Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c +=================================================================== +--- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c 2007-09-29 18:31:15.000000000 +0200 ++++ xorg-server-1.4/hw/kdrive/linux/keyboard.c 2007-09-29 18:33:02.000000000 +0200 +@@ -743,11 +743,6 @@ + cfsetispeed(&nTty, 9600); + cfsetospeed(&nTty, 9600); + tcsetattr(fd, TCSANOW, &nTty); +- /* +- * Flush any pending keystrokes +- */ +- while ((n = read (fd, buf, sizeof (buf))) > 0) +- ; + KdRegisterFd (fd, LinuxKeyboardRead, ki); + return Success; + } diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/linux-keyboard-mediumraw.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/linux-keyboard-mediumraw.patch new file mode 100644 index 0000000000..36d2f8eae8 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/linux-keyboard-mediumraw.patch @@ -0,0 +1,44 @@ +Index: git/hw/kdrive/linux/keyboard.c +=================================================================== +--- git.orig/hw/kdrive/linux/keyboard.c 2007-11-14 21:30:45.000000000 +0000 ++++ git/hw/kdrive/linux/keyboard.c 2007-11-15 12:00:11.000000000 +0000 +@@ -42,6 +42,8 @@ + #include <sys/ioctl.h> + + extern int LinuxConsoleFd; ++static unsigned char mediumraw_data, mediumraw_up; ++static enum { DEFAULT, EXTBYTE1, EXTBYTE2 } mediumraw_state = DEFAULT; + + static const KeySym linux_to_x[256] = { + NoSymbol, NoSymbol, NoSymbol, NoSymbol, +@@ -701,7 +703,29 @@ + else + #endif + scancode = b[0] & 0x7f; +- KdEnqueueKeyboardEvent (closure, scancode, b[0] & 0x80); ++ /* This is extended medium raw mode interpreter ++ see linux/drivers/keyboard.c (kbd->kbdmode == VC_MEDIUMRAW) */ ++ switch (mediumraw_state) ++ { ++ case DEFAULT: ++ if (scancode == 0) ++ { ++ mediumraw_state = EXTBYTE1; ++ mediumraw_up = b[0] & 0x80; ++ } ++ else ++ KdEnqueueKeyboardEvent (closure, scancode, b[0] & 0x80); ++ break; ++ case EXTBYTE1: ++ mediumraw_data = scancode; ++ mediumraw_state = EXTBYTE2; ++ break; ++ case EXTBYTE2: ++ /* Note: Only codes < 256 will pass correctly through KdEnqueueKeyboardEvent() */ ++ KdEnqueueKeyboardEvent (closure, (int)mediumraw_data << 7 | scancode, mediumraw_up); ++ mediumraw_state = DEFAULT; ++ break; ++ } + b++; + } + } diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch new file mode 100644 index 0000000000..0812a2e856 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch @@ -0,0 +1,54 @@ +Index: xorg-server-1.4/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200 ++++ xorg-server-1.4/hw/kdrive/Makefile.am 2007-09-06 23:33:44.000000000 +0200 +@@ -11,6 +11,10 @@ + XFAKE_SUBDIRS = fake + endif + ++if KDRIVEW100 ++W100_SUBDIRS = w100 ++endif ++ + if XSDLSERVER + XSDL_SUBDIRS = sdl + endif +@@ -26,6 +30,7 @@ + SERVER_SUBDIRS = \ + $(XSDL_SUBDIRS) \ + $(FBDEV_SUBDIRS) \ ++ $(W100_SUBDIRS) \ + $(VESA_SUBDIRS) \ + $(XEPHYR_SUBDIRS) \ + $(XFAKE_SUBDIRS) +Index: xorg-server-1.4/configure.ac +=================================================================== +--- xorg-server-1.4.orig/configure.ac 2007-09-06 23:32:05.000000000 +0200 ++++ xorg-server-1.4/configure.ac 2007-09-06 23:34:41.000000000 +0200 +@@ -535,6 +535,7 @@ + AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no]) + AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto]) + AC_ARG_ENABLE(xsdl, AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto]) ++AC_ARG_ENABLE(w100, AS_HELP_STRING([--enable-w100], [Build the kdrive Xw100 server (default: no)]), [KDRIVEW100=$enableval], [KDRIVEW100=no]) + AC_ARG_ENABLE(xfake, AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto]) + AC_ARG_ENABLE(xfbdev, AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto]) + AC_ARG_ENABLE(kdrive-vesa, AS_HELP_STRING([--enable-kdrive-vesa], [Build the kdrive VESA-based servers (default: auto)]), [KDRIVEVESA=$enableval], [KDRIVEVESA=auto]) +@@ -1669,6 +1670,10 @@ + fi + AM_CONDITIONAL(XP_USE_FREETYPE, [test "x$XPRINT" = xyes && test "x$XP_USE_FREETYPE" = xyes]) + ++AM_CONDITIONAL(KDRIVEW100, [test "x$KDRIVEW100" = xyes]) ++if test "x$KDRIVEW100" = xyes; then ++ AC_DEFINE(KDRIVEW100, 1, [Build Xw100 server]) ++fi + + dnl XWin DDX + +@@ -2112,6 +2117,7 @@ + hw/kdrive/epson/Makefile + hw/kdrive/fake/Makefile + hw/kdrive/fbdev/Makefile ++hw/kdrive/w100/Makefile + hw/kdrive/i810/Makefile + hw/kdrive/linux/Makefile + hw/kdrive/mach64/Makefile diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/.mtn2git_empty +++ b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/.mtn2git_empty diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.99.901/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..ccc19139c8 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/disable-xf86-dga-xorgcfg.patch @@ -0,0 +1,39 @@ +Index: xorg-server-1.3.0.0/configure.ac +=================================================================== +--- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200 ++++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200 +@@ -520,7 +520,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1603,7 +1607,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + AC_TRY_COMPILE([ +@@ -1616,10 +1622,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.99.901/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/enable-tslib.patch new file mode 100644 index 0000000000..0519b3093a --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/enable-tslib.patch @@ -0,0 +1,24 @@ +--- /tmp/configure.ac 2008-04-16 10:52:15.016442542 +0200 ++++ xorg-server-1.4.99.901/configure.ac 2008-04-16 10:54:23.786428934 +0200 +@@ -1925,7 +1925,7 @@ + AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt")) + + if test "x$TSLIB" = xyes; then +- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) ++ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) + if test "x$HAVE_TSLIB" = xno; then + AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/]) + fi +@@ -1949,10 +1949,10 @@ + ;; + esac + KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' +- KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" ++ KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" + KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" + KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" +- KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS" ++ KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS" + + # check if we can build Xephyr + PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.99.901/keyboard-resume-workaround.patch b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/keyboard-resume-workaround.patch new file mode 100644 index 0000000000..4964ff5479 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/keyboard-resume-workaround.patch @@ -0,0 +1,16 @@ +Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c +=================================================================== +--- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c 2007-09-29 18:31:15.000000000 +0200 ++++ xorg-server-1.4/hw/kdrive/linux/keyboard.c 2007-09-29 18:33:02.000000000 +0200 +@@ -743,11 +743,6 @@ + cfsetispeed(&nTty, 9600); + cfsetospeed(&nTty, 9600); + tcsetattr(fd, TCSANOW, &nTty); +- /* +- * Flush any pending keystrokes +- */ +- while ((n = read (fd, buf, sizeof (buf))) > 0) +- ; + KdRegisterFd (fd, LinuxKeyboardRead, ki); + return Success; + } diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.99.901/linux-keyboard-mediumraw.patch b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/linux-keyboard-mediumraw.patch new file mode 100644 index 0000000000..36d2f8eae8 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/linux-keyboard-mediumraw.patch @@ -0,0 +1,44 @@ +Index: git/hw/kdrive/linux/keyboard.c +=================================================================== +--- git.orig/hw/kdrive/linux/keyboard.c 2007-11-14 21:30:45.000000000 +0000 ++++ git/hw/kdrive/linux/keyboard.c 2007-11-15 12:00:11.000000000 +0000 +@@ -42,6 +42,8 @@ + #include <sys/ioctl.h> + + extern int LinuxConsoleFd; ++static unsigned char mediumraw_data, mediumraw_up; ++static enum { DEFAULT, EXTBYTE1, EXTBYTE2 } mediumraw_state = DEFAULT; + + static const KeySym linux_to_x[256] = { + NoSymbol, NoSymbol, NoSymbol, NoSymbol, +@@ -701,7 +703,29 @@ + else + #endif + scancode = b[0] & 0x7f; +- KdEnqueueKeyboardEvent (closure, scancode, b[0] & 0x80); ++ /* This is extended medium raw mode interpreter ++ see linux/drivers/keyboard.c (kbd->kbdmode == VC_MEDIUMRAW) */ ++ switch (mediumraw_state) ++ { ++ case DEFAULT: ++ if (scancode == 0) ++ { ++ mediumraw_state = EXTBYTE1; ++ mediumraw_up = b[0] & 0x80; ++ } ++ else ++ KdEnqueueKeyboardEvent (closure, scancode, b[0] & 0x80); ++ break; ++ case EXTBYTE1: ++ mediumraw_data = scancode; ++ mediumraw_state = EXTBYTE2; ++ break; ++ case EXTBYTE2: ++ /* Note: Only codes < 256 will pass correctly through KdEnqueueKeyboardEvent() */ ++ KdEnqueueKeyboardEvent (closure, (int)mediumraw_data << 7 | scancode, mediumraw_up); ++ mediumraw_state = DEFAULT; ++ break; ++ } + b++; + } + } diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch new file mode 100644 index 0000000000..779aa2d6ef --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch @@ -0,0 +1,12 @@ +--- dix/devices.c~ 2008-04-16 13:01:08.000000000 +0200 ++++ dix/devices.c 2008-04-16 13:01:08.000000000 +0200 +@@ -527,8 +527,8 @@ + #ifdef XKB + if (dev->key->xkbInfo) + XkbFreeInfo(dev->key->xkbInfo); +-#endif + dev->key->xkbInfo = NULL; ++#endif + xfree(dev->key->curKeySyms.map); + xfree(dev->key->modifierKeyMap); + xfree(dev->key); diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch new file mode 100644 index 0000000000..0812a2e856 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch @@ -0,0 +1,54 @@ +Index: xorg-server-1.4/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200 ++++ xorg-server-1.4/hw/kdrive/Makefile.am 2007-09-06 23:33:44.000000000 +0200 +@@ -11,6 +11,10 @@ + XFAKE_SUBDIRS = fake + endif + ++if KDRIVEW100 ++W100_SUBDIRS = w100 ++endif ++ + if XSDLSERVER + XSDL_SUBDIRS = sdl + endif +@@ -26,6 +30,7 @@ + SERVER_SUBDIRS = \ + $(XSDL_SUBDIRS) \ + $(FBDEV_SUBDIRS) \ ++ $(W100_SUBDIRS) \ + $(VESA_SUBDIRS) \ + $(XEPHYR_SUBDIRS) \ + $(XFAKE_SUBDIRS) +Index: xorg-server-1.4/configure.ac +=================================================================== +--- xorg-server-1.4.orig/configure.ac 2007-09-06 23:32:05.000000000 +0200 ++++ xorg-server-1.4/configure.ac 2007-09-06 23:34:41.000000000 +0200 +@@ -535,6 +535,7 @@ + AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no]) + AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto]) + AC_ARG_ENABLE(xsdl, AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto]) ++AC_ARG_ENABLE(w100, AS_HELP_STRING([--enable-w100], [Build the kdrive Xw100 server (default: no)]), [KDRIVEW100=$enableval], [KDRIVEW100=no]) + AC_ARG_ENABLE(xfake, AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto]) + AC_ARG_ENABLE(xfbdev, AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto]) + AC_ARG_ENABLE(kdrive-vesa, AS_HELP_STRING([--enable-kdrive-vesa], [Build the kdrive VESA-based servers (default: auto)]), [KDRIVEVESA=$enableval], [KDRIVEVESA=auto]) +@@ -1669,6 +1670,10 @@ + fi + AM_CONDITIONAL(XP_USE_FREETYPE, [test "x$XPRINT" = xyes && test "x$XP_USE_FREETYPE" = xyes]) + ++AM_CONDITIONAL(KDRIVEW100, [test "x$KDRIVEW100" = xyes]) ++if test "x$KDRIVEW100" = xyes; then ++ AC_DEFINE(KDRIVEW100, 1, [Build Xw100 server]) ++fi + + dnl XWin DDX + +@@ -2112,6 +2117,7 @@ + hw/kdrive/epson/Makefile + hw/kdrive/fake/Makefile + hw/kdrive/fbdev/Makefile ++hw/kdrive/w100/Makefile + hw/kdrive/i810/Makefile + hw/kdrive/linux/Makefile + hw/kdrive/mach64/Makefile diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb new file mode 100644 index 0000000000..32bb76c0f5 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb @@ -0,0 +1,33 @@ +require xserver-kdrive-common.inc + +DEPENDS += "hal libxkbfile libxcalibrate pixman" + +PE = "1" +PR = "r0" + +SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ + ${KDRIVE_COMMON_PATCHES} \ + file://enable-epson.patch;patch=1 \ + file://fix_default_mode.patch;patch=1 \ + file://enable-xcalibrate.patch;patch=1 \ + file://hide-cursor-and-ppm-root.patch;patch=1 \ + file://xcalibrate_coords.patch;patch=1 \ + file://w100.patch;patch=1 \ + file://w100-autofoo.patch;patch=1 \ + file://w100-fix-offscreen-bmp.patch;patch=1 \ + file://w100-new-input-world-order.patch;patch=1 \ + file://linux-keyboard-mediumraw.patch;patch=1 \ + file://xcalibrate-new-input-world-order.patch;patch=1 \ + file://tslib-default-device.patch;patch=1 \ + file://fbdev-evdev.patch;patch=1 \ + file://keyboard-resume-workaround.patch;patch=1 \ + file://xorg-avr32-support.diff;patch=1 \ + file://pkgconfig_fix.patch;patch=1 \ + " + +S = "${WORKDIR}/xorg-server-${PV}" + +W100_OECONF = "--disable-w100" +W100_OECONF_arm = "--enable-w100" + +EXTRA_OECONF += "--enable-builtin-fonts" diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb new file mode 100644 index 0000000000..ea6179a5d2 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb @@ -0,0 +1,37 @@ +require xserver-kdrive-common.inc + +DEPENDS += "hal libxkbfile libxcalibrate pixman" + +DEFAULT_PREFERENCE = "-99" + +PE = "1" +PR = "r2" + +SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ + ${KDRIVE_COMMON_PATCHES} \ + file://enable-epson.patch;patch=1 \ + file://fix_default_mode.patch;patch=1 \ +# file://hide-cursor-and-ppm-root.patch;patch=1 \ +# file://xcalibrate_coords.patch;patch=1 \ + file://w100.patch;patch=1 \ + file://w100-autofoo.patch;patch=1 \ + file://w100-fix-offscreen-bmp.patch;patch=1 \ + file://w100-new-input-world-order.patch;patch=1 \ + file://linux-keyboard-mediumraw.patch;patch=1 \ + file://xcalibrate-new-input-world-order.patch;patch=1 \ + file://tslib-default-device.patch;patch=1 \ +# file://fbdev-evdev.patch;patch=1 \ + file://keyboard-resume-workaround.patch;patch=1 \ + file://xorg-avr32-support.diff;patch=1 \ +# file://pkgconfig_fix.patch;patch=1 \ + file://no_xkb.patch;patch=1;pnum=0 \ + " + +S = "${WORKDIR}/xorg-server-${PV}" + +W100_OECONF = "--disable-w100" +#W100_OECONF_arm = "--enable-w100" + +EXTRA_OECONF += "--enable-builtin-fonts \ + --disable-dri2 \ + " |