diff options
Diffstat (limited to 'packages')
58 files changed, 1050 insertions, 7231 deletions
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index 6199d2fde2..194ca00263 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -36,40 +36,3 @@ do_install_append () { install -d ${D}/${datadir}/dbus-1.0/services/ install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ } -SECTION = "x11/utils" -DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt" -DESCRIPTION = "Settings daemon using DBUS for communication." -LICENSE = "GPL" -MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" -PROVIDES = "gconf" -RPROVIDES_${PN} = "gconf" -RPROVIDES_${PN}-dev = "gconf-dev" - -PV = "0.0svn${CVSDATE}" -PR = "r8" - -SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus/branches;module=dbus-0-23-branch;proto=http \ - file://69gconfd-dbus" - -inherit pkgconfig autotools -S = "${WORKDIR}/dbus-0-23-branch" - -FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*" - -EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" - -HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" - -do_stage() { - oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/gconf/2/gconf/ - ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done ) - install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 -} - -do_install_append () { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/ - install -d ${D}/${datadir}/dbus-1.0/services/ - install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ -} diff --git a/packages/ipkg-utils/ipkg-link_1.6cvs.bb b/packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb index 94f749cf62..bcd3c7b1a0 100644 --- a/packages/ipkg-utils/ipkg-link_1.6cvs.bb +++ b/packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb @@ -2,11 +2,10 @@ SECTION = "base" DESCRIPTION = "Itsy Package Manager utilities link script" LICENSE = "GPL" CONFLICTS = "ipkg-utils" -PV_append = "${SRCDATE}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" - + S = "${WORKDIR}/ipkg-utils" do_compile() { diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb index cd24007f02..9c1ab32963 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb @@ -1,8 +1,10 @@ -SECTION = "base" include ipkg-utils_${PV}.bb -PR = "r4" -inherit native + RDEPENDS = "python-native" +PR = "r5" + +inherit native + # Avoid circular dependencies from package_ipk.bbclass PACKAGES = "" diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb index e315c82264..b0acd94954 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb @@ -1,15 +1,13 @@ DESCRIPTION = "Itsy Package Manager utilities" SECTION = "base" PRIORITY = "optional" -MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" -PV_append = "${SRCDATE}" -PR = "r9" +PR = "r10" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" - + S = "${WORKDIR}/ipkg-utils" INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py" diff --git a/packages/libcontactsdb/libcontactsdb_cvs.bb b/packages/libcontactsdb/libcontactsdb_cvs.bb index dcd7c0b15b..d11818b0bc 100644 --- a/packages/libcontactsdb/libcontactsdb_cvs.bb +++ b/packages/libcontactsdb/libcontactsdb_cvs.bb @@ -10,6 +10,8 @@ S = "${WORKDIR}/${PN}" PV = "0.3+cvs${SRCDATE}" PR = "r1" +DEFAULT_PREFERENCE = "-1" + inherit autotools gpe pkgconfig SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" diff --git a/packages/linux-hotplug/linux-hotplug-20040920/quiet-pci.patch b/packages/linux-hotplug/linux-hotplug-20040920/quiet-pci.patch new file mode 100644 index 0000000000..5b4d169a2a --- /dev/null +++ b/packages/linux-hotplug/linux-hotplug-20040920/quiet-pci.patch @@ -0,0 +1,11 @@ +--- hotplug-2004_09_20/etc/hotplug/pci.rc.orig 2006-01-14 16:15:34.000000000 +0100 ++++ hotplug-2004_09_20/etc/hotplug/pci.rc 2006-01-14 16:16:19.000000000 +0100 +@@ -45,7 +45,7 @@ + # 2.4 kernels + LISTER=`which pcimodules` + if [ "$LISTER" = "" ] || [ ! -f /proc/bus/pci/devices ] || [ ! -x pci.agent ]; then +- echo $"** can't synthesize pci hotplug events" ++ # echo $"** can't synthesize pci hotplug events" + return 1 + fi + diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb index ce503a219e..c6bcbb66e6 100644 --- a/packages/linux-hotplug/linux-hotplug_20040920.bb +++ b/packages/linux-hotplug/linux-hotplug_20040920.bb @@ -8,7 +8,7 @@ RCONFLICTS_${PN} = "hotplug" RREPLACES_${PN} = "hotplug" SECTION = "base" RSUGGESTS = "pciutils usbutils" -PR = "r7" +PR = "r8" SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \ file://userspecified_hcd.patch;patch=1 \ @@ -27,7 +27,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_2 file://isapnp-exit.diff;patch=1 \ file://usb-storage \ file://soc.agent" - + +SRC_URI_append_openzaurus = " file://quiet-pci.patch;patch=1" + S = "${WORKDIR}/hotplug-2004_09_20" INITSCRIPT_NAME = "hotplug" diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 452c8c956b..a0e149623e 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -9,20 +9,6 @@ # # IXP4XX_PATCHES - full list of patches to apply, to add files # generate a patch against /dev/null -# IXP4XX_SUFFIX - the suffix to add after 'zImage-' in the -# deploy/images directory, should identify the machines the -# kernel will run on, ixp4xx[lb] for generic kernels (le or -# be). Controls the package architecture of the ipk. -# IXP4XX_MACHID - if set the kernel will be forced to use this -# machine id and be forced to LE on LE systems - please always -# remember to override IXP4XX_SUFFIX if this is done, the kernel -# will simply not work on other machines. -# IXP4XX_LEFIXUP - if set prepend the LE fixup code to the kernel -# and byte swap (quad word) the whole kernel image for a BE -# boot loader -# -# If you set CMDLINE_ROOT you should *also* change IXP4XX_SUFFIX -# because the resultant kernel may not work on other systems. # # DEFAULT_PREFERENCE is set automagically in this file as # follows: @@ -41,10 +27,6 @@ DESCRIPTION = "Linux kernel for the Intel IXP4xx device" LICENSE = "GPL" MAINTAINER = "NSLU2-Linux <www.nslu2-linux.org>" -# Defaults for the prefix flags -IXP4XX_MACHID ?= "" -IXP4XX_LEFIXUP ?= "" - # Linux kernel source has the general form linux-X.Y.Z-patchP, # X.Y is the major version number, Z (which may have multiple # parts) is a sub-version and 'patch' is something like 'mm' or @@ -169,30 +151,13 @@ COMPATIBLE_HOST = 'arm.*-linux' inherit kernel -# PACKAGE_ARCH must reliably identify what machines this kernel -# will run on -PACKAGE_ARCH_kernel-image = "${IXP4XX_SUFFIX}" -PACKAGE_ARCH_kernel-dev = "${IXP4XX_SUFFIX}" -PACKAGE_ARCH_kernel = "${IXP4XX_SUFFIX}" - ARCH = "arm" KERNEL_IMAGETYPE = "zImage" # To specify the console set KERNEL_CONSOLE in the .bb file. -# CMDLINE_ROOT contains the boot options, CMDLINE_KERNEL_OPTIONS -# contains the things for a specific kernel. -# -# These are set from MACHINE specific defaults below, but an override -# in local.conf will still take precedence. -# -# CMDLINE_KERNEL_OPTIONS: overridable in local.conf -# MACH_KERNEL_OPTIONS: the default, added to so additional stuff can be -# put in from local.conf etc. -MACH_KERNEL_OPTIONS += "rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f" -MACH_KERNEL_OPTIONS += "rtc-ds1672.probe=0,0x68 rtc-ds1672.hctosys=1" -MACH_KERNEL_OPTIONS += "pcf8563.hctosys=1" -# -CMDLINE_KERNEL_OPTIONS ?= "${MACH_KERNEL_OPTIONS}" +# CMDLINE_ROOT contains the boot options, these will be +# appended to the build in boot options (so it is only necessary +# to override stuff in the kernel source). # CMDLINE_ROOT: machine specific boot options - should not be set on a # generic kernel! @@ -201,7 +166,8 @@ CMDLINE_ROOT ?= "" # CMDLINE_DEBUG: debug options such as noirqdebug, defaults to empty # override in local.conf etc CMDLINE_DEBUG ?= "" -CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_KERNEL_OPTIONS} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}" + +CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}" # Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as # required. Notice that this has to be done for each separately built @@ -246,7 +212,7 @@ do_configure_prepend() { ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch } -# IXP4XX_MACHID and IXP4XX_LEFIXUP handling +# MACHID and LE handling # # This mach_fixup function adds the required prefix to the image to # force the machine id in the kernel to be a particular value. For @@ -272,38 +238,99 @@ do_configure_prepend() { # # The argument to the function is the destination directory -#SETMACH: set the machine id (register 1) to IXP4XX_MACHID -SETMACH = '${@["", ".= ${IXP4XX_MACHID} .256/ 255& 0xe3a01c00+; ${WRITE}; .= 255& 0xe3811000+; ${WRITE};"][bb.data.getVar("IXP4XX_MACHID", d, 1) and 1]}' +# The generic package only includes the generic image, the other +# packages are made below (they are kernel-image packages but +# with a different ARCH). +FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}-${IXP4XX_SUFFIX}-${KERNEL_RELEASE}" -#FIXUP: the correct instructions to copy the kernel prepended with the le fixup -FIXUP_armeb = 'cp$' -FIXUP_arm = '${@["cp$", "wb 0xee110f10,4;wb 0xe3c00080,4;wb 0xee010f10,4;xp $,4"][bb.data.getVar("IXP4XX_LEFIXUP", d, 1) and 1]}' +# MACHINE DEFINITIONS: one block for each machine + +# The correct settings for the NSLU2 board: +nslu2_CMDLINE_ROOT = "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M init=/linuxrc" +nslu2_MACHID = "597" +PACKAGES += "kernel-image-nslu2" +PKG_kernel-image-nslu2 = "kernel-image-${KERNEL_VERSION}" +PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${ARCH_BYTE_SEX}" +DESCRIPTION_kernel-image-nas100d = "Linux kernel for the LinkSys NSLU2" +FILES_kernel-image-nslu2 = "/boot/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" + +# The correct settings for Loft: +loft_CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M init=/linuxrc" +loft_MACHID = "849" +PACKAGES += "kernel-image-loft" +PKG_kernel-image-loft = "kernel-image-${KERNEL_VERSION}" +PACKAGE_ARCH_kernel-image-loft = "loft${ARCH_BYTE_SEX}" +DESCRIPTION_kernel-image-loft = "Linux kernel for the Giant Shoulder Inc. Loft board" +FILES_kernel-image-loft = "/boot/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" + +# The correct settings for the NAS100D board: +nas100d_CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M init=/linuxrc" +nas100d_MACHID = "865" +PACKAGES += "kernel-image-nas100d" +PKG_kernel-image-nas100d = "kernel-image-${KERNEL_VERSION}" +PACKAGE_ARCH_kernel-image-nas100d = "nas100d${ARCH_BYTE_SEX}" +DESCRIPTION_kernel-image-nas100d = "Linux kernel for the IOMega NAS100D" +FILES_kernel-image-nas100d = "/boot/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" -#WRITE: the correct way to write a single ARM instruction (wb unless LE and !LEFIXUP). -WRITE_armeb = 'wb 4' -WRITE_arm = '${@["wl 4", "wb 4"][bb.data.getVar("IXP4XX_LEFIXUP", d, 1) and 1]}' +#FIXUP: the correct instructions to copy the kernel prepended with the le fixup +#FIXME: do a fixup for BE too... +FIXUP_armeb = "cp$" +FIXUP_arm = "wb 0xee110f10,4;wb 0xe3c00080,4;wb 0xee010f10,4;xp $,4" DEPENDS += "devio-native" -# ${SETMACH}${FIXUP} is a sequence of devio commands to copy the image, -# in the standard (generic) case it is just 'cp$' +# copy_image <dest> <cmdline> <machine-id> +# copy the zImage and append the appropriate shim +# dest: where to copy to +# cmdline: command line to pass to image +# machine-id: decimal machine id to prepend, empty for none copy_image() { + local cmdline setmach + + cmdline="" + test -n "$2" && cmdline="$2"' ${CMDLINE_KERNEL_OPTIONS} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}' + + setmach="" + test -n "$3" && setmach="wb $3 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;" + rm -f "$1".new - devio '<<arch/${ARCH}/boot/${KERNEL_IMAGETYPE}' >"$1".new '${SETMACH}${FIXUP}' || { - echo 'ERROR: arch/${ARCH}/boot/${KERNEL_IMAGETYPE}: failed to copy zImage' >&2 + devio '<<${KERNEL_OUTPUT}' >"$1".new "$setmach"'${FIXUP}' || { + echo 'ERROR: ${KERNEL_OUTPUT}: failed to copy zImage' >&2 return 1 } mv "$1".new "$1" } +install_image() { + copy_image '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-'"$1"'-${KERNEL_RELEASE}' "$2" "$3" +} + do_install_append() { - copy_image '${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE}' + # Overwrite the unshimmed generic image with a shimmed one (but without + # any command line or machine id override). + rm -f '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_RELEASE}' + install_image '${IXP4XX_SUFFIX}' + + # Add the machine specific images, with appropriate suffixes + install_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_CMDLINE_ROOT}' '${nslu2_MACHID}' + install_image 'loft${ARCH_BYTE_SEX}' '${loft_CMDLINE_ROOT}' '${loft_MACHID}' + install_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_CMDLINE_ROOT}' '${nas100d_MACHID}' } do_deploy[dirs] = "${S}" + +deploy_image() { + copy_image '${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-'"$1" "$2" "$3" +} + do_deploy() { install -d ${DEPLOY_DIR}/images - copy_image '${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${IXP4XX_SUFFIX}' + deploy_image '${IXP4XX_SUFFIX}' + + # And the machine specific images + deploy_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_CMDLINE_ROOT}' '${nslu2_MACHID}' + deploy_image 'loft${ARCH_BYTE_SEX}' '${loft_CMDLINE_ROOT}' '${loft_MACHID}' + deploy_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_CMDLINE_ROOT}' '${nas100d_MACHID}' } addtask deploy before do_build after do_compile diff --git a/packages/linux/ixp4xx-kernel/2.6.15/11-mtdpart-redboot-config-byteswap.patch b/packages/linux/ixp4xx-kernel/2.6.15/11-mtdpart-redboot-config-byteswap.patch new file mode 100644 index 0000000000..e258567462 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/11-mtdpart-redboot-config-byteswap.patch @@ -0,0 +1,74 @@ +A more robust test for swapped RedBoot FIS directory partitions. This +changes the test to check the flash_base value for the FIS directory, +since we know where the FIS directory base is we can work out whether +the flash address stored in the directory itself is byte swapped under +most circumstances. If the value is 0 the directory is at the start +of the flash and the test fails. In this case the fallback is to use +the original test made slightly more robust. + +Signed-off-by: John Bowler <jbowler@acm.org> + +--- linux-2.6.15/drivers/mtd/redboot.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/drivers/mtd/redboot.c 1970-01-01 00:00:00.000000000 +0000 +@@ -91,14 +91,41 @@ static int parse_redboot_partitions(stru + } + if (!memcmp(buf[i].name, "FIS directory", 14)) { + /* This is apparently the FIS directory entry for the +- * FIS directory itself. The FIS directory size is +- * one erase block; if the buf[i].size field is +- * swab32(erasesize) then we know we are looking at +- * a byte swapped FIS directory - swap all the entries! +- * (NOTE: this is 'size' not 'data_length'; size is +- * the full size of the entry.) ++ * FIS directory itself. To discover whether the entries ++ * in this are native byte sex or byte swapped look at ++ * the flash_base field - we know the FIS directory is ++ * at 'offset' within the flash. + */ +- if (swab32(buf[i].size) == master->erasesize) { ++ int maybe_native, maybe_swapped; ++ if (fis_origin != 0) { ++ maybe_native = ++ buf[i].flash_base == fis_origin + offset; ++ maybe_swapped = ++ swab32(buf[i].flash_base) == fis_origin + offset; ++ } else if (offset != 0 || buf[i].flash_base != 0) { ++ maybe_native = ++ (buf[i].flash_base & (master->size-1)) == offset; ++ maybe_swapped = ++ (swab32(buf[i].flash_base) & (master->size-1)) == offset; ++ } else { ++ /* The FIS directory is at the start of the flash and ++ * the 'flash_base' field is 0. The critical case is when ++ * we are booting off this flash, but then we don't expect ++ * this because the boot loader is pretty much always at ++ * the start! Since the FIS directory is always less than ++ * or equal to one erase block do the following: ++ */ ++ maybe_native = buf[i].size <= master->erasesize; ++ maybe_swapped = swab32(buf[i].size) <= master->erasesize; ++ } ++ ++ if (maybe_native && maybe_swapped) ++ printk(KERN_WARNING "RedBoot directory 0x%lx(0x%lx) assumed native\n", ++ buf[i].flash_base, buf[i].size); ++ else if (!maybe_native && !maybe_swapped) ++ printk(KERN_ERR "RedBoot directory 0x%lx(0x%lx) forced native\n", ++ buf[i].flash_base, buf[i].size); ++ else if (maybe_swapped) { + int j; + for (j = 0; j < numslots && buf[j].name[0] != 0xff; ++j) { + /* The unsigned long fields were written with the +@@ -112,7 +139,11 @@ static int parse_redboot_partitions(stru + swab32s(&buf[j].desc_cksum); + swab32s(&buf[j].file_cksum); + } +- } ++ printk(KERN_NOTICE "RedBoot directory 0x%lx(0x%lx) swapped\n", ++ buf[i].flash_base, buf[i].size); ++ } else ++ printk(KERN_NOTICE "RedBoot directory 0x%lx(0x%lx) native\n", ++ buf[i].flash_base, buf[i].size); + break; + } + } diff --git a/packages/linux/ixp4xx-kernel/2.6.15/40-rtc-class.patch b/packages/linux/ixp4xx-kernel/2.6.15/40-rtc-class.patch index 8e0380bfe5..e10998f8d2 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/40-rtc-class.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/40-rtc-class.patch @@ -1,5 +1,5 @@ ---- linux-nslu2.orig/include/linux/rtc.h 2006-01-03 15:31:18.000000000 +0100 -+++ linux-nslu2/include/linux/rtc.h 2006-01-03 15:34:24.000000000 +0100 +--- linux-nslu2.orig/include/linux/rtc.h 2006-01-08 18:54:58.000000000 +0100 ++++ linux-nslu2/include/linux/rtc.h 2006-01-08 18:55:19.000000000 +0100 @@ -91,8 +91,81 @@ struct rtc_pll_info { #define RTC_PLL_GET _IOR('p', 0x11, struct rtc_pll_info) /* Get PLL correction */ #define RTC_PLL_SET _IOW('p', 0x12, struct rtc_pll_info) /* Set PLL correction */ @@ -38,8 +38,8 @@ +{ + int id; + struct module *owner; -+ struct rw_semaphore lock; + struct class_device class_dev; ++ struct semaphore ops_lock; + struct rtc_class_ops *ops; + char name[RTC_DEVICE_NAME_SIZE]; + @@ -82,8 +82,8 @@ typedef struct rtc_task { void (*func)(void *private_data); void *private_data; ---- linux-nslu2.orig/drivers/Kconfig 2006-01-03 15:31:19.000000000 +0100 -+++ linux-nslu2/drivers/Kconfig 2006-01-04 01:27:31.000000000 +0100 +--- linux-nslu2.orig/drivers/Kconfig 2006-01-08 18:54:58.000000000 +0100 ++++ linux-nslu2/drivers/Kconfig 2006-01-08 18:55:19.000000000 +0100 @@ -66,4 +66,6 @@ source "drivers/infiniband/Kconfig" source "drivers/sn/Kconfig" @@ -91,8 +91,8 @@ +source "drivers/rtc/Kconfig" + endmenu ---- linux-nslu2.orig/drivers/Makefile 2006-01-03 15:33:32.000000000 +0100 -+++ linux-nslu2/drivers/Makefile 2006-01-04 01:27:31.000000000 +0100 +--- linux-nslu2.orig/drivers/Makefile 2006-01-08 18:54:58.000000000 +0100 ++++ linux-nslu2/drivers/Makefile 2006-01-08 18:55:19.000000000 +0100 @@ -54,6 +54,7 @@ obj-$(CONFIG_USB_GADGET) += usb/gadget/ obj-$(CONFIG_GAMEPORT) += input/gameport/ obj-$(CONFIG_INPUT) += input/ @@ -102,8 +102,8 @@ obj-$(CONFIG_W1) += w1/ obj-$(CONFIG_HWMON) += hwmon/ --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/class.c 2006-01-03 15:45:19.000000000 +0100 -@@ -0,0 +1,141 @@ ++++ linux-nslu2/drivers/rtc/class.c 2006-01-08 18:55:19.000000000 +0100 +@@ -0,0 +1,143 @@ +/* + * RTC subsystem, base class + * @@ -178,7 +178,7 @@ + rtc->class_dev.class = rtc_class; + rtc->class_dev.release = rtc_device_release; + -+ init_rwsem(&rtc->lock); ++ init_MUTEX(&rtc->ops_lock); + spin_lock_init(&rtc->irq_lock); + spin_lock_init(&rtc->irq_task_lock); + @@ -212,7 +212,9 @@ + */ +void rtc_device_unregister(struct rtc_device *rtc) +{ -+ down_write(&rtc->lock); ++ down(&rtc->ops_lock); ++ rtc->ops = NULL; ++ up(&rtc->ops_lock); + class_device_unregister(&rtc->class_dev); +} +EXPORT_SYMBOL_GPL(rtc_device_unregister); @@ -246,7 +248,7 @@ +MODULE_DESCRIPTION("RTC class support"); +MODULE_LICENSE("GPL"); --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/Kconfig 2006-01-04 01:27:21.000000000 +0100 ++++ linux-nslu2/drivers/rtc/Kconfig 2006-01-09 04:17:02.000000000 +0100 @@ -0,0 +1,93 @@ +# +# RTC class/drivers configuration @@ -342,7 +344,7 @@ + +endmenu --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/Makefile 2006-01-04 01:27:21.000000000 +0100 ++++ linux-nslu2/drivers/rtc/Makefile 2006-01-09 04:17:02.000000000 +0100 @@ -0,0 +1,15 @@ +# +# Makefile for RTC class/drivers. @@ -360,8 +362,8 @@ +obj-$(CONFIG_RTC_DRV_DS1672) += rtc-ds1672.o + --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/interface.c 2006-01-03 15:34:24.000000000 +0100 -@@ -0,0 +1,189 @@ ++++ linux-nslu2/drivers/rtc/interface.c 2006-01-09 03:39:33.000000000 +0100 +@@ -0,0 +1,232 @@ +/* + * RTC subsystem, interface functions + * @@ -381,13 +383,22 @@ + +int rtc_read_time(struct class_device *class_dev, struct rtc_time *tm) +{ -+ int err = -EINVAL; -+ struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops; ++ int err; ++ struct rtc_device *rtc = to_rtc_device(class_dev); ++ ++ if ((err = down_interruptible(&rtc->ops_lock))) ++ return err; + -+ if (ops->read_time) { ++ if (!rtc->ops) ++ err = -ENODEV; ++ else if (!rtc->ops->read_time) ++ err = -EINVAL; ++ else { + memset(tm, 0, sizeof(struct rtc_time)); -+ err = ops->read_time(class_dev->dev, tm); ++ err = rtc->ops->read_time(class_dev->dev, tm); + } ++ ++ up(&rtc->ops_lock); + return err; +} +EXPORT_SYMBOL(rtc_read_time); @@ -395,36 +406,64 @@ +int rtc_set_time(struct class_device *class_dev, struct rtc_time *tm) +{ + int err; -+ struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops; ++ struct rtc_device *rtc = to_rtc_device(class_dev); + -+ err = rtc_valid_tm(tm); -+ if (err == 0 && ops->set_time) -+ err = ops->set_time(class_dev->dev, tm); ++ if ((err = rtc_valid_tm(tm)) != 0) ++ return err; ++ ++ if ((err = down_interruptible(&rtc->ops_lock))) ++ return err; + ++ if (!rtc->ops) ++ err = -ENODEV; ++ else if (!rtc->ops->set_time) ++ err = -EINVAL; ++ else ++ err = rtc->ops->set_time(class_dev->dev, tm); ++ ++ up(&rtc->ops_lock); + return err; +} +EXPORT_SYMBOL(rtc_set_time); + +int rtc_read_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm) +{ -+ struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops; -+ int err = -EINVAL; ++ int err; ++ struct rtc_device *rtc = to_rtc_device(class_dev); ++ ++ if ((err = down_interruptible(&rtc->ops_lock))) ++ return err; + -+ if (ops->read_alarm) { ++ if (rtc->ops == NULL) ++ err = -ENODEV; ++ else if (!rtc->ops->read_alarm) ++ err = -EINVAL; ++ else { + memset(alarm, 0, sizeof(struct rtc_wkalrm)); -+ err = ops->read_alarm(class_dev->dev, alarm); ++ err = rtc->ops->read_alarm(class_dev->dev, alarm); + } ++ ++ up(&rtc->ops_lock); + return err; +} +EXPORT_SYMBOL(rtc_read_alarm); + +int rtc_set_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm) +{ -+ int err = -EINVAL; -+ struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops; ++ int err; ++ struct rtc_device *rtc = to_rtc_device(class_dev); + -+ if (ops->set_alarm) -+ err = ops->set_alarm(class_dev->dev, alarm); ++ if ((err = down_interruptible(&rtc->ops_lock))) ++ return err; ++ ++ if (!rtc->ops) ++ err = -ENODEV; ++ else if (!rtc->ops->set_alarm) ++ err = -EINVAL; ++ else ++ err = rtc->ops->set_alarm(class_dev->dev, alarm); ++ ++ up(&rtc->ops_lock); + return err; +} +EXPORT_SYMBOL(rtc_set_alarm); @@ -460,6 +499,11 @@ + break; + } + } ++ ++ if (class_dev) { ++ if (!try_module_get(to_rtc_device(class_dev)->owner)) ++ class_dev = NULL; ++ } + up(&rtc_class->sem); + + return class_dev; @@ -468,6 +512,7 @@ + +void rtc_close(struct class_device *class_dev) +{ ++ module_put(to_rtc_device(class_dev)->owner); +} +EXPORT_SYMBOL(rtc_close); + @@ -552,7 +597,7 @@ + +} --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/utils.c 2006-01-03 15:34:24.000000000 +0100 ++++ linux-nslu2/drivers/rtc/utils.c 2006-01-08 18:55:19.000000000 +0100 @@ -0,0 +1,97 @@ +/* + * RTC subsystem, utility functions @@ -651,8 +696,8 @@ + return 0; +} +EXPORT_SYMBOL(rtc_tm_to_time); ---- linux-nslu2.orig/arch/arm/Kconfig 2006-01-04 01:27:04.000000000 +0100 -+++ linux-nslu2/arch/arm/Kconfig 2006-01-04 01:27:31.000000000 +0100 +--- linux-nslu2.orig/arch/arm/Kconfig 2006-01-09 03:36:04.000000000 +0100 ++++ linux-nslu2/arch/arm/Kconfig 2006-01-09 03:39:50.000000000 +0100 @@ -748,6 +748,8 @@ source "drivers/usb/Kconfig" source "drivers/mmc/Kconfig" @@ -662,8 +707,8 @@ endmenu source "fs/Kconfig" ---- linux-nslu2.orig/arch/arm/common/rtctime.c 2006-01-04 01:27:04.000000000 +0100 -+++ linux-nslu2/arch/arm/common/rtctime.c 2006-01-04 01:27:09.000000000 +0100 +--- linux-nslu2.orig/arch/arm/common/rtctime.c 2006-01-09 03:36:04.000000000 +0100 ++++ linux-nslu2/arch/arm/common/rtctime.c 2006-01-09 03:39:50.000000000 +0100 @@ -40,89 +40,6 @@ static struct rtc_ops *rtc_ops; #define rtc_epoch 1900UL @@ -852,8 +897,8 @@ p += sprintf(p, "alrm_time\t: "); if ((unsigned int)alrm.time.tm_hour <= 24) p += sprintf(p, "%02d:", alrm.time.tm_hour); ---- linux-nslu2.orig/include/asm-arm/rtc.h 2006-01-04 01:27:04.000000000 +0100 -+++ linux-nslu2/include/asm-arm/rtc.h 2006-01-04 01:27:09.000000000 +0100 +--- linux-nslu2.orig/include/asm-arm/rtc.h 2006-01-09 03:36:04.000000000 +0100 ++++ linux-nslu2/include/asm-arm/rtc.h 2006-01-09 03:39:50.000000000 +0100 @@ -25,9 +25,6 @@ struct rtc_ops { int (*proc)(char *buf); }; @@ -865,8 +910,8 @@ void rtc_update(unsigned long, unsigned long); int register_rtc(struct rtc_ops *); --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-sysfs.c 2006-01-04 01:27:12.000000000 +0100 -@@ -0,0 +1,125 @@ ++++ linux-nslu2/drivers/rtc/rtc-sysfs.c 2006-01-09 03:39:50.000000000 +0100 +@@ -0,0 +1,128 @@ +/* + * RTC subsystem, sysfs interface + * @@ -891,58 +936,61 @@ + +static ssize_t rtc_sysfs_show_date(struct class_device *dev, char *buf) +{ -+ ssize_t retval = 0; ++ ssize_t retval = -ENODEV; + struct rtc_device *rtc = to_rtc_device(dev); + struct rtc_time tm; + -+ if (down_read_trylock(&rtc->lock) == 0) -+ return -ENODEV; ++ if ((retval = down_interruptible(&rtc->ops_lock))) ++ return retval; + -+ if (rtc_read_time(dev, &tm) == 0) { ++ if (rtc->ops && ((retval = rtc_read_time(dev, &tm)) == 0)) { + retval = sprintf(buf, "%04d-%02d-%02d\n", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday); + } + -+ up_read(&rtc->lock); ++ up(&rtc->ops_lock); ++ + return retval; +} +static CLASS_DEVICE_ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL); + +static ssize_t rtc_sysfs_show_time(struct class_device *dev, char *buf) +{ -+ ssize_t retval = 0; ++ ssize_t retval = -ENODEV; + struct rtc_device *rtc = to_rtc_device(dev); + struct rtc_time tm; + -+ if (down_read_trylock(&rtc->lock) == 0) -+ return -ENODEV; ++ if ((retval = down_interruptible(&rtc->ops_lock))) ++ return retval; + -+ if (rtc_read_time(dev, &tm) == 0) { ++ if (rtc->ops && ((retval = rtc_read_time(dev, &tm)) == 0)) { + retval = sprintf(buf, "%02d:%02d:%02d\n", + tm.tm_hour, tm.tm_min, tm.tm_sec); + } + -+ up_read(&rtc->lock); ++ up(&rtc->ops_lock); ++ + return retval; +} +static CLASS_DEVICE_ATTR(time, S_IRUGO, rtc_sysfs_show_time, NULL); + +static ssize_t rtc_sysfs_show_since_epoch(struct class_device *dev, char *buf) +{ -+ ssize_t retval = 0; ++ ssize_t retval = -ENODEV; + struct rtc_device *rtc = to_rtc_device(dev); + struct rtc_time tm; + -+ if (down_read_trylock(&rtc->lock) == 0) -+ return -ENODEV; ++ if ((retval = down_interruptible(&rtc->ops_lock))) ++ return retval; + -+ if (rtc_read_time(dev, &tm) == 0) { ++ if (rtc->ops && ((retval = rtc_read_time(dev, &tm)) == 0)) { + unsigned long time; + rtc_tm_to_time(&tm, &time); + retval = sprintf(buf, "%lu\n", time); + } + -+ up_read(&rtc->lock); ++ up(&rtc->ops_lock); ++ + return retval; +} +static CLASS_DEVICE_ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL); @@ -993,7 +1041,7 @@ +MODULE_DESCRIPTION("RTC class sysfs interface"); +MODULE_LICENSE("GPL"); --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-proc.c 2006-01-04 01:27:14.000000000 +0100 ++++ linux-nslu2/drivers/rtc/rtc-proc.c 2006-01-09 03:39:50.000000000 +0100 @@ -0,0 +1,158 @@ +/* + * RTC subsystem, proc interface @@ -1154,7 +1202,7 @@ +MODULE_DESCRIPTION("RTC class proc interface"); +MODULE_LICENSE("GPL"); --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-dev.c 2006-01-04 01:27:15.000000000 +0100 ++++ linux-nslu2/drivers/rtc/rtc-dev.c 2006-01-09 04:00:16.000000000 +0100 @@ -0,0 +1,372 @@ +/* + * RTC subsystem, dev interface @@ -1529,7 +1577,7 @@ +MODULE_DESCRIPTION("RTC class dev interface"); +MODULE_LICENSE("GPL"); --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-x1205.c 2006-01-04 01:27:17.000000000 +0100 ++++ linux-nslu2/drivers/rtc/rtc-x1205.c 2006-01-09 04:17:02.000000000 +0100 @@ -0,0 +1,725 @@ +/* + * An i2c driver for the Xicor/Intersil X1205 RTC @@ -1906,7 +1954,7 @@ + do_settimeofday(&tv); + + dev_info(&client->dev, -+ "setting the system clock to %d-%d-%d %d:%d:%d\n", ++ "setting the system clock to %02d-%02d-%d %02d:%02d:%02d\n", + tm.tm_year + 1900, tm.tm_mon + 1, + tm.tm_mday, tm.tm_hour, tm.tm_min, + tm.tm_sec); @@ -2257,8 +2305,8 @@ +module_init(x1205_init); +module_exit(x1205_exit); --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-test.c 2006-01-04 01:27:19.000000000 +0100 -@@ -0,0 +1,189 @@ ++++ linux-nslu2/drivers/rtc/rtc-test.c 2006-01-09 04:17:02.000000000 +0100 +@@ -0,0 +1,206 @@ +/* + * An RTC test device/driver + * Copyright (C) 2005 Tower Technologies @@ -2275,6 +2323,9 @@ +#include <linux/rtc.h> +#include <linux/platform_device.h> + ++struct platform_device *test0 = NULL, *test1 = NULL; ++ ++ +static int test_rtc_read_alarm(struct device *dev, + struct rtc_wkalrm *alrm) +{ @@ -2391,7 +2442,7 @@ + return 0; +} + -+static int test_remove(struct platform_device *plat_dev) ++static int __devexit test_remove(struct platform_device *plat_dev) +{ + struct rtc_device *rtc = platform_get_drvdata(plat_dev); + @@ -2401,25 +2452,9 @@ + return 0; +} + -+static void test_release(struct device * dev) -+{ -+} -+ -+struct platform_device test_dev_zero = { -+ .name = "rtc-test", -+ .id = 0, -+ .dev.release = test_release, -+}; -+ -+struct platform_device test_dev_one = { -+ .name = "rtc-test", -+ .id = 1, -+ .dev.release = test_release, -+}; -+ -+struct platform_driver test_drv = { ++static struct platform_driver test_drv = { + .probe = test_probe, -+ .remove = test_remove, ++ .remove = __devexit_p(test_remove), + .driver = { + .name = "rtc-test", + .owner = THIS_MODULE, @@ -2428,18 +2463,48 @@ + +static int __init test_init(void) +{ -+ platform_device_register(&test_dev_zero); -+ platform_device_register(&test_dev_one); -+ platform_driver_register(&test_drv); ++ int err; ++ ++ if ((err = platform_driver_register(&test_drv))) ++ return err; ++ ++ if ((test0 = platform_device_alloc("rtc-test", 0)) == NULL) { ++ err = -ENOMEM; ++ goto exit_driver_unregister; ++ } ++ ++ if ((test1 = platform_device_alloc("rtc-test", 1)) == NULL) { ++ err = -ENOMEM; ++ goto exit_free_test0; ++ } ++ ++ if ((err = platform_device_add(test0))) ++ goto exit_free_test1; ++ ++ if ((err = platform_device_add(test1))) ++ goto exit_device_unregister; + + return 0; ++ ++exit_device_unregister: ++ platform_device_unregister(test0); ++ ++exit_free_test1: ++ platform_device_put(test1); ++ ++exit_free_test0: ++ platform_device_put(test0); ++ ++exit_driver_unregister: ++ platform_driver_unregister(&test_drv); ++ return err; +} + +static void __exit test_exit(void) +{ ++ platform_device_unregister(test0); ++ platform_device_unregister(test1); + platform_driver_unregister(&test_drv); -+ platform_device_unregister(&test_dev_zero); -+ platform_device_unregister(&test_dev_one); +} + +MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); @@ -2449,8 +2514,8 @@ +module_init(test_init); +module_exit(test_exit); --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-ds1672.c 2006-01-04 01:27:21.000000000 +0100 -@@ -0,0 +1,266 @@ ++++ linux-nslu2/drivers/rtc/rtc-ds1672.c 2006-01-12 00:31:05.000000000 +0100 +@@ -0,0 +1,278 @@ +/* + * An rtc/i2c driver for the Dallas DS1672 + * Copyright 2005 Alessandro Zummo @@ -2465,7 +2530,7 @@ +#include <linux/i2c.h> +#include <linux/rtc.h> + -+#define DRV_VERSION "0.1" ++#define DRV_VERSION "0.2" + +/* Addresses to scan: none. This chip cannot be detected. */ +static unsigned short normal_i2c[] = { I2C_CLIENT_END }; @@ -2493,8 +2558,20 @@ +static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) +{ + unsigned long time; ++ unsigned char addr = DS1672_REG_CNT_BASE; + unsigned char buf[4]; + ++ struct i2c_msg msgs[] = { ++ { client->addr, 0, 1, &addr }, /* setup read ptr */ ++ { client->addr, I2C_M_RD, 4, buf }, /* read date */ ++ }; ++ ++ /* read date registers */ ++ if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { ++ dev_err(&client->dev, "%s: read error\n", __FUNCTION__); ++ return -EIO; ++ } ++ + dev_dbg(&client->dev, + "%s: raw read data - counters=%02x,%02x,%02x,%02x\n" + __FUNCTION__, diff --git a/packages/linux/ixp4xx-kernel/2.6.15/45-eeprom-notifier.patch b/packages/linux/ixp4xx-kernel/2.6.15/45-eeprom-notifier.patch new file mode 100644 index 0000000000..a3597a9c3f --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/45-eeprom-notifier.patch @@ -0,0 +1,184 @@ +Add EEPROM notifiers + +These help board level code by allowing a callback when EEPROMs are +loaded, this permits system level configuration to be loaded from the +EEPROM. This is particularly useful when the ethernet MAC ids are +stored in EEPROM and when the ethernet hardware is generic (so it +has no board level knowledge), then the MACs can be loaded into +the 'maclist' code and read out by the ethernet config. + +Signed-off-by: John Bowler <jbowler@acm.org> + +--- linux-2.6.15/drivers/i2c/chips/eeprom.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/drivers/i2c/chips/eeprom.c 1970-01-01 00:00:00.000000000 +0000 +@@ -25,7 +25,6 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +- + #include <linux/kernel.h> + #include <linux/init.h> + #include <linux/module.h> +@@ -33,6 +32,9 @@ + #include <linux/sched.h> + #include <linux/jiffies.h> + #include <linux/i2c.h> ++#include <linux/notifier.h> ++ ++#include <linux/eeprom.h> + + /* Addresses to scan */ + static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54, +@@ -41,6 +43,9 @@ static unsigned short normal_i2c[] = { 0 + /* Insmod parameters */ + I2C_CLIENT_INSMOD_1(eeprom); + ++/* Notifier list */ ++static DECLARE_MUTEX(eeprom_notifier_mutex); ++static LIST_HEAD(eeprom_notifiers); + + /* Size of EEPROM in bytes */ + #define EEPROM_SIZE 256 +@@ -160,6 +165,7 @@ static int eeprom_detect(struct i2c_adap + struct i2c_client *new_client; + struct eeprom_data *data; + int err = 0; ++ struct list_head *this; + + /* There are three ways we can read the EEPROM data: + (1) I2C block reads (faster, but unsupported by most adapters) +@@ -196,7 +202,7 @@ static int eeprom_detect(struct i2c_adap + + /* Detect the Vaio nature of EEPROMs. + We use the "PCG-" prefix as the signature. */ +- if (address == 0x57) { ++ if (list_empty(&eeprom_notifiers) && address == 0x57) { + if (i2c_smbus_read_byte_data(new_client, 0x80) == 'P' + && i2c_smbus_read_byte(new_client) == 'C' + && i2c_smbus_read_byte(new_client) == 'G' +@@ -210,6 +216,14 @@ static int eeprom_detect(struct i2c_adap + /* create the sysfs eeprom file */ + sysfs_create_bin_file(&new_client->dev.kobj, &eeprom_attr); + ++ /* Call each notifier callback */ ++ down(&eeprom_notifier_mutex); ++ list_for_each(this, &eeprom_notifiers) { ++ struct eeprom_notifier *not = list_entry(this, struct eeprom_notifier, list); ++ not->add(address, kind, &new_client->dev.kobj, &eeprom_attr); ++ } ++ up(&eeprom_notifier_mutex); ++ + return 0; + + exit_kfree: +@@ -231,6 +245,51 @@ static int eeprom_detach_client(struct i + return 0; + } + ++/** ++ * register_eeprom_user - register a 'user' of EEPROM devices. ++ * @new: pointer to notifier info structure ++ * ++ * Registers a callback function to be called upon detection ++ * of an EEPROM device. Detection invokes the 'add' callback ++ * with the kobj of the mutex and a bin_attribute which allows ++ * read from the EEPROM. The intention is that the notifier ++ * will be able to read system configuration from the notifier. ++ * ++ * Only EEPROMs detected *after* the addition of the notifier ++ * are notified. I.e. EEPROMs already known to the system ++ * will not be notified - add the notifier from board level ++ * code! ++ */ ++void register_eeprom_user (struct eeprom_notifier *new) ++{ ++ down(&eeprom_notifier_mutex); ++ ++ list_add(&new->list, &eeprom_notifiers); ++ ++ up(&eeprom_notifier_mutex); ++} ++ ++/** ++ * unregister_eeprom_user - unregister a 'user' of EEPROM devices. ++ * @old: pointer to notifier info structure ++ * ++ * Removes a callback function from the list of 'users' to be ++ * notified upon detection of EEPROM devices. ++ */ ++void unregister_eeprom_user (struct eeprom_notifier *old) ++{ ++ down(&eeprom_notifier_mutex); ++ ++ list_del(&old->list); ++ ++ up(&eeprom_notifier_mutex); ++} ++ ++ ++EXPORT_SYMBOL(register_eeprom_user); ++EXPORT_SYMBOL(unregister_eeprom_user); ++ ++ + static int __init eeprom_init(void) + { + return i2c_add_driver(&eeprom_driver); +--- linux-2.6.15/include/linux/eeprom.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/include/linux/eeprom.h 1970-01-01 00:00:00.000000000 +0000 +@@ -0,0 +1,56 @@ ++#ifndef _LINUX_EEPROM_H ++#define _LINUX_EEPROM_H ++/* ++ * $Id$ ++ * ++ * Copyright (C) 2006 John Bowler ++ */ ++ ++/* ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef __KERNEL__ ++#error This is a kernel header ++#endif ++ ++#include <linux/list.h> ++#include <linux/kobject.h> ++#include <linux/sysfs.h> ++ ++/* ++ * This is very basic. ++ * ++ * If an EEPROM is detected on the I2C bus (this only works for ++ * I2C EEPROMs) the eeprom_notifier::add method is called with ++ * both the I2C information and the kobject for the sysfs ++ * device which has been registers. It is then possible to ++ * read from the device via the bin_attribute::read method ++ * to extract configuration information. ++ * ++ * Register the notifier in the board level code, there is no ++ * need to unregister it but you can if you want (it will save ++ * a little bit or kernel memory to do so). ++ */ ++struct eeprom_notifier { ++ void (*add)(int address, int kind, struct kobject *kobj, ++ struct bin_attribute *eeprom_attr); ++ struct list_head list; ++}; ++ ++extern void register_eeprom_user (struct eeprom_notifier *new); ++extern void unregister_eeprom_user (struct eeprom_notifier *old); ++ ++#endif /* _LINUX_EEPROM_H */ diff --git a/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch b/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch index 7a5b2d51cb..a0921dffe5 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch @@ -8,9 +8,9 @@ +obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o nslu2-io.o obj-$(CONFIG_MACH_NAS100D) += nas100d-pci.o nas100d-setup.o nas100d-power.o ---- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-io.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-io.c 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,548 @@ +--- /dev/null 2005-12-25 02:27:49.000000000 +1030 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-io.c 2006-01-15 04:11:10.000000000 +1030 +@@ -0,0 +1,555 @@ +//============================================================================= +// +// n2-io.c version 0.1.7 @@ -48,6 +48,8 @@ +#include <asm-arm/irq.h> +#include <asm-arm/delay.h> + ++#include <asm/mach-types.h> ++ +/* Set this to 1 to output lots of debug messages. */ +#define NSLU2_IO_DEBUG 0 + @@ -505,6 +507,9 @@ + +static int __init n2iom_init(void) +{ ++ if (!machine_is_nslu2()) ++ return 0; ++ + printk(KERN_INFO "NSLU2: i/o, %s\n", VERSION); + + n2iom_initarch(); @@ -536,6 +541,8 @@ + +static void __exit n2iom_exit(void) +{ ++ if (!machine_is_nslu2()) ++ return 0; + +#ifndef CONFIG_LEDS + del_timer(&n2lm_rsg_timer); diff --git a/packages/linux/ixp4xx-kernel/2.6.15/81-nslu2-power.patch b/packages/linux/ixp4xx-kernel/2.6.15/81-nslu2-power.patch new file mode 100644 index 0000000000..ab8bdd8eae --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/81-nslu2-power.patch @@ -0,0 +1,12 @@ +--- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-power.c~ 2006-01-03 13:51:10.000000000 +1030 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-power.c 2006-01-15 03:57:59.000000000 +1030 +@@ -80,6 +80,9 @@ + + static void __exit nslu2_power_exit(void) + { ++ if (!(machine_is_nslu2())) ++ return 0; ++ + free_irq(NSLU2_RB_IRQ, NULL); + free_irq(NSLU2_PB_IRQ, NULL); + } diff --git a/packages/linux/ixp4xx-kernel/2.6.15/82-nas100d-power.patch b/packages/linux/ixp4xx-kernel/2.6.15/82-nas100d-power.patch new file mode 100644 index 0000000000..f02714beea --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/82-nas100d-power.patch @@ -0,0 +1,12 @@ +--- linux-2.6.15/arch/arm/mach-ixp4xx/nas100d-power.c~ 2006-01-15 00:22:38.000000000 +1030 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/nas100d-power.c 2006-01-15 03:58:13.000000000 +1030 +@@ -58,6 +58,9 @@ + + static void __exit nas100d_power_exit(void) + { ++ if (!(machine_is_nas100d())) ++ return 0; ++ + free_irq(NAS100D_RB_IRQ, NULL); + } + diff --git a/packages/linux/ixp4xx-kernel/2.6.15/93-loft-maclist.patch b/packages/linux/ixp4xx-kernel/2.6.15/93-loft-maclist.patch new file mode 100644 index 0000000000..ffda1136ef --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/93-loft-maclist.patch @@ -0,0 +1,96 @@ +add loft support for setting the maclist from EEPROM + +Signed-off-by: John Bowler <jbowler@acm.org> + +--- linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000 +@@ -14,6 +14,7 @@ + #include <linux/serial.h> + #include <linux/tty.h> + #include <linux/serial_8250.h> ++#include <linux/eeprom.h> + + #include <asm/types.h> + #include <asm/setup.h> +@@ -24,6 +25,8 @@ + #include <asm/mach/arch.h> + #include <asm/mach/flash.h> + ++#include <net/maclist.h> ++ + static struct flash_platform_data ixdp425_flash_data = { + .map_name = "cfi_probe", + .width = 2, +@@ -188,9 +191,62 @@ MACHINE_END + /* + * Loft is functionally equivalent to Avila except that it has a + * different number for the maximum PCI devices. The MACHINE +- * structure below is identical to Avila except for the comment. ++ * structure below is identical to Avila except for the and ++ * the use of a loft specific init. ++ * ++ * The loft init registers a notifier on the on-board EEPROM to ++ * detect the MAC addresses. ++ * NOTE: this probably works for all Gateworks Avila boards and ++ * maybe the ixdp425 too. + */ + #ifdef CONFIG_MACH_LOFT ++/* ++ * When the EEPROM is added the MAC address are read from it. ++ */ ++static void loft_eeprom_add(int address, int kind, struct kobject *kobj, ++ struct bin_attribute *eeprom_attr) { ++ /* The MACs are the first 12 bytes in the eeprom at address 0x51 */ ++ if (address == 0x51) { ++ ssize_t retlen; ++ char data[12]; ++ ++ /* Two Macs, one at 0, the other at 6, maclist_add will ++ * complain if the ID is not a valid MAC. ++ */ ++ retlen = eeprom_attr->read(kobj, data, 0, sizeof data); ++ if (retlen >= 6) { ++ u8 mac[6]; ++ memcpy(mac, data+0, sizeof mac); ++ printk(KERN_INFO "LOFT MAC[0]: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++ maclist_add(mac); ++ } ++ if (retlen >= 12) { ++ u8 mac[6]; ++ memcpy(mac, data+6, sizeof mac); ++ printk(KERN_INFO "LOFT MAC[1]: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++ maclist_add(mac); ++ } ++ } ++} ++ ++static struct eeprom_notifier loft_eeprom_notifier = { ++ .add = loft_eeprom_add ++}; ++ ++static void __init loft_init(void) ++{ ++ /* The EEPROM has two ethernet MACs embedded in it which we need, ++ * that is all this notifier does. ++ */ ++ register_eeprom_user(&loft_eeprom_notifier); ++ ++ ixp4xx_sys_init(); ++ ++ platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices)); ++} ++ + MACHINE_START(LOFT, "Giant Shoulder Inc Loft board") + /* Maintainer: Tom Billman <kernel@giantshoulderinc.com> */ + .phys_ram = PHYS_OFFSET, +@@ -200,7 +256,7 @@ MACHINE_START(LOFT, "Giant Shoulder Inc + .init_irq = ixp4xx_init_irq, + .timer = &ixp4xx_timer, + .boot_params = 0x0100, +- .init_machine = ixdp425_init, ++ .init_machine = loft_init, + MACHINE_END + #endif + diff --git a/packages/linux/ixp4xx-kernel/2.6.15/94-loft-setup.patch b/packages/linux/ixp4xx-kernel/2.6.15/94-loft-setup.patch new file mode 100644 index 0000000000..9114f3cddd --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/94-loft-setup.patch @@ -0,0 +1,87 @@ +Include a fixup machine start function in the loft part of +ixdp425-setup.c to handle the command line and memory setup +parameters which are not specifiable in the boot loader. + +Signed-off-by: John Bowler <jbowler@acm.org> + + +--- linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000 +@@ -191,8 +191,8 @@ MACHINE_END + /* + * Loft is functionally equivalent to Avila except that it has a + * different number for the maximum PCI devices. The MACHINE +- * structure below is identical to Avila except for the and +- * the use of a loft specific init. ++ * structure below is derived from the Avila one (and may, in ++ * fact, be useful on Avila in general). + * + * The loft init registers a notifier on the on-board EEPROM to + * detect the MAC addresses. +@@ -201,6 +201,58 @@ MACHINE_END + */ + #ifdef CONFIG_MACH_LOFT + /* ++ * Loft bootstrap may pass in parameters, if these contain an ++ * ATAG_MEM and it appears valid (not the 16MByte one in the ++ * setup/kernel.c default) we use it, otherwise a 64MByte ++ * setting is forced here, this may be overridden on the ++ * command line. ++ */ ++static void __init loft_fixup(struct machine_desc *desc, ++ struct tag *tags, char **cmdline, struct meminfo *mi) ++{ ++ char saved_command_line[COMMAND_LINE_SIZE]; ++ /* Put Loft specific known-required-for-certain stuff here, leave ++ * a trailing space! ++ */ ++ static char loft_command_line[] = ++ "root=/dev/mtdblock2 rw rootfstype=jffs2 init=/linuxrc " ++ "rtc-ds1672.probe=0,0x68 rtc-ds1672.hctosys=1 "; ++ const int len = (sizeof loft_command_line)-1; ++ int memtag = 0; ++ ++ /* The Loft typically has one bank of 64MByte memory. ++ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove ++ * the mem tags from the tag list, so if there is an entry ++ * there don't remove it! ++ */ ++ if (tags->hdr.tag == ATAG_CORE) do { ++ tags = tag_next(tags); ++ printk(KERN_NOTICE "ATAG[0x%x] size %d\n", tags->hdr.tag, tags->hdr.size); ++ if (tags->hdr.tag == ATAG_MEM && tags->hdr.size == tag_size(tag_mem32) && ++ (tags->u.mem.start != 0 || tags->u.mem.size != (16*1024*1024))) { ++ memtag = 1; ++ printk(KERN_NOTICE " ATAG_MEM base %lx size %lx\n", ++ tags->u.mem.start, tags->u.mem.size); ++ } ++ } while (tags->hdr.size); ++ ++ if (!memtag) { ++ mi->nr_banks=1; ++ mi->bank[0].start = 0; ++ mi->bank[0].size = (64*1024*1024); ++ mi->bank[0].node = PHYS_TO_NID(0); ++ } ++ ++ /* A command line in the ATAG list will override this one, ++ * as is intended. ++ */ ++ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE); ++ memcpy(*cmdline, loft_command_line, len); ++ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len); ++ *cmdline[COMMAND_LINE_SIZE-1] = 0; ++} ++ ++/* + * When the EEPROM is added the MAC address are read from it. + */ + static void loft_eeprom_add(int address, int kind, struct kobject *kobj, +@@ -252,6 +304,7 @@ MACHINE_START(LOFT, "Giant Shoulder Inc + .phys_ram = PHYS_OFFSET, + .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, + .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, ++ .fixup = loft_fixup, + .map_io = ixp4xx_map_io, + .init_irq = ixp4xx_init_irq, + .timer = &ixp4xx_timer, diff --git a/packages/linux/ixp4xx-kernel/2.6.15/94-nas100d-setup.patch b/packages/linux/ixp4xx-kernel/2.6.15/94-nas100d-setup.patch new file mode 100644 index 0000000000..bd766a3ccc --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/94-nas100d-setup.patch @@ -0,0 +1,67 @@ +Include a fixup machine start function in nas100d-setup.c to handle +the command line and memory setup parameters which are not specifiable +in the boot loader. + +Signed-off-by: John Bowler <jbowler@acm.org> + +--- linux-2.6.15/arch/arm/mach-ixp4xx/nas100d-setup.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/nas100d-setup.c 1970-01-01 00:00:00.000000000 +0000 +@@ -17,6 +17,8 @@ + #include <linux/serial_8250.h> + #include <linux/mtd/mtd.h> + ++#include <asm/setup.h> ++#include <asm/memory.h> + #include <asm/mach-types.h> + #include <asm/mach/arch.h> + #include <asm/mach/flash.h> +@@ -164,12 +166,49 @@ static void __init nas100d_init(void) + platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices)); + } + ++/* ++ * NAS100D bootstrap may pass in parameters, but we zap the mem ++ * settings to be safe (the box always has 64MByte at 0). The ++ * passed in command line can override this default, we prepend ++ * to the config'ed default. ++ */ ++static void __init nas100d_fixup(struct machine_desc *desc, ++ struct tag *tags, char **cmdline, struct meminfo *mi) ++{ ++ char saved_command_line[COMMAND_LINE_SIZE]; ++ /* Put NAS100D specific known-required-for-certain stuff here, leave ++ * a trailing space! ++ */ ++ static char nas100d_command_line[] = ++ "root=/dev/mtdblock2 rw rootfstype=jffs2 init=/linuxrc " ++ "pcf8563.hctosys=1 "; ++ const int len = (sizeof nas100d_command_line)-1; ++ ++ /* The NAS100D has one bank of 32MByte memory. ++ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove ++ * the mem tags from the tag list. We need do nothing here! ++ */ ++ mi->nr_banks=1; ++ mi->bank[0].start = 0; ++ mi->bank[0].size = (64*1024*1024); ++ mi->bank[0].node = PHYS_TO_NID(0); ++ ++ /* A command line in the ATAG list will override this one, ++ * as is intended. ++ */ ++ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE); ++ memcpy(*cmdline, nas100d_command_line, len); ++ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len); ++ *cmdline[COMMAND_LINE_SIZE-1] = 0; ++} ++ + MACHINE_START(NAS100D, "Iomega NAS 100d") + /* Maintainer: www.nslu2-linux.org */ + .phys_ram = PHYS_OFFSET, + .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, + .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, + .boot_params = 0x00000100, ++ .fixup = nas100d_fixup, + .map_io = ixp4xx_map_io, + .init_irq = ixp4xx_init_irq, + .timer = &ixp4xx_timer, diff --git a/packages/linux/ixp4xx-kernel/2.6.15/94-nslu2-setup.patch b/packages/linux/ixp4xx-kernel/2.6.15/94-nslu2-setup.patch new file mode 100644 index 0000000000..0ed39d9302 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/94-nslu2-setup.patch @@ -0,0 +1,71 @@ +Include a fixup machine start function in nslu2-setup.c to handle +the command line and memory setup parameters which are not specifiable +in the boot loader. + +Signed-off-by: John Bowler <jbowler@acm.org> + +--- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000 +@@ -18,6 +18,8 @@ + #include <linux/serial_8250.h> + #include <linux/mtd/mtd.h> + ++#include <asm/setup.h> ++#include <asm/memory.h> + #include <asm/mach-types.h> + #include <asm/mach/arch.h> + #include <asm/mach/flash.h> +@@ -165,12 +167,52 @@ static void __init nslu2_init(void) + platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); + } + ++/* ++ * NSLU2 RedBoot passes garbage atag/parameter values - i.e. r2 ++ * on entry is not useable - so we get to set the right values ++ * here... ++ */ ++static void __init nslu2_fixup(struct machine_desc *desc, ++ struct tag *tags, char **cmdline, struct meminfo *mi) ++{ ++ char saved_command_line[COMMAND_LINE_SIZE]; ++ /* Put NSLU2 specific known-required-for-certain stuff here, leave ++ * a trailing space! ++ */ ++ static char nslu2_command_line[] = ++ "root=/dev/mtdblock4 rw rootfstype=jffs2 init=/linuxrc " ++ "rtc-x1205.probe=0,0x6f rtc-x1205.hctosys=1 "; ++ const int len = (sizeof nslu2_command_line)-1; ++ ++ /* The NSLU2 has one bank of 32MByte memory. ++ * NOTE: this will totally destroy attempts to make fatslugs work, ++ * FATSLUG FATSLUG FATSLUG: please parameterise this! ++ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove ++ * the mem tags from the tag list. We need do nothing here! ++ */ ++ mi->nr_banks=1; ++ mi->bank[0].start = 0; ++ mi->bank[0].size = (32*1024*1024); ++ mi->bank[0].node = PHYS_TO_NID(0); ++ ++ /* The tag list is the one from kernel/setup.c, it has no ++ * command line, so we are free to make one up, do this by ++ * prepending to the default command line which has been ++ * passed in (so that can override if necessary). ++ */ ++ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE); ++ memcpy(*cmdline, nslu2_command_line, len); ++ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len); ++ *cmdline[COMMAND_LINE_SIZE-1] = 0; ++} ++ + MACHINE_START(NSLU2, "Linksys NSLU2") + /* Maintainer: www.nslu2-linux.org */ + .phys_ram = PHYS_OFFSET, + .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, + .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, +- .boot_params = 0x00000100, ++ .boot_params = 0, /* because they are garbage */ ++ .fixup = nslu2_fixup, + .map_io = ixp4xx_map_io, + .init_irq = ixp4xx_init_irq, + .timer = &ixp4xx_timer, diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.bb index 6da130772c..b4cde1bf41 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.bb @@ -8,7 +8,7 @@ PR_CONFIG = "1" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r5.${PR_CONFIG}" +PR = "r8.${PR_CONFIG}" include ixp4xx-kernel.inc @@ -17,8 +17,10 @@ IXP4XX_PATCHES = "" IXP4XX_PATCHES += "file://00-memory-h-page-shift.patch;patch=1" IXP4XX_PATCHES += "file://10-mtdpart-redboot-fis-byteswap.patch;patch=1" +IXP4XX_PATCHES += "file://11-mtdpart-redboot-config-byteswap.patch;patch=1" IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1" IXP4XX_PATCHES += "file://40-rtc-class.patch;patch=1" +IXP4XX_PATCHES += "file://45-eeprom-notifier.patch;patch=1" IXP4XX_PATCHES += "file://50-nas100d-arch.patch;patch=1" IXP4XX_PATCHES += "file://55-rtc-pcf8563.patch;patch=1" IXP4XX_PATCHES += "file://60-nas100d-i2c.patch;patch=1" @@ -28,7 +30,13 @@ IXP4XX_PATCHES += "file://60-nslu2-beeper.patch;patch=1" IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1" # IXP4XX_PATCHES += "file://75-nslu2-leds.patch;patch=1" IXP4XX_PATCHES += "file://80-nslu2-io.patch;patch=1" +IXP4XX_PATCHES += "file://81-nslu2-power.patch;patch=1" +IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1" IXP4XX_PATCHES += "file://85-timer.patch;patch=1" IXP4XX_PATCHES += "file://91-maclist.patch;patch=1" IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1" IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1" +IXP4XX_PATCHES += "file://93-loft-maclist.patch;patch=1" +IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1" +IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1" +IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1" diff --git a/packages/linux/nas100d-kernel.inc b/packages/linux/nas100d-kernel.inc deleted file mode 100644 index 69e9f4d285..0000000000 --- a/packages/linux/nas100d-kernel.inc +++ /dev/null @@ -1,243 +0,0 @@ -# nas100d-kernel.inc -# -# Standard definitions for any NAS 100d Linux kernel. -# Include this file in a .bb which specifies, at least, -# PN,PV,PR for the desired kernel -# -# Define the following *before* including this file as -# required: -# -# N1K_FILES - kernel-tree path of files to install -# N1K_PATCHES - full list of patches to apply -# -# N1K_SUFFIX - the suffix to add after 'zImage-' in the -# deploy/images directory - defaults to "ludeos" -# -# -------------------------------------------------------------- -# -# Within this file bitbake variables local to the file are -# named N1K_FOO -# -SECTION = "kernel" -DESCRIPTION = "Linux kernel for the Iomega NAS 100d device" -LICENSE = "GPL" -MAINTAINER = "John Bowler <jbowler@acm.org>" - -DEPENDS += "devio-native" - -# Linux kernel source has the general form linux-X.Y.Z-patchP, -# X.Y is the major version number, Z (which may have multiple -# parts) is a sub-version and 'patch' is something like 'mm' or -# 'ac' with a patch version. The original bz2 archive will be -# in a directory/file vX.Y/linux-X.Y.Z.tar.bz2. The unpacked -# source will be in the directory linux-X.Y.Z and this directory -# name corresponds to the module directory (in /lib/modules). -# -# The corresponding .bb file should be called: -# -# package_X.Y.Z-patchP -# -# Giving PN=package PV=X.Y.Z-patchP (and PR is set in the .bb -# file). Files, including the all important defconfig, are -# searched for in the following directories (last one first): -# -# ludeos-kernel-2.6.11.2 -# nas100d-kernel/files -# nas100d-kernel/X.Y -# nas100d-kernel/X.Y.Z -# nas100d-kernel/X.Y.Z-patch -# nas100d-kernel/X.Y.Z-patchP -# package-X.Y.Z-patchP -# -# This allows sharing of patch files and other useful source! -# To share a file or patch with an earlier version put it in -# the shared directory - e.g. to use foo.patch on 2.6.11.2 and -# 2.6.11.4 it should be in directory nas100d-kernel/2.6.11. -# -# Note that when there are multiple patches the X.Y.Z-patch form -# uses base-patch (e.g. 2.6.12-mm) whereas X.Y.Z-patchP has the -# full form, for example 2.6.12-rc3-mm1 (in the same case). - -#PN=package-name -#PV=package-version (full) - -# The patch has the general form (rcN|preN|acN|mmN|bkN)* with the -# separate patch items being separated by '-' characters. The -# rc patch is first and has the important property that it -# requires the *preceding* kernel base version and that this -# will be the source directory name. -python () { - # The patches list may be empty. This code starts with the base - # kernel version and steps through the patches. Because the rc and - # pre patches actually require the *preceding* kernel version the code - # fixes that up appropriately. - pv = bb.data.getVar("PV",d,1).split('-') - kernel = pv[0].split('.') - base = pv[0] - name = [base] - major = '.'.join(name[0].split('.')[0:2]) - minor = '.'.join(name[0].split('.')[0:3]) - patch_uri = [ None ] - filedir = "${FILE_DIRNAME}/nas100d-kernel/%s" - # This entry will become the last one (everything is inserted before it) - filepath = [ filedir % "files" ] - pref = 10 - mmac = 0 - for patch in pv[1:]: - name.append(patch) - pname = '-'.join(name) - if patch[0:2] == "rc" or patch[0:3] == "pre": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/v%s/testing/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname)) - kernel[-1] = str(int(kernel[-1]) - 1) - if patch[0:2] == "rc" and pref == 10: - pref = 6 - filepath[0:0] = [ filedir % name[0] ] - filepath[0:0] = [ filedir % (name[0] + "-rc") ] - else: - pref = 2 - elif patch[0:2] == "bk" or patch[0:3] == "git": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/v%s/snapshots/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname)) - pref = 2 - elif patch[0:2] == "ac": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/people/alan/linux-%s/%s/patch-%s" % (major, base, pname)) - mmac = 2 - filepath[0:0] = [ filedir % (name[0] + "-ac") ] - elif patch[0:2] == "mm": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/%s/%s/%s/%s.bz2;patch=1;pname=%s" % (major, base, pname, pname, pname)) - mmac = 2 - filepath[0:0] = [ filedir % (name[0] + "-mm") ] - else: - raise bb.build.FuncFailed("nas100d-kernel: patch %s not recognized in %s" % (patch, '-'.join(pv))) - filepath[0:0] = [ filedir % pname ] - base = pname - - base = '.'.join(kernel) - patch_uri[0] = "ftp://ftp.kernel.org/pub/linux/kernel/v%s/linux-%s.tar.bz2" % (major, base) - filepath[-1:-1] = [ filedir % base ] - if base != minor: - filepath[-1:-1] = [ filedir % minor ] - filepath[-1:-1] = [ filedir % major ] - - bb.data.setVar("N1K_SRCMAJ", major, d) - # bb.note("N1K_SRCMAJ := %s" % major) - bb.data.setVar("N1K_SRCVER", base, d) - # bb.note("N1K_SRCVER := %s" % base) - bb.data.setVar("N1K_SRCURI", ' '.join(patch_uri), d) - # bb.note("N1K_SRCURI := %s" % ' '.join(patch_uri)) - bb.data.setVar("N1K_FILESPATH", ':'.join(filepath), d) - # bb.note("N1K_FILESPATH := %s" % ' '.join(filepath)) - bb.data.setVar("DEFAULT_PREFERENCE", pref-mmac, d) - # bb.note("DEFAULT_PREFERENCE := %s" % (pref-mmac)) -} - -# FILESPATH: this list is in order last-searched-first, therefore -# the first entry is the *latest* and/or most specific -FILESPATH = "${N1K_FILESPATH}:${FILE_DIRNAME}/nas100d-kernel/" - -# The working directory will be the 'base' version (which may not be the -# same as implied by the PV variable because it corresponds to the prior -# minor version for rc and pre patched versions). -S = "${WORKDIR}/linux-${N1K_SRCVER}" - -# N1K_FILES is a list of additional files added to the source, these are -# put in place before the patches, so may themselves be patched. The list -# gives the path name relative to the base of the kernel source tree, the -# base file name is used to *find* the file. -N1K_FILES ?= "" - -N1K_SRCFILES = "${@( ' '.join([ ("file://" + n2k_file.split('/')[-1]) for n2k_file in bb.data.getVar("N1K_FILES",d,1).split(None) ]) )}" - -# N1K_PATCHES is a list of additional patches, the list specified -# here comes from the ludeos-2.6.11.2 kernel, typically extra -# patches will be required and very often patches will need to -# be removed (i.e. the default is typically not very useful!) -N1K_PATCHES ?= "" - -N1K_SUFFIX ?= "ludeos" - -SRC_URI = "${N1K_SRCURI}" -SRC_URI += "${N1K_SRCFILES}" -SRC_URI += "${N1K_PATCHES}" -SRC_URI += "file://defconfig" - -COMPATIBLE_HOST = 'arm.*-linux' - -inherit kernel - -ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" -# To specify the console set KERNEL_CONSOLE in the .bb file. -# CMDLINE_ROOT contains the boot options, CMDLINE_KERNEL_OPTIONS -# contains the things for a specific kernel. -# CMDLINE_KERNEL_OPTIONS ?= "reboot=s" -CMDLINE_KERNEL_OPTIONS ?= -CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc" -CMDLINE_DEBUG = -CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_KERNEL_OPTIONS} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}" - -# Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as -# required. Notice that this has to be done for each separately built -# module as well! -KERNEL_CC += "${TARGET_CC_KERNEL_ARCH}" -KERNEL_LD += "${TARGET_LD_KERNEL_ARCH}" - -# Set EXTRAVERSION and LOCALVERSION to "" so that the kernel version -# remains pinned to the x.y.z form, also turn off the directory -# printing which provides almost all the output of an incremental build. -EXTRA_OEMAKE += "EXTRAVERSION=" -EXTRA_OEMAKE += "LOCALVERSION=" -EXTRA_OEMAKE += "MAKEFLAGS='--no-print-directory'" - -# Override KERNEL_RELEASE from kernel.bbclass to match: -KERNEL_RELEASE = "${KERNEL_VERSION}" - -# By putting the added files in place in a separate task before -# do_patch it becomes possible to patch these files. -do_unpacklocal() { - for f in ${N1K_FILES} - do - s="$(basename "$f")" - install -m 0644 "${WORKDIR}/$s" "${S}/$f" - done -} - -addtask unpacklocal before do_patch after do_unpack - -do_configure_prepend() { - rm -f ${S}/.config - echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' - if test '${ARCH_BYTE_SEX}' = be - then - echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' - fi - if test '${SLUGOS_IMAGESEX}' = big-endian - then - echo 'CONFIG_JFFS2_BIG_ENDIAN=y' >>'${S}/.config' - fi - if test '${SLUGOS_IMAGESEX}' = little-endian - then - echo 'CONFIG_JFFS2_LITTLE_ENDIAN=y' >>'${S}/.config' - fi - sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' \ - -e '/CONFIG_JFFS2_NATIVE_ENDIAN=/d' \ - -e '/CONFIG_JFFS2_BIG_ENDIAN=/d' \ - -e '/CONFIG_JFFS2_LITTLE_ENDIAN=/d' \ - '${WORKDIR}/defconfig' >>'${S}/.config' - rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \ - ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch -} - -do_deploy[dirs] = "${S}" -do_deploy() { - install -d ${DEPLOY_DIR}/images - install -m 644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${N1K_SUFFIX} -} - -addtask deploy before do_build after do_compile - -python () { - # Don't build the kernel unless we're targeting an nas100d - mach = bb.data.getVar("MACHINE", d, 1) - if mach != 'nas100d': - raise bb.parse.SkipPackage("LudeOS only builds for the Iomega NAS 100d") -} diff --git a/packages/linux/nas100d-kernel/2.6.15/.mtn2git_empty b/packages/linux/nas100d-kernel/2.6.15/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/.mtn2git_empty +++ /dev/null diff --git a/packages/linux/nas100d-kernel/2.6.15/00-memory-h-page-shift.patch b/packages/linux/nas100d-kernel/2.6.15/00-memory-h-page-shift.patch deleted file mode 100644 index 30d34952d5..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/00-memory-h-page-shift.patch +++ /dev/null @@ -1,91 +0,0 @@ -http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=3218/1 - -PAGE_SHIFT is undeclared in include/asm-arm/arch-ixp4xx/memory.h, identified by the following kernel compilation error: - -CC [M] sound/core/memory.o -In file included from include/asm/memory.h:27, -from include/asm/io.h:28, -from sound/core/memory.c:24: -include/asm/arch/memory.h: In function `__arch_adjust_zones': -include/asm/arch/memory.h:28: error: `PAGE_SHIFT' undeclared (first use -in this function) - -This patch replaces my previous attempt at fixing this problem (Patch 3214/1) and is based on the following feedback: - -Russell King wrote: -> The error you see came up on SA1100. The best solution was to move -> the __arch_adjust_zones() function out of line. I suggest ixp4xx -> does the same. - -I have moved the function out of line into arch/arm/mach-ixp4xx/common-pci.c as suggested. - -Signed-off-by: Rod Whitby <rod@whitby.id.au> - ---- linux-2.6.15-rc7/include/asm-arm/arch-ixp4xx/memory.h~ 2005-12-30 05:18:27.000000000 +1030 -+++ linux-2.6.15-rc7/include/asm-arm/arch-ixp4xx/memory.h 2005-12-30 05:36:04.000000000 +1030 -@@ -16,31 +16,10 @@ - - #ifndef __ASSEMBLY__ - --/* -- * Only first 64MB of memory can be accessed via PCI. -- * We use GFP_DMA to allocate safe buffers to do map/unmap. -- * This is really ugly and we need a better way of specifying -- * DMA-capable regions of memory. -- */ --static inline void __arch_adjust_zones(int node, unsigned long *zone_size, -- unsigned long *zhole_size) --{ -- unsigned int sz = SZ_64M >> PAGE_SHIFT; -- -- /* -- * Only adjust if > 64M on current system -- */ -- if (node || (zone_size[0] <= sz)) -- return; -- -- zone_size[1] = zone_size[0] - sz; -- zone_size[0] = sz; -- zhole_size[1] = zhole_size[0]; -- zhole_size[0] = 0; --} -+void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes); - - #define arch_adjust_zones(node, size, holes) \ -- __arch_adjust_zones(node, size, holes) -+ ixp4xx_adjust_zones(node, size, holes) - - #define ISA_DMA_THRESHOLD (SZ_64M - 1) - ---- linux-2.6.15-rc7/arch/arm/mach-ixp4xx/common-pci.c~ 2005-12-30 05:16:03.000000000 +1030 -+++ linux-2.6.15-rc7/arch/arm/mach-ixp4xx/common-pci.c 2005-12-30 05:43:55.000000000 +1030 -@@ -341,6 +341,29 @@ int dma_needs_bounce(struct device *dev, - return (dev->bus == &pci_bus_type ) && ((dma_addr + size) >= SZ_64M); - } - -+/* -+ * Only first 64MB of memory can be accessed via PCI. -+ * We use GFP_DMA to allocate safe buffers to do map/unmap. -+ * This is really ugly and we need a better way of specifying -+ * DMA-capable regions of memory. -+ */ -+void __init ixp4xx_adjust_zones(int node, unsigned long *zone_size, -+ unsigned long *zhole_size) -+{ -+ unsigned int sz = SZ_64M >> PAGE_SHIFT; -+ -+ /* -+ * Only adjust if > 64M on current system -+ */ -+ if (node || (zone_size[0] <= sz)) -+ return; -+ -+ zone_size[1] = zone_size[0] - sz; -+ zone_size[0] = sz; -+ zhole_size[1] = zhole_size[0]; -+ zhole_size[0] = 0; -+} -+ - void __init ixp4xx_pci_preinit(void) - { - unsigned long processor_id; diff --git a/packages/linux/nas100d-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch b/packages/linux/nas100d-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch deleted file mode 100644 index 3fa0535abf..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch +++ /dev/null @@ -1,70 +0,0 @@ -drivers/mtd/redboot.c: recognise a foreign byte sex partition table - -The RedBoot boot loader writes flash partition tables containing native -byte sex 32 bit values. When booting an opposite byte sex kernel (e.g. an -LE kernel from BE RedBoot) the current MTD driver fails to handle the -partition table and therefore is unable to generate the correct partition -map for the flash. - -The patch recognises that the FIS directory (the partition table) is -byte-reversed by examining the partition table size, which is known to be -one erase block (this is an assumption made elsewhere in redboot.c). If -the size matches the erase block after byte swapping the value then -byte-reversal is assumed, if not no further action is taken. The patched -code is fail safe; should redboot.c be changed to support a partition table -with a modified size field the test will fail and the partition table will -be assumed to have the host byte sex. - -If byte-reversal is detected the patch byte swaps the remainder of the 32 -bit fields in the copy of the table; this copy is then used to set up the -MTD partition map. - -Signed-off-by: John Bowler <jbowler@acm.org> -Signed-off-by: Andrew Morton <akpm@osdl.org> -Modified slightly and -Signed-off-by: David Woodhouse <dwmw2@infradead.org> - -Index: drivers/mtd/redboot.c -=================================================================== -RCS file: /home/cvs/mtd/drivers/mtd/redboot.c,v -retrieving revision 1.18 -retrieving revision 1.19 -diff -u -p -r1.18 -r1.19 ---- linux-2.6.15/drivers/mtd/redboot.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/drivers/mtd/redboot.c 1970-01-01 00:00:00.000000000 +0000 -@@ -89,8 +89,32 @@ static int parse_redboot_partitions(stru - i = numslots; - break; - } -- if (!memcmp(buf[i].name, "FIS directory", 14)) -+ if (!memcmp(buf[i].name, "FIS directory", 14)) { -+ /* This is apparently the FIS directory entry for the -+ * FIS directory itself. The FIS directory size is -+ * one erase block; if the buf[i].size field is -+ * swab32(erasesize) then we know we are looking at -+ * a byte swapped FIS directory - swap all the entries! -+ * (NOTE: this is 'size' not 'data_length'; size is -+ * the full size of the entry.) -+ */ -+ if (swab32(buf[i].size) == master->erasesize) { -+ int j; -+ for (j = 0; j < numslots && buf[j].name[0] != 0xff; ++j) { -+ /* The unsigned long fields were written with the -+ * wrong byte sex, name and pad have no byte sex. -+ */ -+ swab32s(&buf[j].flash_base); -+ swab32s(&buf[j].mem_base); -+ swab32s(&buf[j].size); -+ swab32s(&buf[j].entry_point); -+ swab32s(&buf[j].data_length); -+ swab32s(&buf[j].desc_cksum); -+ swab32s(&buf[j].file_cksum); -+ } -+ } - break; -+ } - } - if (i == numslots) { - /* Didn't find it */ - - diff --git a/packages/linux/nas100d-kernel/2.6.15/15-jffs2-endian-config.patch b/packages/linux/nas100d-kernel/2.6.15/15-jffs2-endian-config.patch deleted file mode 100644 index fdebb652a7..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/15-jffs2-endian-config.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- linux-2.6.15/fs/Kconfig~ 2006-01-03 13:51:10.000000000 +1030 -+++ linux-2.6.15/fs/Kconfig 2006-01-05 01:35:36.000000000 +1030 -@@ -1132,6 +1132,31 @@ config JFFS2_CMODE_SIZE - - endchoice - -+choice -+ prompt "JFFS2 endianness" -+ default JFFS2_NATIVE_ENDIAN -+ depends on JFFS2_FS -+ help -+ You can set here the default endianness of JFFS2 from -+ the available options. Don't touch if unsure. -+ -+config JFFS2_NATIVE_ENDIAN -+ bool "native endian" -+ help -+ Uses a native endian bytestream. -+ -+config JFFS2_BIG_ENDIAN -+ bool "big endian" -+ help -+ Uses a big endian bytestream. -+ -+config JFFS2_LITTLE_ENDIAN -+ bool "little endian" -+ help -+ Uses a little endian bytestream. -+ -+endchoice -+ - config CRAMFS - tristate "Compressed ROM file system support (cramfs)" - select ZLIB_INFLATE ---- linux-2.6.15/fs/jffs2/nodelist.h~ 2006-01-05 01:37:06.000000000 +1030 -+++ linux-2.6.15/fs/jffs2/nodelist.h 2006-01-05 01:37:54.000000000 +1030 -@@ -29,12 +29,10 @@ - #include "os-linux.h" - #endif - --#define JFFS2_NATIVE_ENDIAN -- - /* Note we handle mode bits conversion from JFFS2 (i.e. Linux) to/from - whatever OS we're actually running on here too. */ - --#if defined(JFFS2_NATIVE_ENDIAN) -+#if defined(CONFIG_JFFS2_NATIVE_ENDIAN) - #define cpu_to_je16(x) ((jint16_t){x}) - #define cpu_to_je32(x) ((jint32_t){x}) - #define cpu_to_jemode(x) ((jmode_t){os_to_jffs2_mode(x)}) -@@ -42,7 +40,7 @@ - #define je16_to_cpu(x) ((x).v16) - #define je32_to_cpu(x) ((x).v32) - #define jemode_to_cpu(x) (jffs2_to_os_mode((x).m)) --#elif defined(JFFS2_BIG_ENDIAN) -+#elif defined(CONFIG_JFFS2_BIG_ENDIAN) - #define cpu_to_je16(x) ((jint16_t){cpu_to_be16(x)}) - #define cpu_to_je32(x) ((jint32_t){cpu_to_be32(x)}) - #define cpu_to_jemode(x) ((jmode_t){cpu_to_be32(os_to_jffs2_mode(x))}) -@@ -50,7 +48,7 @@ - #define je16_to_cpu(x) (be16_to_cpu(x.v16)) - #define je32_to_cpu(x) (be32_to_cpu(x.v32)) - #define jemode_to_cpu(x) (be32_to_cpu(jffs2_to_os_mode((x).m))) --#elif defined(JFFS2_LITTLE_ENDIAN) -+#elif defined(CONFIG_JFFS2_LITTLE_ENDIAN) - #define cpu_to_je16(x) ((jint16_t){cpu_to_le16(x)}) - #define cpu_to_je32(x) ((jint32_t){cpu_to_le32(x)}) - #define cpu_to_jemode(x) ((jmode_t){cpu_to_le32(os_to_jffs2_mode(x))}) diff --git a/packages/linux/nas100d-kernel/2.6.15/40-rtc-class.patch b/packages/linux/nas100d-kernel/2.6.15/40-rtc-class.patch deleted file mode 100644 index feea3f2f8b..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/40-rtc-class.patch +++ /dev/null @@ -1,2719 +0,0 @@ ---- linux-nslu2.orig/include/linux/rtc.h 2006-01-03 15:31:18.000000000 +0100 -+++ linux-nslu2/include/linux/rtc.h 2006-01-03 15:34:24.000000000 +0100 -@@ -91,8 +91,81 @@ struct rtc_pll_info { - #define RTC_PLL_GET _IOR('p', 0x11, struct rtc_pll_info) /* Get PLL correction */ - #define RTC_PLL_SET _IOW('p', 0x12, struct rtc_pll_info) /* Set PLL correction */ - -+/* interrupt flags */ -+#define RTC_IRQF 0x80 /* any of the following is active */ -+#define RTC_PF 0x40 -+#define RTC_AF 0x20 -+#define RTC_UF 0x10 -+ - #ifdef __KERNEL__ - -+#include <linux/device.h> -+#include <linux/seq_file.h> -+#include <linux/cdev.h> -+#include <linux/poll.h> -+ -+struct rtc_class_ops { -+ int (*open)(struct device *); -+ void (*release)(struct device *); -+ int (*ioctl)(struct device *, unsigned int, unsigned long); -+ int (*read_time)(struct device *, struct rtc_time *); -+ int (*set_time)(struct device *, struct rtc_time *); -+ int (*read_alarm)(struct device *, struct rtc_wkalrm *); -+ int (*set_alarm)(struct device *, struct rtc_wkalrm *); -+ int (*proc)(struct device *, struct seq_file *); -+ int (*set_mmss)(struct device *, unsigned long secs); -+ int (*irq_set_state)(struct device *, int enabled); -+ int (*irq_set_freq)(struct device *, int freq); -+}; -+ -+#define RTC_DEVICE_NAME_SIZE 20 -+struct rtc_task; -+ -+struct rtc_device -+{ -+ int id; -+ struct module *owner; -+ struct rw_semaphore lock; -+ struct class_device class_dev; -+ struct rtc_class_ops *ops; -+ char name[RTC_DEVICE_NAME_SIZE]; -+ -+ struct cdev char_dev; -+ struct semaphore char_sem; -+ -+ unsigned long irq_data; -+ spinlock_t irq_lock; -+ wait_queue_head_t irq_queue; -+ struct fasync_struct *async_queue; -+ -+ spinlock_t irq_task_lock; -+ struct rtc_task *irq_task; -+ int irq_freq; -+}; -+#define to_rtc_device(d) container_of(d, struct rtc_device, class_dev) -+ -+extern struct rtc_device *rtc_device_register(char *name, -+ struct device *dev, -+ struct rtc_class_ops *ops, -+ struct module *owner); -+extern void rtc_device_unregister(struct rtc_device *rdev); -+extern int rtc_interface_register(struct class_interface *intf); -+ -+ -+extern int rtc_month_days(unsigned int month, unsigned int year); -+extern int rtc_valid_tm(struct rtc_time *tm); -+extern int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time); -+extern void rtc_time_to_tm(unsigned long time, struct rtc_time *tm); -+ -+extern int rtc_read_time(struct class_device *class_dev, struct rtc_time *tm); -+extern int rtc_set_time(struct class_device *class_dev, struct rtc_time *tm); -+extern int rtc_read_alarm(struct class_device *class_dev, -+ struct rtc_wkalrm *alrm); -+extern int rtc_set_alarm(struct class_device *class_dev, -+ struct rtc_wkalrm *alrm); -+extern void rtc_update_irq(struct class_device *class_dev, -+ unsigned long num, unsigned long events); -+ - typedef struct rtc_task { - void (*func)(void *private_data); - void *private_data; ---- linux-nslu2.orig/drivers/Kconfig 2006-01-03 15:31:19.000000000 +0100 -+++ linux-nslu2/drivers/Kconfig 2006-01-04 01:27:31.000000000 +0100 -@@ -66,4 +66,6 @@ source "drivers/infiniband/Kconfig" - - source "drivers/sn/Kconfig" - -+source "drivers/rtc/Kconfig" -+ - endmenu ---- linux-nslu2.orig/drivers/Makefile 2006-01-03 15:33:32.000000000 +0100 -+++ linux-nslu2/drivers/Makefile 2006-01-04 01:27:31.000000000 +0100 -@@ -54,6 +54,7 @@ obj-$(CONFIG_USB_GADGET) += usb/gadget/ - obj-$(CONFIG_GAMEPORT) += input/gameport/ - obj-$(CONFIG_INPUT) += input/ - obj-$(CONFIG_I2O) += message/ -+obj-y += rtc/ - obj-$(CONFIG_I2C) += i2c/ - obj-$(CONFIG_W1) += w1/ - obj-$(CONFIG_HWMON) += hwmon/ ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/class.c 2006-01-03 15:45:19.000000000 +0100 -@@ -0,0 +1,141 @@ -+/* -+ * RTC subsystem, base class -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * -+ * class skeleton from drivers/hwmon/hwmon.c -+ * -+ * 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; version 2 of the License. -+*/ -+ -+#include <linux/module.h> -+#include <linux/rtc.h> -+#include <linux/kdev_t.h> -+#include <linux/idr.h> -+ -+static DEFINE_IDR(rtc_idr); -+static DECLARE_MUTEX(idr_lock); -+struct class *rtc_class; -+ -+static void rtc_device_release(struct class_device *class_dev) -+{ -+ struct rtc_device *rtc = to_rtc_device(class_dev); -+ down(&idr_lock); -+ idr_remove(&rtc_idr, rtc->id); -+ up(&idr_lock); -+ kfree(rtc); -+} -+ -+/** -+ * rtc_device_register - register w/ RTC class -+ * @dev: the device to register -+ * -+ * rtc_device_unregister() must be called when the class device is no -+ * longer needed. -+ * -+ * Returns the pointer to the new struct class device. -+ */ -+struct rtc_device *rtc_device_register(char *name, struct device *dev, -+ struct rtc_class_ops *ops, -+ struct module *owner) -+{ -+ struct rtc_device *rtc; -+ int id, err; -+ -+ if (idr_pre_get(&rtc_idr, GFP_KERNEL) == 0) { -+ err = -ENOMEM; -+ goto exit; -+ } -+ -+ -+ down(&idr_lock); -+ err = idr_get_new(&rtc_idr, NULL, &id); -+ up(&idr_lock); -+ -+ if (err < 0) -+ goto exit; -+ -+ id = id & MAX_ID_MASK; -+ -+ if ((rtc = kzalloc(sizeof(struct rtc_device), GFP_KERNEL)) == NULL) { -+ err = -ENOMEM; -+ goto exit_idr; -+ } -+ -+ rtc->id = id; -+ rtc->ops = ops; -+ rtc->owner = owner; -+ rtc->class_dev.dev = dev; -+ rtc->class_dev.class = rtc_class; -+ rtc->class_dev.release = rtc_device_release; -+ -+ init_rwsem(&rtc->lock); -+ spin_lock_init(&rtc->irq_lock); -+ spin_lock_init(&rtc->irq_task_lock); -+ -+ strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE); -+ snprintf(rtc->class_dev.class_id, BUS_ID_SIZE, "rtc%d", id); -+ -+ if ((err = class_device_register(&rtc->class_dev))) -+ goto exit_kfree; -+ -+ dev_info(dev, "rtc core: registered %s as %s\n", -+ rtc->name, rtc->class_dev.class_id); -+ -+ return rtc; -+ -+exit_kfree: -+ kfree(rtc); -+ -+exit_idr: -+ idr_remove(&rtc_idr, id); -+ -+exit: -+ return ERR_PTR(err); -+} -+EXPORT_SYMBOL_GPL(rtc_device_register); -+ -+ -+/** -+ * rtc_device_unregister - removes the previously registered RTC class device -+ * -+ * @rtc: the RTC class device to destroy -+ */ -+void rtc_device_unregister(struct rtc_device *rtc) -+{ -+ down_write(&rtc->lock); -+ class_device_unregister(&rtc->class_dev); -+} -+EXPORT_SYMBOL_GPL(rtc_device_unregister); -+ -+int rtc_interface_register(struct class_interface *intf) -+{ -+ intf->class = rtc_class; -+ return class_interface_register(intf); -+} -+EXPORT_SYMBOL_GPL(rtc_interface_register); -+ -+static int __init rtc_init(void) -+{ -+ rtc_class = class_create(THIS_MODULE, "rtc"); -+ if (IS_ERR(rtc_class)) { -+ printk(KERN_ERR "%s: couldn't create class\n", __FILE__); -+ return PTR_ERR(rtc_class); -+ } -+ return 0; -+} -+ -+static void __exit rtc_exit(void) -+{ -+ class_destroy(rtc_class); -+} -+ -+module_init(rtc_init); -+module_exit(rtc_exit); -+ -+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towerteh.it>"); -+MODULE_DESCRIPTION("RTC class support"); -+MODULE_LICENSE("GPL"); ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/Kconfig 2006-01-04 01:27:21.000000000 +0100 -@@ -0,0 +1,93 @@ -+# -+# RTC class/drivers configuration -+# -+ -+menu "Real Time Clock" -+ -+config RTC_CLASS -+ tristate "RTC class" -+ depends on EXPERIMENTAL -+ default y -+ help -+ Generic RTC class support. If you say yes here, you will -+ be allowed to plug one or more RTCs to your system. You will -+ probably want to enable one of more of the interfaces below. -+ -+ This driver can also be built as a module. If so, the module -+ will be called rtc-class. -+ -+comment "RTC interfaces" -+ depends on RTC_CLASS -+ -+config RTC_INTF_SYSFS -+ tristate "sysfs" -+ depends on RTC_CLASS && SYSFS -+ default RTC_CLASS -+ help -+ Say yes here if you want to use your RTC using the sysfs -+ interface, /sys/class/rtc/rtcX . -+ -+ This driver can also be built as a module. If so, the module -+ will be called rtc-sysfs. -+ -+config RTC_INTF_PROC -+ tristate "proc" -+ depends on RTC_CLASS && PROC_FS -+ default RTC_CLASS -+ help -+ Say yes here if you want to use your RTC using the proc -+ interface, /proc/driver/rtc . -+ -+ This driver can also be built as a module. If so, the module -+ will be called rtc-proc. -+ -+config RTC_INTF_DEV -+ tristate "dev" -+ depends on RTC_CLASS -+ default RTC_CLASS -+ help -+ Say yes here if you want to use your RTC using the dev -+ interface, /dev/rtc . -+ -+ This driver can also be built as a module. If so, the module -+ will be called rtc-dev. -+ -+comment "RTC drivers" -+ depends on RTC_CLASS -+ -+config RTC_DRV_X1205 -+ tristate "Xicor/Intersil X1205 RTC chip" -+ depends on RTC_CLASS && I2C -+ help -+ If you say yes here you get support for the -+ Xicor/Intersil X1205 RTC chip. -+ -+ This driver can also be built as a module. If so, the module -+ will be called rtc-x1205. -+ -+config RTC_DRV_DS1672 -+ tristate "Dallas/Maxim DS1672" -+ depends on RTC_CLASS && I2C -+ help -+ If you say yes here you get support for the -+ Dallas/Maxim DS1672 timekeeping chip. -+ -+ This driver can also be built as a module. If so, the module -+ will be called rtc-ds1672. -+ -+config RTC_DRV_TEST -+ tristate "Test driver/device" -+ depends on RTC_CLASS -+ help -+ If you say yes here you get support for the -+ RTC test driver. It's a software RTC which can be -+ used to test the RTC subsystem APIs. It gets -+ the time from the system clock. -+ You want this driver only if you are doing development -+ on the RTC subsystem. Please read the source code -+ for further details. -+ -+ This driver can also be built as a module. If so, the module -+ will be called rtc-test. -+ -+endmenu ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/Makefile 2006-01-04 01:27:21.000000000 +0100 -@@ -0,0 +1,15 @@ -+# -+# Makefile for RTC class/drivers. -+# -+ -+obj-y += utils.o -+obj-$(CONFIG_RTC_CLASS) += rtc-core.o -+rtc-core-y := class.o interface.o -+obj-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o -+obj-$(CONFIG_RTC_INTF_PROC) += rtc-proc.o -+obj-$(CONFIG_RTC_INTF_DEV) += rtc-dev.o -+ -+obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o -+obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o -+obj-$(CONFIG_RTC_DRV_DS1672) += rtc-ds1672.o -+ ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/interface.c 2006-01-03 15:34:24.000000000 +0100 -@@ -0,0 +1,189 @@ -+/* -+ * RTC subsystem, interface functions -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * -+ * based on arch/arm/common/rtctime.c -+ * -+ * 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; version 2 of the License. -+*/ -+ -+#include <linux/rtc.h> -+ -+extern struct class *rtc_class; -+ -+int rtc_read_time(struct class_device *class_dev, struct rtc_time *tm) -+{ -+ int err = -EINVAL; -+ struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops; -+ -+ if (ops->read_time) { -+ memset(tm, 0, sizeof(struct rtc_time)); -+ err = ops->read_time(class_dev->dev, tm); -+ } -+ return err; -+} -+EXPORT_SYMBOL(rtc_read_time); -+ -+int rtc_set_time(struct class_device *class_dev, struct rtc_time *tm) -+{ -+ int err; -+ struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops; -+ -+ err = rtc_valid_tm(tm); -+ if (err == 0 && ops->set_time) -+ err = ops->set_time(class_dev->dev, tm); -+ -+ return err; -+} -+EXPORT_SYMBOL(rtc_set_time); -+ -+int rtc_read_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm) -+{ -+ struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops; -+ int err = -EINVAL; -+ -+ if (ops->read_alarm) { -+ memset(alarm, 0, sizeof(struct rtc_wkalrm)); -+ err = ops->read_alarm(class_dev->dev, alarm); -+ } -+ return err; -+} -+EXPORT_SYMBOL(rtc_read_alarm); -+ -+int rtc_set_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm) -+{ -+ int err = -EINVAL; -+ struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops; -+ -+ if (ops->set_alarm) -+ err = ops->set_alarm(class_dev->dev, alarm); -+ return err; -+} -+EXPORT_SYMBOL(rtc_set_alarm); -+ -+void rtc_update_irq(struct class_device *class_dev, -+ unsigned long num, unsigned long events) -+{ -+ struct rtc_device *rtc = to_rtc_device(class_dev); -+ -+ spin_lock(&rtc->irq_lock); -+ rtc->irq_data = (rtc->irq_data + (num << 8)) | events; -+ spin_unlock(&rtc->irq_lock); -+ -+ spin_lock(&rtc->irq_task_lock); -+ if (rtc->irq_task) -+ rtc->irq_task->func(rtc->irq_task->private_data); -+ spin_unlock(&rtc->irq_task_lock); -+ -+ wake_up_interruptible(&rtc->irq_queue); -+ kill_fasync(&rtc->async_queue, SIGIO, POLL_IN); -+} -+EXPORT_SYMBOL(rtc_update_irq); -+ -+struct class_device *rtc_open(char *name) -+{ -+ struct class_device *class_dev = NULL, -+ *class_dev_tmp; -+ -+ down(&rtc_class->sem); -+ list_for_each_entry(class_dev_tmp, &rtc_class->children, node) { -+ if (strncmp(class_dev_tmp->class_id, name, BUS_ID_SIZE) == 0) { -+ class_dev = class_dev_tmp; -+ break; -+ } -+ } -+ up(&rtc_class->sem); -+ -+ return class_dev; -+} -+EXPORT_SYMBOL(rtc_open); -+ -+void rtc_close(struct class_device *class_dev) -+{ -+} -+EXPORT_SYMBOL(rtc_close); -+ -+int rtc_irq_register(struct class_device *class_dev, struct rtc_task *task) -+{ -+ int retval = -EBUSY; -+ struct rtc_device *rtc = to_rtc_device(class_dev); -+ -+ if (task == NULL || task->func == NULL) -+ return -EINVAL; -+ -+ spin_lock(&rtc->irq_task_lock); -+ if (rtc->irq_task == NULL) { -+ rtc->irq_task = task; -+ retval = 0; -+ } -+ spin_unlock(&rtc->irq_task_lock); -+ -+ return retval; -+} -+EXPORT_SYMBOL(rtc_irq_register); -+ -+void rtc_irq_unregister(struct class_device *class_dev, struct rtc_task *task) -+{ -+ struct rtc_device *rtc = to_rtc_device(class_dev); -+ -+ spin_lock(&rtc->irq_task_lock); -+ if (rtc->irq_task == task) -+ rtc->irq_task = NULL; -+ spin_unlock(&rtc->irq_task_lock); -+} -+EXPORT_SYMBOL(rtc_irq_unregister); -+ -+int rtc_irq_set_state(struct class_device *class_dev, struct rtc_task *task, int enabled) -+{ -+ int err = 0; -+ unsigned long flags; -+ struct rtc_device *rtc = to_rtc_device(class_dev); -+ -+ spin_lock_irqsave(&rtc->irq_task_lock, flags); -+ if (rtc->irq_task != task) -+ err = -ENXIO; -+ spin_unlock_irqrestore(&rtc->irq_task_lock, flags); -+ -+ if (err == 0) -+ err = rtc->ops->irq_set_state(class_dev->dev, enabled); -+ -+ return err; -+} -+EXPORT_SYMBOL(rtc_irq_set_state); -+ -+int rtc_irq_set_freq(struct class_device *class_dev, struct rtc_task *task, int freq) -+{ -+ int err = 0, tmp = 0; -+ unsigned long flags; -+ struct rtc_device *rtc = to_rtc_device(class_dev); -+ -+ /* allowed range is 2-8192 */ -+ if (freq < 2 || freq > 8192) -+ return -EINVAL; -+ -+/* if ((freq > rtc_max_user_freq) && (!capable(CAP_SYS_RESOURCE))) -+ return -EACCES; -+*/ -+ /* check if freq is a power of 2 */ -+ while (freq > (1 << tmp)) -+ tmp++; -+ -+ if (freq != (1 << tmp)) -+ return -EINVAL; -+ -+ spin_lock_irqsave(&rtc->irq_task_lock, flags); -+ if (rtc->irq_task != task) -+ err = -ENXIO; -+ spin_unlock_irqrestore(&rtc->irq_task_lock, flags); -+ -+ if (err == 0) { -+ if ((err = rtc->ops->irq_set_freq(class_dev->dev, freq)) == 0) -+ rtc->irq_freq = freq; -+ } -+ return err; -+ -+} ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/utils.c 2006-01-03 15:34:24.000000000 +0100 -@@ -0,0 +1,97 @@ -+/* -+ * RTC subsystem, utility functions -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * -+ * based on arch/arm/common/rtctime.c -+ * -+ * 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; version 2 of the License. -+*/ -+ -+#include <linux/rtc.h> -+ -+static const unsigned char rtc_days_in_month[] = { -+ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 -+}; -+ -+#define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400) -+#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400)) -+ -+int rtc_month_days(unsigned int month, unsigned int year) -+{ -+ return rtc_days_in_month[month] + (LEAP_YEAR(year) && month == 1); -+} -+EXPORT_SYMBOL(rtc_month_days); -+ -+/* -+ * Convert seconds since 01-01-1970 00:00:00 to Gregorian date. -+ */ -+void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) -+{ -+ int days, month, year; -+ -+ days = time / 86400; -+ time -= days * 86400; -+ -+ tm->tm_wday = (days + 4) % 7; -+ -+ year = 1970 + days / 365; -+ days -= (year - 1970) * 365 -+ + LEAPS_THRU_END_OF(year - 1) -+ - LEAPS_THRU_END_OF(1970 - 1); -+ if (days < 0) { -+ year -= 1; -+ days += 365 + LEAP_YEAR(year); -+ } -+ tm->tm_year = year - 1900; -+ tm->tm_yday = days + 1; -+ -+ for (month = 0; month < 11; month++) { -+ int newdays; -+ -+ newdays = days - rtc_month_days(month, year); -+ if (newdays < 0) -+ break; -+ days = newdays; -+ } -+ tm->tm_mon = month; -+ tm->tm_mday = days + 1; -+ -+ tm->tm_hour = time / 3600; -+ time -= tm->tm_hour * 3600; -+ tm->tm_min = time / 60; -+ tm->tm_sec = time - tm->tm_min * 60; -+} -+EXPORT_SYMBOL(rtc_time_to_tm); -+ -+/* -+ * Does the rtc_time represent a valid date/time? -+ */ -+int rtc_valid_tm(struct rtc_time *tm) -+{ -+ if (tm->tm_year < 70 || -+ tm->tm_mon >= 12 || -+ tm->tm_mday < 1 || -+ tm->tm_mday > rtc_month_days(tm->tm_mon, tm->tm_year + 1900) || -+ tm->tm_hour >= 24 || -+ tm->tm_min >= 60 || -+ tm->tm_sec >= 60) -+ return -EINVAL; -+ -+ return 0; -+} -+EXPORT_SYMBOL(rtc_valid_tm); -+ -+/* -+ * Convert Gregorian date to seconds since 01-01-1970 00:00:00. -+ */ -+int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time) -+{ -+ *time = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, -+ tm->tm_hour, tm->tm_min, tm->tm_sec); -+ return 0; -+} -+EXPORT_SYMBOL(rtc_tm_to_time); ---- linux-nslu2.orig/arch/arm/Kconfig 2006-01-04 01:27:04.000000000 +0100 -+++ linux-nslu2/arch/arm/Kconfig 2006-01-04 01:27:31.000000000 +0100 -@@ -750,6 +750,8 @@ source "drivers/usb/Kconfig" - - source "drivers/mmc/Kconfig" - -+source "drivers/rtc/Kconfig" -+ - endmenu - - source "fs/Kconfig" ---- linux-nslu2.orig/arch/arm/common/rtctime.c 2006-01-04 01:27:04.000000000 +0100 -+++ linux-nslu2/arch/arm/common/rtctime.c 2006-01-04 01:27:09.000000000 +0100 -@@ -40,89 +40,6 @@ static struct rtc_ops *rtc_ops; - - #define rtc_epoch 1900UL - --static const unsigned char days_in_month[] = { -- 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 --}; -- --#define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400) --#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400)) -- --static int month_days(unsigned int month, unsigned int year) --{ -- return days_in_month[month] + (LEAP_YEAR(year) && month == 1); --} -- --/* -- * Convert seconds since 01-01-1970 00:00:00 to Gregorian date. -- */ --void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) --{ -- int days, month, year; -- -- days = time / 86400; -- time -= days * 86400; -- -- tm->tm_wday = (days + 4) % 7; -- -- year = 1970 + days / 365; -- days -= (year - 1970) * 365 -- + LEAPS_THRU_END_OF(year - 1) -- - LEAPS_THRU_END_OF(1970 - 1); -- if (days < 0) { -- year -= 1; -- days += 365 + LEAP_YEAR(year); -- } -- tm->tm_year = year - 1900; -- tm->tm_yday = days + 1; -- -- for (month = 0; month < 11; month++) { -- int newdays; -- -- newdays = days - month_days(month, year); -- if (newdays < 0) -- break; -- days = newdays; -- } -- tm->tm_mon = month; -- tm->tm_mday = days + 1; -- -- tm->tm_hour = time / 3600; -- time -= tm->tm_hour * 3600; -- tm->tm_min = time / 60; -- tm->tm_sec = time - tm->tm_min * 60; --} --EXPORT_SYMBOL(rtc_time_to_tm); -- --/* -- * Does the rtc_time represent a valid date/time? -- */ --int rtc_valid_tm(struct rtc_time *tm) --{ -- if (tm->tm_year < 70 || -- tm->tm_mon >= 12 || -- tm->tm_mday < 1 || -- tm->tm_mday > month_days(tm->tm_mon, tm->tm_year + 1900) || -- tm->tm_hour >= 24 || -- tm->tm_min >= 60 || -- tm->tm_sec >= 60) -- return -EINVAL; -- -- return 0; --} --EXPORT_SYMBOL(rtc_valid_tm); -- --/* -- * Convert Gregorian date to seconds since 01-01-1970 00:00:00. -- */ --int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time) --{ -- *time = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, -- tm->tm_hour, tm->tm_min, tm->tm_sec); -- -- return 0; --} --EXPORT_SYMBOL(rtc_tm_to_time); -- - /* - * Calculate the next alarm time given the requested alarm time mask - * and the current time. -@@ -141,13 +58,13 @@ void rtc_next_alarm_time(struct rtc_time - next->tm_sec = alrm->tm_sec; - } - --static inline int rtc_read_time(struct rtc_ops *ops, struct rtc_time *tm) -+static inline int rtc_arm_read_time(struct rtc_ops *ops, struct rtc_time *tm) - { - memset(tm, 0, sizeof(struct rtc_time)); - return ops->read_time(tm); - } - --static inline int rtc_set_time(struct rtc_ops *ops, struct rtc_time *tm) -+static inline int rtc_arm_set_time(struct rtc_ops *ops, struct rtc_time *tm) - { - int ret; - -@@ -158,7 +75,7 @@ static inline int rtc_set_time(struct rt - return ret; - } - --static inline int rtc_read_alarm(struct rtc_ops *ops, struct rtc_wkalrm *alrm) -+static inline int rtc_arm_read_alarm(struct rtc_ops *ops, struct rtc_wkalrm *alrm) - { - int ret = -EINVAL; - if (ops->read_alarm) { -@@ -168,7 +85,7 @@ static inline int rtc_read_alarm(struct - return ret; - } - --static inline int rtc_set_alarm(struct rtc_ops *ops, struct rtc_wkalrm *alrm) -+static inline int rtc_arm_set_alarm(struct rtc_ops *ops, struct rtc_wkalrm *alrm) - { - int ret = -EINVAL; - if (ops->set_alarm) -@@ -256,7 +173,7 @@ static int rtc_ioctl(struct inode *inode - - switch (cmd) { - case RTC_ALM_READ: -- ret = rtc_read_alarm(ops, &alrm); -+ ret = rtc_arm_read_alarm(ops, &alrm); - if (ret) - break; - ret = copy_to_user(uarg, &alrm.time, sizeof(tm)); -@@ -278,11 +195,11 @@ static int rtc_ioctl(struct inode *inode - alrm.time.tm_wday = -1; - alrm.time.tm_yday = -1; - alrm.time.tm_isdst = -1; -- ret = rtc_set_alarm(ops, &alrm); -+ ret = rtc_arm_set_alarm(ops, &alrm); - break; - - case RTC_RD_TIME: -- ret = rtc_read_time(ops, &tm); -+ ret = rtc_arm_read_time(ops, &tm); - if (ret) - break; - ret = copy_to_user(uarg, &tm, sizeof(tm)); -@@ -300,7 +217,7 @@ static int rtc_ioctl(struct inode *inode - ret = -EFAULT; - break; - } -- ret = rtc_set_time(ops, &tm); -+ ret = rtc_arm_set_time(ops, &tm); - break; - - case RTC_EPOCH_SET: -@@ -331,11 +248,11 @@ static int rtc_ioctl(struct inode *inode - ret = -EFAULT; - break; - } -- ret = rtc_set_alarm(ops, &alrm); -+ ret = rtc_arm_set_alarm(ops, &alrm); - break; - - case RTC_WKALM_RD: -- ret = rtc_read_alarm(ops, &alrm); -+ ret = rtc_arm_read_alarm(ops, &alrm); - if (ret) - break; - ret = copy_to_user(uarg, &alrm, sizeof(alrm)); -@@ -425,7 +342,7 @@ static int rtc_read_proc(char *page, cha - struct rtc_time tm; - char *p = page; - -- if (rtc_read_time(ops, &tm) == 0) { -+ if (rtc_arm_read_time(ops, &tm) == 0) { - p += sprintf(p, - "rtc_time\t: %02d:%02d:%02d\n" - "rtc_date\t: %04d-%02d-%02d\n" -@@ -435,7 +352,7 @@ static int rtc_read_proc(char *page, cha - rtc_epoch); - } - -- if (rtc_read_alarm(ops, &alrm) == 0) { -+ if (rtc_arm_read_alarm(ops, &alrm) == 0) { - p += sprintf(p, "alrm_time\t: "); - if ((unsigned int)alrm.time.tm_hour <= 24) - p += sprintf(p, "%02d:", alrm.time.tm_hour); ---- linux-nslu2.orig/include/asm-arm/rtc.h 2006-01-04 01:27:04.000000000 +0100 -+++ linux-nslu2/include/asm-arm/rtc.h 2006-01-04 01:27:09.000000000 +0100 -@@ -25,9 +25,6 @@ struct rtc_ops { - int (*proc)(char *buf); - }; - --void rtc_time_to_tm(unsigned long, struct rtc_time *); --int rtc_tm_to_time(struct rtc_time *, unsigned long *); --int rtc_valid_tm(struct rtc_time *); - void rtc_next_alarm_time(struct rtc_time *, struct rtc_time *, struct rtc_time *); - void rtc_update(unsigned long, unsigned long); - int register_rtc(struct rtc_ops *); ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-sysfs.c 2006-01-04 01:27:12.000000000 +0100 -@@ -0,0 +1,125 @@ -+/* -+ * RTC subsystem, sysfs interface -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * -+ * 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; version 2 of the License. -+*/ -+ -+#include <linux/module.h> -+#include <linux/rtc.h> -+ -+/* device attributes */ -+ -+static ssize_t rtc_sysfs_show_name(struct class_device *dev, char *buf) -+{ -+ return sprintf(buf, "%s\n", to_rtc_device(dev)->name); -+} -+static CLASS_DEVICE_ATTR(name, S_IRUGO, rtc_sysfs_show_name, NULL); -+ -+static ssize_t rtc_sysfs_show_date(struct class_device *dev, char *buf) -+{ -+ ssize_t retval = 0; -+ struct rtc_device *rtc = to_rtc_device(dev); -+ struct rtc_time tm; -+ -+ if (down_read_trylock(&rtc->lock) == 0) -+ return -ENODEV; -+ -+ if (rtc_read_time(dev, &tm) == 0) { -+ retval = sprintf(buf, "%04d-%02d-%02d\n", -+ tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday); -+ } -+ -+ up_read(&rtc->lock); -+ return retval; -+} -+static CLASS_DEVICE_ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL); -+ -+static ssize_t rtc_sysfs_show_time(struct class_device *dev, char *buf) -+{ -+ ssize_t retval = 0; -+ struct rtc_device *rtc = to_rtc_device(dev); -+ struct rtc_time tm; -+ -+ if (down_read_trylock(&rtc->lock) == 0) -+ return -ENODEV; -+ -+ if (rtc_read_time(dev, &tm) == 0) { -+ retval = sprintf(buf, "%02d:%02d:%02d\n", -+ tm.tm_hour, tm.tm_min, tm.tm_sec); -+ } -+ -+ up_read(&rtc->lock); -+ return retval; -+} -+static CLASS_DEVICE_ATTR(time, S_IRUGO, rtc_sysfs_show_time, NULL); -+ -+static ssize_t rtc_sysfs_show_since_epoch(struct class_device *dev, char *buf) -+{ -+ ssize_t retval = 0; -+ struct rtc_device *rtc = to_rtc_device(dev); -+ struct rtc_time tm; -+ -+ if (down_read_trylock(&rtc->lock) == 0) -+ return -ENODEV; -+ -+ if (rtc_read_time(dev, &tm) == 0) { -+ unsigned long time; -+ rtc_tm_to_time(&tm, &time); -+ retval = sprintf(buf, "%lu\n", time); -+ } -+ -+ up_read(&rtc->lock); -+ return retval; -+} -+static CLASS_DEVICE_ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL); -+ -+/* insertion/removal hooks */ -+ -+static int __devinit rtc_sysfs_add_device(struct class_device *class_dev, -+ struct class_interface *class_intf) -+{ -+ class_device_create_file(class_dev, &class_device_attr_name); -+ class_device_create_file(class_dev, &class_device_attr_date); -+ class_device_create_file(class_dev, &class_device_attr_time); -+ class_device_create_file(class_dev, &class_device_attr_since_epoch); -+ dev_info(class_dev->dev, "rtc intf: sysfs\n"); -+ return 0; -+} -+ -+static void rtc_sysfs_remove_device(struct class_device *class_dev, -+ struct class_interface *class_intf) -+{ -+ class_device_remove_file(class_dev, &class_device_attr_name); -+ class_device_remove_file(class_dev, &class_device_attr_date); -+ class_device_remove_file(class_dev, &class_device_attr_time); -+ class_device_remove_file(class_dev, &class_device_attr_since_epoch); -+} -+ -+/* interface registration */ -+ -+struct class_interface rtc_sysfs_interface = { -+ .add = &rtc_sysfs_add_device, -+ .remove = &rtc_sysfs_remove_device, -+}; -+ -+static int __init rtc_sysfs_init(void) -+{ -+ return rtc_interface_register(&rtc_sysfs_interface); -+} -+ -+static void __exit rtc_sysfs_exit(void) -+{ -+ class_interface_unregister(&rtc_sysfs_interface); -+} -+ -+module_init(rtc_sysfs_init); -+module_exit(rtc_sysfs_exit); -+ -+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -+MODULE_DESCRIPTION("RTC class sysfs interface"); -+MODULE_LICENSE("GPL"); ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-proc.c 2006-01-04 01:27:14.000000000 +0100 -@@ -0,0 +1,158 @@ -+/* -+ * RTC subsystem, proc interface -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * -+ * based on arch/arm/common/rtctime.c -+ * -+ * 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; version 2 of the License. -+*/ -+ -+#include <linux/module.h> -+#include <linux/rtc.h> -+#include <linux/proc_fs.h> -+#include <linux/seq_file.h> -+ -+static struct class_device *rtc_dev = NULL; -+static DECLARE_MUTEX(rtc_sem); -+ -+static int rtc_proc_show(struct seq_file *seq, void *offset) -+{ -+ struct class_device *class_dev = seq->private; -+ struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops; -+ struct rtc_wkalrm alrm; -+ struct rtc_time tm; -+ -+ if (rtc_read_time(class_dev, &tm) == 0) { -+ seq_printf(seq, -+ "rtc_time\t: %02d:%02d:%02d\n" -+ "rtc_date\t: %04d-%02d-%02d\n", -+ tm.tm_hour, tm.tm_min, tm.tm_sec, -+ tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday); -+ } -+ -+ if (rtc_read_alarm(class_dev, &alrm) == 0) { -+ seq_printf(seq, "alrm_time\t: "); -+ if ((unsigned int)alrm.time.tm_hour <= 24) -+ seq_printf(seq, "%02d:", alrm.time.tm_hour); -+ else -+ seq_printf(seq, "**:"); -+ if ((unsigned int)alrm.time.tm_min <= 59) -+ seq_printf(seq, "%02d:", alrm.time.tm_min); -+ else -+ seq_printf(seq, "**:"); -+ if ((unsigned int)alrm.time.tm_sec <= 59) -+ seq_printf(seq, "%02d\n", alrm.time.tm_sec); -+ else -+ seq_printf(seq, "**\n"); -+ -+ seq_printf(seq, "alrm_date\t: "); -+ if ((unsigned int)alrm.time.tm_year <= 200) -+ seq_printf(seq, "%04d-", alrm.time.tm_year + 1900); -+ else -+ seq_printf(seq, "****-"); -+ if ((unsigned int)alrm.time.tm_mon <= 11) -+ seq_printf(seq, "%02d-", alrm.time.tm_mon + 1); -+ else -+ seq_printf(seq, "**-"); -+ if ((unsigned int)alrm.time.tm_mday <= 31) -+ seq_printf(seq, "%02d\n", alrm.time.tm_mday); -+ else -+ seq_printf(seq, "**\n"); -+ seq_printf(seq, "alrm_wakeup\t: %s\n", -+ alrm.enabled ? "yes" : "no"); -+ seq_printf(seq, "alrm_pending\t: %s\n", -+ alrm.pending ? "yes" : "no"); -+ } -+ -+ if (ops->proc) -+ ops->proc(class_dev->dev, seq); -+ -+ return 0; -+} -+ -+static int rtc_proc_open(struct inode *inode, struct file *file) -+{ -+ struct class_device *class_dev = PDE(inode)->data; -+ -+ if (!try_module_get(THIS_MODULE)) -+ return -ENODEV; -+ -+ return single_open(file, rtc_proc_show, class_dev); -+} -+ -+static int rtc_proc_release(struct inode *inode, struct file *file) -+{ -+ int res = single_release(inode, file); -+ module_put(THIS_MODULE); -+ return res; -+} -+ -+static struct file_operations rtc_proc_fops = { -+ .open = rtc_proc_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = rtc_proc_release, -+}; -+ -+static int rtc_proc_add_device(struct class_device *class_dev, -+ struct class_interface *class_intf) -+{ -+ down(&rtc_sem); -+ if (rtc_dev == NULL) { -+ struct proc_dir_entry *ent; -+ -+ rtc_dev = class_dev; -+ -+ if ((ent = create_proc_entry("driver/rtc", 0, NULL))) { -+ struct rtc_device *rtc = to_rtc_device(class_dev); -+ -+ ent->proc_fops = &rtc_proc_fops; -+ ent->owner = rtc->owner; -+ ent->data = class_dev; -+ -+ dev_info(class_dev->dev, "rtc intf: proc\n"); -+ } -+ else -+ rtc_dev = NULL; -+ } -+ up(&rtc_sem); -+ -+ return 0; -+} -+ -+static void rtc_proc_remove_device(struct class_device *class_dev, -+ struct class_interface *class_intf) -+{ -+ down(&rtc_sem); -+ if (rtc_dev == class_dev) { -+ remove_proc_entry("driver/rtc", NULL); -+ rtc_dev = NULL; -+ } -+ up(&rtc_sem); -+} -+ -+struct class_interface rtc_proc_interface = { -+ .add = &rtc_proc_add_device, -+ .remove = &rtc_proc_remove_device, -+}; -+ -+static int __init rtc_proc_init(void) -+{ -+ return rtc_interface_register(&rtc_proc_interface); -+} -+ -+static void __exit rtc_proc_exit(void) -+{ -+ class_interface_unregister(&rtc_proc_interface); -+} -+ -+module_init(rtc_proc_init); -+module_exit(rtc_proc_exit); -+ -+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -+MODULE_DESCRIPTION("RTC class proc interface"); -+MODULE_LICENSE("GPL"); ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-dev.c 2006-01-04 01:27:15.000000000 +0100 -@@ -0,0 +1,372 @@ -+/* -+ * RTC subsystem, dev interface -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * -+ * based on arch/arm/common/rtctime.c -+ * -+ * 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; version 2 of the License. -+*/ -+ -+#include <linux/module.h> -+#include <linux/rtc.h> -+ -+static dev_t rtc_devt; -+ -+#define RTC_DEV_MAX 16 /* 16 RTCs should be enough for everyone... */ -+ -+static int rtc_dev_open(struct inode *inode, struct file *file) -+{ -+ int err; -+ struct rtc_device *rtc = container_of(inode->i_cdev, -+ struct rtc_device, char_dev); -+ struct rtc_class_ops *ops = rtc->ops; -+ -+ /* We keep the lock as long as the device is in use -+ * and return immediately if busy -+ */ -+ if (down_trylock(&rtc->char_sem)) -+ return -EBUSY; -+ -+ file->private_data = &rtc->class_dev; -+ -+ err = ops->open ? ops->open(rtc->class_dev.dev) : 0; -+ if (err == 0) { -+ -+ spin_lock_irq(&rtc->irq_lock); -+ rtc->irq_data = 0; -+ spin_unlock_irq(&rtc->irq_lock); -+ -+ return 0; -+ } -+ -+ /* something has gone wrong, release the lock */ -+ up(&rtc->char_sem); -+ return err; -+} -+ -+ -+static ssize_t -+rtc_dev_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) -+{ -+ struct rtc_device *rtc = to_rtc_device(file->private_data); -+ -+ DECLARE_WAITQUEUE(wait, current); -+ unsigned long data; -+ ssize_t ret; -+ -+ if (count < sizeof(unsigned long)) -+ return -EINVAL; -+ -+ add_wait_queue(&rtc->irq_queue, &wait); -+ do { -+ __set_current_state(TASK_INTERRUPTIBLE); -+ -+ spin_lock_irq(&rtc->irq_lock); -+ data = rtc->irq_data; -+ rtc->irq_data = 0; -+ spin_unlock_irq(&rtc->irq_lock); -+ -+ if (data != 0) { -+ ret = 0; -+ break; -+ } -+ if (file->f_flags & O_NONBLOCK) { -+ ret = -EAGAIN; -+ break; -+ } -+ if (signal_pending(current)) { -+ ret = -ERESTARTSYS; -+ break; -+ } -+ schedule(); -+ } while (1); -+ set_current_state(TASK_RUNNING); -+ remove_wait_queue(&rtc->irq_queue, &wait); -+ -+ if (ret == 0) { -+ ret = put_user(data, (unsigned long __user *)buf); -+ if (ret == 0) -+ ret = sizeof(unsigned long); -+ } -+ return ret; -+} -+ -+static unsigned int rtc_dev_poll(struct file *file, poll_table *wait) -+{ -+ struct rtc_device *rtc = to_rtc_device(file->private_data); -+ unsigned long data; -+ -+ poll_wait(file, &rtc->irq_queue, wait); -+ -+ spin_lock_irq(&rtc->irq_lock); -+ data = rtc->irq_data; -+ spin_unlock_irq(&rtc->irq_lock); -+ -+ return data != 0 ? POLLIN | POLLRDNORM : 0; -+} -+ -+static int rtc_dev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, -+ unsigned long arg) -+{ -+ int err = 0; -+ struct class_device *class_dev = file->private_data; -+ struct rtc_device *rtc = to_rtc_device(class_dev); -+ struct rtc_class_ops *ops = rtc->ops; -+ struct rtc_time tm; -+ struct rtc_wkalrm alarm; -+ void __user *uarg = (void __user *) arg; -+ -+ /* avoid conflicting IRQ users */ -+ if (cmd == RTC_PIE_ON || cmd == RTC_PIE_OFF || cmd == RTC_IRQP_SET) { -+ spin_lock(&rtc->irq_task_lock); -+ if (rtc->irq_task) -+ err = -EBUSY; -+ spin_unlock(&rtc->irq_task_lock); -+ -+ if (err < 0) -+ return err; -+ } -+ -+ /* try the driver's ioctl interface */ -+ if (ops->ioctl) { -+ err = ops->ioctl(class_dev->dev, cmd, arg); -+ if (err < 0 && err != -EINVAL) -+ return err; -+ } -+ -+ /* if the driver does not provide the ioctl interface -+ * or if that particular ioctl was not implemented -+ * (-EINVAL), we will try to emulate here. -+ */ -+ -+ switch (cmd) { -+ case RTC_ALM_READ: -+ if ((err = rtc_read_alarm(class_dev, &alarm)) < 0) -+ return err; -+ -+ if ((err = copy_to_user(uarg, &alarm.time, sizeof(tm)))) -+ return -EFAULT; -+ break; -+ -+ case RTC_ALM_SET: -+ if ((err = copy_from_user(&alarm.time, uarg, sizeof(tm)))) -+ return -EFAULT; -+ -+ alarm.enabled = 0; -+ alarm.pending = 0; -+ alarm.time.tm_mday = -1; -+ alarm.time.tm_mon = -1; -+ alarm.time.tm_year = -1; -+ alarm.time.tm_wday = -1; -+ alarm.time.tm_yday = -1; -+ alarm.time.tm_isdst = -1; -+ err = rtc_set_alarm(class_dev, &alarm); -+ break; -+ -+ case RTC_RD_TIME: -+ if ((err = rtc_read_time(class_dev, &tm)) < 0) -+ return err; -+ -+ if ((err = copy_to_user(uarg, &tm, sizeof(tm)))) -+ return -EFAULT; -+ break; -+ -+ case RTC_SET_TIME: -+ if (!capable(CAP_SYS_TIME)) -+ return -EACCES; -+ -+ if ((err = copy_from_user(&tm, uarg, sizeof(tm)))) -+ return -EFAULT; -+ -+ err = rtc_set_time(class_dev, &tm); -+ break; -+#if 0 -+ case RTC_EPOCH_SET: -+#ifndef rtc_epoch -+ /* -+ * There were no RTC clocks before 1900. -+ */ -+ if (arg < 1900) { -+ err = -EINVAL; -+ break; -+ } -+ if (!capable(CAP_SYS_TIME)) { -+ err = -EACCES; -+ break; -+ } -+ rtc_epoch = arg; -+ err = 0; -+#endif -+ break; -+ -+ case RTC_EPOCH_READ: -+ err = put_user(rtc_epoch, (unsigned long __user *)uarg); -+ break; -+#endif -+ case RTC_WKALM_SET: -+ if ((err = copy_from_user(&alarm, uarg, sizeof(alarm)))) -+ return -EFAULT; -+ -+ err = rtc_set_alarm(class_dev, &alarm); -+ break; -+ -+ case RTC_WKALM_RD: -+ if ((err = rtc_read_alarm(class_dev, &alarm)) < 0) -+ return err; -+ -+ if ((err = copy_to_user(uarg, &alarm, sizeof(alarm)))) -+ return -EFAULT; -+ break; -+ -+ default: -+ err = -EINVAL; -+ break; -+ } -+ -+ return err; -+} -+ -+static int rtc_dev_release(struct inode *inode, struct file *file) -+{ -+ struct rtc_device *rtc = to_rtc_device(file->private_data); -+ -+ if (rtc->ops->release) -+ rtc->ops->release(rtc->class_dev.dev); -+ -+ spin_lock_irq(&rtc->irq_lock); -+ rtc->irq_data = 0; -+ spin_unlock_irq(&rtc->irq_lock); -+ -+ up(&rtc->char_sem); -+ return 0; -+} -+ -+static int rtc_dev_fasync(int fd, struct file *file, int on) -+{ -+ struct rtc_device *rtc = to_rtc_device(file->private_data); -+ return fasync_helper(fd, file, on, &rtc->async_queue); -+} -+ -+static struct file_operations rtc_dev_fops = { -+ .owner = THIS_MODULE, -+ .llseek = no_llseek, -+ .read = rtc_dev_read, -+ .poll = rtc_dev_poll, -+ .ioctl = rtc_dev_ioctl, -+ .open = rtc_dev_open, -+ .release = rtc_dev_release, -+ .fasync = rtc_dev_fasync, -+}; -+ -+static ssize_t rtc_dev_show_dev(struct class_device *class_dev, char *buf) -+{ -+ return print_dev_t(buf, class_dev->devt); -+} -+static CLASS_DEVICE_ATTR(dev, S_IRUGO, rtc_dev_show_dev, NULL); -+ -+/* insertion/removal hooks */ -+ -+static int rtc_dev_add_device(struct class_device *class_dev, -+ struct class_interface *class_intf) -+{ -+ struct rtc_device *rtc = to_rtc_device(class_dev); -+ -+ if (rtc->id >= RTC_DEV_MAX) { -+ dev_err(class_dev->dev, "too many RTCs\n"); -+ return -EINVAL; -+ } -+ -+ init_MUTEX(&rtc->char_sem); -+ spin_lock_init(&rtc->irq_lock); -+ init_waitqueue_head(&rtc->irq_queue); -+ -+ cdev_init(&rtc->char_dev, &rtc_dev_fops); -+ rtc->char_dev.owner = rtc->owner; -+ class_dev->devt = MKDEV(MAJOR(rtc_devt), rtc->id); -+ -+ if (cdev_add(&rtc->char_dev, class_dev->devt, 1)) { -+ cdev_del(&rtc->char_dev); -+ -+ dev_err(class_dev->dev, -+ "failed to add char device %d:%d\n", -+ MAJOR(class_dev->devt), -+ MINOR(class_dev->devt)); -+ -+ class_dev->devt = MKDEV(0, 0); -+ return -ENODEV; -+ } -+ -+ class_device_create_file(class_dev, &class_device_attr_dev); -+ -+ dev_info(class_dev->dev, "rtc intf: dev (%d:%d)\n", -+ MAJOR(class_dev->devt), -+ MINOR(class_dev->devt)); -+ -+ kobject_hotplug(&class_dev->kobj, KOBJ_ADD); -+ -+ return 0; -+} -+ -+static void rtc_dev_remove_device(struct class_device *class_dev, -+ struct class_interface *class_intf) -+{ -+ struct rtc_device *rtc = to_rtc_device(class_dev); -+ -+ class_device_remove_file(class_dev, &class_device_attr_dev); -+ -+ if (MAJOR(class_dev->devt)) { -+ dev_dbg(class_dev->dev, "removing char %d:%d\n", -+ MAJOR(class_dev->devt), -+ MINOR(class_dev->devt)); -+ cdev_del(&rtc->char_dev); -+ -+ kobject_hotplug(&class_dev->kobj, KOBJ_REMOVE); -+ -+ class_dev->devt = MKDEV(0, 0); -+ } -+} -+ -+/* interface registration */ -+ -+struct class_interface rtc_dev_interface = { -+ .add = &rtc_dev_add_device, -+ .remove = &rtc_dev_remove_device, -+}; -+ -+static int __init rtc_dev_init(void) -+{ -+ int err; -+ -+ if ((err = alloc_chrdev_region(&rtc_devt, 0, RTC_DEV_MAX, "rtc")) < 0) { -+ printk(KERN_ERR "%s: failed to allocate char dev region\n", -+ __FILE__); -+ return err; -+ } -+ -+ if ((err = rtc_interface_register(&rtc_dev_interface)) < 0) { -+ printk(KERN_ERR "%s: failed to register the interface\n", -+ __FILE__); -+ unregister_chrdev_region(rtc_devt, RTC_DEV_MAX); -+ return err; -+ } -+ -+ return 0; -+} -+ -+static void __exit rtc_dev_exit(void) -+{ -+ class_interface_unregister(&rtc_dev_interface); -+ -+ unregister_chrdev_region(rtc_devt, RTC_DEV_MAX); -+} -+ -+module_init(rtc_dev_init); -+module_exit(rtc_dev_exit); -+ -+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -+MODULE_DESCRIPTION("RTC class dev interface"); -+MODULE_LICENSE("GPL"); ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-x1205.c 2006-01-04 01:27:17.000000000 +0100 -@@ -0,0 +1,725 @@ -+/* -+ * An i2c driver for the Xicor/Intersil X1205 RTC -+ * Copyright 2004 Karen Spearel -+ * Copyright 2005 Alessandro Zummo -+ * -+ * please send all reports to: -+ * kas11 at tampabay dot rr dot com -+ * a dot zummo at towertech dot it -+ * -+ * based on a lot of other RTC drivers. -+ * -+ * 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. -+ */ -+ -+#include <linux/module.h> -+#include <linux/init.h> -+#include <linux/slab.h> -+#include <linux/err.h> -+#include <linux/i2c.h> -+#include <linux/string.h> -+#include <linux/bcd.h> -+#include <linux/rtc.h> -+#include <linux/delay.h> -+ -+#define DRV_VERSION "1.0.5" -+ -+/* Addresses to scan: none. This chip is located at -+ * 0x6f and uses a two bytes register addressing. -+ * Two bytes need to be written to read a single register, -+ * while most other chips just require one and take the second -+ * one as the data to be written. To prevent corrupting -+ * unknown chips, the user must explicitely set the probe parameter. -+ */ -+ -+static unsigned short normal_i2c[] = { I2C_CLIENT_END }; -+ -+/* Insmod parameters */ -+I2C_CLIENT_INSMOD; -+I2C_CLIENT_MODULE_PARM(hctosys, -+ "Set the system time from the hardware clock upon initialization"); -+ -+/* offsets into CCR area */ -+ -+#define CCR_SEC 0 -+#define CCR_MIN 1 -+#define CCR_HOUR 2 -+#define CCR_MDAY 3 -+#define CCR_MONTH 4 -+#define CCR_YEAR 5 -+#define CCR_WDAY 6 -+#define CCR_Y2K 7 -+ -+#define X1205_REG_SR 0x3F /* status register */ -+#define X1205_REG_Y2K 0x37 -+#define X1205_REG_DW 0x36 -+#define X1205_REG_YR 0x35 -+#define X1205_REG_MO 0x34 -+#define X1205_REG_DT 0x33 -+#define X1205_REG_HR 0x32 -+#define X1205_REG_MN 0x31 -+#define X1205_REG_SC 0x30 -+#define X1205_REG_DTR 0x13 -+#define X1205_REG_ATR 0x12 -+#define X1205_REG_INT 0x11 -+#define X1205_REG_0 0x10 -+#define X1205_REG_Y2K1 0x0F -+#define X1205_REG_DWA1 0x0E -+#define X1205_REG_YRA1 0x0D -+#define X1205_REG_MOA1 0x0C -+#define X1205_REG_DTA1 0x0B -+#define X1205_REG_HRA1 0x0A -+#define X1205_REG_MNA1 0x09 -+#define X1205_REG_SCA1 0x08 -+#define X1205_REG_Y2K0 0x07 -+#define X1205_REG_DWA0 0x06 -+#define X1205_REG_YRA0 0x05 -+#define X1205_REG_MOA0 0x04 -+#define X1205_REG_DTA0 0x03 -+#define X1205_REG_HRA0 0x02 -+#define X1205_REG_MNA0 0x01 -+#define X1205_REG_SCA0 0x00 -+ -+#define X1205_CCR_BASE 0x30 /* Base address of CCR */ -+#define X1205_ALM0_BASE 0x00 /* Base address of ALARM0 */ -+ -+#define X1205_SR_RTCF 0x01 /* Clock failure */ -+#define X1205_SR_WEL 0x02 /* Write Enable Latch */ -+#define X1205_SR_RWEL 0x04 /* Register Write Enable */ -+ -+#define X1205_DTR_DTR0 0x01 -+#define X1205_DTR_DTR1 0x02 -+#define X1205_DTR_DTR2 0x04 -+ -+#define X1205_HR_MIL 0x80 /* Set in ccr.hour for 24 hr mode */ -+ -+/* Prototypes */ -+static int x1205_attach(struct i2c_adapter *adapter); -+static int x1205_detach(struct i2c_client *client); -+static int x1205_probe(struct i2c_adapter *adapter, int address, int kind); -+ -+static struct i2c_driver x1205_driver = { -+ .owner = THIS_MODULE, -+ .name = "x1205", -+ .flags = I2C_DF_NOTIFY, -+ .attach_adapter = &x1205_attach, -+ .detach_client = &x1205_detach, -+}; -+ -+/* -+ * In the routines that deal directly with the x1205 hardware, we use -+ * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch -+ * Epoch is initialized as 2000. Time is set to UTC. -+ */ -+static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm, -+ unsigned char reg_base) -+{ -+ unsigned char dt_addr[2] = { 0, reg_base }; -+ -+ unsigned char buf[8]; -+ -+ struct i2c_msg msgs[] = { -+ { client->addr, 0, 2, dt_addr }, /* setup read ptr */ -+ { client->addr, I2C_M_RD, 8, buf }, /* read date */ -+ }; -+ -+ /* read date registers */ -+ if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { -+ dev_err(&client->dev, "%s: read error\n", __FUNCTION__); -+ return -EIO; -+ } -+ -+ dev_dbg(&client->dev, -+ "%s: raw read data - sec=%02x, min=%02x, hr=%02x, " -+ "mday=%02x, mon=%02x, year=%02x, wday=%02x, y2k=%02x\n", -+ __FUNCTION__, -+ buf[0], buf[1], buf[2], buf[3], -+ buf[4], buf[5], buf[6], buf[7]); -+ -+ tm->tm_sec = BCD2BIN(buf[CCR_SEC]); -+ tm->tm_min = BCD2BIN(buf[CCR_MIN]); -+ tm->tm_hour = BCD2BIN(buf[CCR_HOUR] & 0x3F); /* hr is 0-23 */ -+ tm->tm_mday = BCD2BIN(buf[CCR_MDAY]); -+ tm->tm_mon = BCD2BIN(buf[CCR_MONTH]) - 1; /* mon is 0-11 */ -+ tm->tm_year = BCD2BIN(buf[CCR_YEAR]) -+ + (BCD2BIN(buf[CCR_Y2K]) * 100) - 1900; -+ tm->tm_wday = buf[CCR_WDAY]; -+ -+ dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, " -+ "mday=%d, mon=%d, year=%d, wday=%d\n", -+ __FUNCTION__, -+ tm->tm_sec, tm->tm_min, tm->tm_hour, -+ tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); -+ -+ return 0; -+} -+ -+static int x1205_get_status(struct i2c_client *client, unsigned char *sr) -+{ -+ static unsigned char sr_addr[2] = { 0, X1205_REG_SR }; -+ -+ struct i2c_msg msgs[] = { -+ { client->addr, 0, 2, sr_addr }, /* setup read ptr */ -+ { client->addr, I2C_M_RD, 1, sr }, /* read status */ -+ }; -+ -+ /* read status register */ -+ if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { -+ dev_err(&client->dev, "%s: read error\n", __FUNCTION__); -+ return -EIO; -+ } -+ -+ return 0; -+} -+ -+static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm, -+ int datetoo, u8 reg_base) -+{ -+ int i, xfer; -+ unsigned char buf[8]; -+ -+ static const unsigned char wel[3] = { 0, X1205_REG_SR, -+ X1205_SR_WEL }; -+ -+ static const unsigned char rwel[3] = { 0, X1205_REG_SR, -+ X1205_SR_WEL | X1205_SR_RWEL }; -+ -+ static const unsigned char diswe[3] = { 0, X1205_REG_SR, 0 }; -+ -+ dev_dbg(&client->dev, -+ "%s: secs=%d, mins=%d, hours=%d\n", -+ __FUNCTION__, -+ tm->tm_sec, tm->tm_min, tm->tm_hour); -+ -+ buf[CCR_SEC] = BIN2BCD(tm->tm_sec); -+ buf[CCR_MIN] = BIN2BCD(tm->tm_min); -+ -+ /* set hour and 24hr bit */ -+ buf[CCR_HOUR] = BIN2BCD(tm->tm_hour) | X1205_HR_MIL; -+ -+ /* should we also set the date? */ -+ if (datetoo) { -+ dev_dbg(&client->dev, -+ "%s: mday=%d, mon=%d, year=%d, wday=%d\n", -+ __FUNCTION__, -+ tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); -+ -+ buf[CCR_MDAY] = BIN2BCD(tm->tm_mday); -+ -+ /* month, 1 - 12 */ -+ buf[CCR_MONTH] = BIN2BCD(tm->tm_mon + 1); -+ -+ /* year, since the rtc epoch*/ -+ buf[CCR_YEAR] = BIN2BCD(tm->tm_year % 100); -+ buf[CCR_WDAY] = tm->tm_wday & 0x07; -+ buf[CCR_Y2K] = BIN2BCD(tm->tm_year / 100); -+ } -+ -+ /* this sequence is required to unlock the chip */ -+ xfer = i2c_master_send(client, wel, 3); -+ if (xfer != 3) { -+ dev_err(&client->dev, "%s: wel - %d\n", __FUNCTION__, xfer); -+ return -EIO; -+ } -+ -+ xfer = i2c_master_send(client, rwel, 3); -+ if (xfer != 3) { -+ dev_err(&client->dev, "%s: rwel - %d\n", __FUNCTION__, xfer); -+ return -EIO; -+ } -+ -+ /* write register's data */ -+ for (i = 0; i < (datetoo ? 8 : 3); i++) { -+ unsigned char rdata[3] = { 0, reg_base + i, buf[i] }; -+ -+ xfer = i2c_master_send(client, rdata, 3); -+ if (xfer != 3) { -+ dev_err(&client->dev, -+ "%s: xfer=%d addr=%02x, data=%02x\n", -+ __FUNCTION__, -+ xfer, rdata[1], rdata[2]); -+ return -EIO; -+ } -+ }; -+ -+ /* disable further writes */ -+ xfer = i2c_master_send(client, diswe, 3); -+ if (xfer != 3) { -+ dev_err(&client->dev, "%s: diswe - %d\n", __FUNCTION__, xfer); -+ return -EIO; -+ } -+ -+ return 0; -+} -+ -+static int x1205_fix_osc(struct i2c_client *client) -+{ -+ int err; -+ struct rtc_time tm; -+ -+ tm.tm_hour = 0; -+ tm.tm_min = 0; -+ tm.tm_sec = 0; -+ -+ if ((err = x1205_set_datetime(client, &tm, 0, X1205_CCR_BASE)) < 0) -+ dev_err(&client->dev, -+ "unable to restart the clock\n"); -+ -+ return err; -+} -+ -+static int x1205_get_dtrim(struct i2c_client *client, int *trim) -+{ -+ unsigned char dtr; -+ static unsigned char dtr_addr[2] = { 0, X1205_REG_DTR }; -+ -+ struct i2c_msg msgs[] = { -+ { client->addr, 0, 2, dtr_addr }, /* setup read ptr */ -+ { client->addr, I2C_M_RD, 1, &dtr }, /* read dtr */ -+ }; -+ -+ /* read dtr register */ -+ if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { -+ dev_err(&client->dev, "%s: read error\n", __FUNCTION__); -+ return -EIO; -+ } -+ -+ dev_dbg(&client->dev, "%s: raw dtr=%x\n", __FUNCTION__, dtr); -+ -+ *trim = 0; -+ -+ if (dtr & X1205_DTR_DTR0) -+ *trim += 20; -+ -+ if (dtr & X1205_DTR_DTR1) -+ *trim += 10; -+ -+ if (dtr & X1205_DTR_DTR2) -+ *trim = -*trim; -+ -+ return 0; -+} -+ -+static int x1205_get_atrim(struct i2c_client *client, int *trim) -+{ -+ s8 atr; -+ static unsigned char atr_addr[2] = { 0, X1205_REG_ATR }; -+ -+ struct i2c_msg msgs[] = { -+ { client->addr, 0, 2, atr_addr }, /* setup read ptr */ -+ { client->addr, I2C_M_RD, 1, &atr }, /* read atr */ -+ }; -+ -+ /* read atr register */ -+ if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { -+ dev_err(&client->dev, "%s: read error\n", __FUNCTION__); -+ return -EIO; -+ } -+ -+ dev_dbg(&client->dev, "%s: raw atr=%x\n", __FUNCTION__, atr); -+ -+ /* atr is a two's complement value on 6 bits, -+ * perform sign extension. The formula is -+ * Catr = (atr * 0.25pF) + 11.00pF. -+ */ -+ if (atr & 0x20) -+ atr |= 0xC0; -+ -+ dev_dbg(&client->dev, "%s: raw atr=%x (%d)\n", __FUNCTION__, atr, atr); -+ -+ *trim = (atr * 250) + 11000; -+ -+ dev_dbg(&client->dev, "%s: real=%d\n", __FUNCTION__, *trim); -+ -+ return 0; -+} -+ -+static int x1205_hctosys(struct i2c_client *client) -+{ -+ int err; -+ -+ struct rtc_time tm; -+ struct timespec tv; -+ unsigned char sr; -+ -+ if ((err = x1205_get_status(client, &sr)) < 0) -+ return err; -+ -+ /* Don't set if we had a power failure */ -+ if (sr & X1205_SR_RTCF) -+ return -EINVAL; -+ -+ if ((err = x1205_get_datetime(client, &tm, X1205_CCR_BASE)) < 0) -+ return err; -+ -+ /* IMPORTANT: the RTC only stores whole seconds. It is arbitrary -+ * whether it stores the most close value or the value with partial -+ * seconds truncated. However, it is important that we use it to store -+ * the truncated value. This is because otherwise it is necessary, -+ * in an rtc sync function, to read both xtime.tv_sec and -+ * xtime.tv_nsec. On some processors (i.e. ARM), an atomic read -+ * of >32bits is not possible. So storing the most close value would -+ * slow down the sync API. So here we have the truncated value and -+ * the best guess is to add 0.5s. -+ */ -+ -+ tv.tv_nsec = NSEC_PER_SEC >> 1; -+ -+ rtc_tm_to_time(&tm, &tv.tv_sec); -+ -+ do_settimeofday(&tv); -+ -+ dev_info(&client->dev, -+ "setting the system clock to %d-%d-%d %d:%d:%d\n", -+ tm.tm_year + 1900, tm.tm_mon + 1, -+ tm.tm_mday, tm.tm_hour, tm.tm_min, -+ tm.tm_sec); -+ -+ return 0; -+} -+ -+struct x1205_limit -+{ -+ unsigned char reg; -+ unsigned char mask; -+ unsigned char min; -+ unsigned char max; -+}; -+ -+static int x1205_validate_client(struct i2c_client *client) -+{ -+ int i, xfer; -+ -+ /* Probe array. We will read the register at the specified -+ * address and check if the given bits are zero. -+ */ -+ static const unsigned char probe_zero_pattern[] = { -+ /* register, mask */ -+ X1205_REG_SR, 0x18, -+ X1205_REG_DTR, 0xF8, -+ X1205_REG_ATR, 0xC0, -+ X1205_REG_INT, 0x18, -+ X1205_REG_0, 0xFF, -+ }; -+ -+ static const struct x1205_limit probe_limits_pattern[] = { -+ /* register, mask, min, max */ -+ { X1205_REG_Y2K, 0xFF, 19, 20 }, -+ { X1205_REG_DW, 0xFF, 0, 6 }, -+ { X1205_REG_YR, 0xFF, 0, 99 }, -+ { X1205_REG_MO, 0xFF, 0, 12 }, -+ { X1205_REG_DT, 0xFF, 0, 31 }, -+ { X1205_REG_HR, 0x7F, 0, 23 }, -+ { X1205_REG_MN, 0xFF, 0, 59 }, -+ { X1205_REG_SC, 0xFF, 0, 59 }, -+ { X1205_REG_Y2K1, 0xFF, 19, 20 }, -+ { X1205_REG_Y2K0, 0xFF, 19, 20 }, -+ }; -+ -+ /* check that registers have bits a 0 where expected */ -+ for (i = 0; i < ARRAY_SIZE(probe_zero_pattern); i += 2) { -+ unsigned char buf; -+ -+ unsigned char addr[2] = { 0, probe_zero_pattern[i] }; -+ -+ struct i2c_msg msgs[2] = { -+ { client->addr, 0, 2, addr }, -+ { client->addr, I2C_M_RD, 1, &buf }, -+ }; -+ -+ xfer = i2c_transfer(client->adapter, msgs, 2); -+ if (xfer != 2) { -+ dev_err(&client->adapter->dev, -+ "%s: could not read register %x\n", -+ __FUNCTION__, addr[1]); -+ -+ return -EIO; -+ } -+ -+ if ((buf & probe_zero_pattern[i+1]) != 0) { -+ dev_err(&client->adapter->dev, -+ "%s: register=%02x, zero pattern=%d, value=%x\n", -+ __FUNCTION__, addr[1], i, buf); -+ -+ return -ENODEV; -+ } -+ } -+ -+ /* check limits (only registers with bcd values) */ -+ for (i = 0; i < ARRAY_SIZE(probe_limits_pattern); i++) { -+ unsigned char reg, value; -+ -+ unsigned char addr[2] = { 0, probe_limits_pattern[i].reg }; -+ -+ struct i2c_msg msgs[2] = { -+ { client->addr, 0, 2, addr }, -+ { client->addr, I2C_M_RD, 1, ® }, -+ }; -+ -+ xfer = i2c_transfer(client->adapter, msgs, 2); -+ -+ if (xfer != 2) { -+ dev_err(&client->adapter->dev, -+ "%s: could not read register %x\n", -+ __FUNCTION__, addr[1]); -+ -+ return -EIO; -+ } -+ -+ value = BCD2BIN(reg & probe_limits_pattern[i].mask); -+ -+ if (value > probe_limits_pattern[i].max || -+ value < probe_limits_pattern[i].min) { -+ dev_dbg(&client->adapter->dev, -+ "%s: register=%x, lim pattern=%d, value=%d\n", -+ __FUNCTION__, addr[1], i, value); -+ -+ return -ENODEV; -+ } -+ } -+ -+ return 0; -+} -+ -+static int x1205_rtc_read_alarm(struct device *dev, -+ struct rtc_wkalrm *alrm) -+{ -+ return x1205_get_datetime(to_i2c_client(dev), -+ &alrm->time, X1205_ALM0_BASE); -+} -+ -+static int x1205_rtc_set_alarm(struct device *dev, -+ struct rtc_wkalrm *alrm) -+{ -+ return x1205_set_datetime(to_i2c_client(dev), -+ &alrm->time, 1, X1205_ALM0_BASE); -+} -+ -+static int x1205_rtc_read_time(struct device *dev, -+ struct rtc_time *tm) -+{ -+ return x1205_get_datetime(to_i2c_client(dev), -+ tm, X1205_CCR_BASE); -+} -+ -+static int x1205_rtc_set_time(struct device *dev, -+ struct rtc_time *tm) -+{ -+ return x1205_set_datetime(to_i2c_client(dev), -+ tm, 1, X1205_CCR_BASE); -+} -+ -+static int x1205_rtc_set_mmss(struct device *dev, unsigned long secs) -+{ -+ int err; -+ -+ struct rtc_time new_tm, old_tm; -+ -+ if ((err = x1205_rtc_read_time(dev, &old_tm) == 0)) -+ return err; -+ -+ /* FIXME xtime.tv_nsec = old_tm.tm_sec * 10000000; */ -+ new_tm.tm_sec = secs % 60; -+ secs /= 60; -+ new_tm.tm_min = secs % 60; -+ secs /= 60; -+ new_tm.tm_hour = secs % 24; -+ -+ /* -+ * avoid writing when we're going to change the day -+ * of the month. We will retry in the next minute. -+ * This basically means that if the RTC must not drift -+ * by more than 1 minute in 11 minutes. -+ */ -+ if ((old_tm.tm_hour == 23 && old_tm.tm_min == 59) || -+ (new_tm.tm_hour == 23 && new_tm.tm_min == 59)) -+ return 1; -+ -+ return x1205_rtc_set_time(dev, &new_tm); -+} -+ -+static int x1205_rtc_proc(struct device *dev, struct seq_file *seq) -+{ -+ int err, dtrim, atrim; -+ -+ seq_printf(seq, "24hr\t\t: yes\n"); -+ -+ err = x1205_get_dtrim(to_i2c_client(dev), &dtrim); -+ if (err == 0) -+ seq_printf(seq, "digital_trim\t: %d ppm\n", dtrim); -+ -+ err = x1205_get_atrim(to_i2c_client(dev), &atrim); -+ if (err == 0) -+ seq_printf(seq, "analog_trim\t: %d.%02d pF\n", -+ atrim / 1000, atrim % 1000); -+ return 0; -+} -+ -+static struct rtc_class_ops x1205_rtc_ops = { -+ .proc = x1205_rtc_proc, -+ .read_time = x1205_rtc_read_time, -+ .set_time = x1205_rtc_set_time, -+ .read_alarm = x1205_rtc_read_alarm, -+ .set_alarm = x1205_rtc_set_alarm, -+ .set_mmss = x1205_rtc_set_mmss, -+}; -+ -+static ssize_t x1205_sysfs_show_atrim(struct device *dev, -+ struct device_attribute *attr, char *buf) -+{ -+ int atrim; -+ -+ if (x1205_get_atrim(to_i2c_client(dev), &atrim) == 0) { -+ return sprintf(buf, "%d.%02d pF\n", -+ atrim / 1000, atrim % 1000); } -+ return 0; -+} -+static DEVICE_ATTR(atrim, S_IRUGO, x1205_sysfs_show_atrim, NULL); -+ -+static ssize_t x1205_sysfs_show_dtrim(struct device *dev, -+ struct device_attribute *attr, char *buf) -+{ -+ int dtrim; -+ -+ if (x1205_get_dtrim(to_i2c_client(dev), &dtrim) == 0) { -+ return sprintf(buf, "%d ppm\n", dtrim); -+ } -+ return 0; -+} -+static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL); -+ -+ -+static int x1205_attach(struct i2c_adapter *adapter) -+{ -+ dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); -+ -+ return i2c_probe(adapter, &addr_data, x1205_probe); -+} -+ -+static int x1205_probe(struct i2c_adapter *adapter, int address, int kind) -+{ -+ int err = 0; -+ unsigned char sr; -+ struct i2c_client *client; -+ struct rtc_device *rtc; -+ -+ dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); -+ -+ if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { -+ err = -ENODEV; -+ goto exit; -+ } -+ -+ if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) { -+ err = -ENOMEM; -+ goto exit; -+ } -+ -+ /* I2C client */ -+ client->addr = address; -+ client->driver = &x1205_driver; -+ client->adapter = adapter; -+ -+ strlcpy(client->name, x1205_driver.name, I2C_NAME_SIZE); -+ -+ /* Verify the chip is really an X1205 */ -+ if (kind < 0) { -+ if (x1205_validate_client(client) < 0) { -+ err = -ENODEV; -+ goto exit_kfree; -+ } -+ } -+ -+ /* Inform the i2c layer */ -+ if ((err = i2c_attach_client(client))) -+ goto exit_kfree; -+ -+ dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n"); -+ -+ rtc = rtc_device_register(x1205_driver.name, &client->dev, -+ &x1205_rtc_ops, THIS_MODULE); -+ -+ if (IS_ERR(rtc)) { -+ err = PTR_ERR(rtc); -+ dev_err(&client->dev, -+ "unable to register the class device\n"); -+ goto exit_detach; -+ } -+ -+ i2c_set_clientdata(client, rtc); -+ -+ /* Check for power failures and eventualy enable the osc */ -+ if ((err = x1205_get_status(client, &sr)) == 0) { -+ if (sr & X1205_SR_RTCF) { -+ dev_err(&client->dev, -+ "power failure detected, " -+ "please set the clock\n"); -+ udelay(50); -+ x1205_fix_osc(client); -+ } -+ } -+ else -+ dev_err(&client->dev, "couldn't read status\n"); -+ -+ /* If requested, set the system time */ -+ if (hctosys) { -+ if ((err = x1205_hctosys(client)) < 0) -+ dev_err(&client->dev, -+ "unable to set the system clock\n"); -+ } -+ -+ device_create_file(&client->dev, &dev_attr_atrim); -+ device_create_file(&client->dev, &dev_attr_dtrim); -+ -+ return 0; -+ -+exit_detach: -+ i2c_detach_client(client); -+ -+exit_kfree: -+ kfree(client); -+ -+exit: -+ return err; -+} -+ -+static int x1205_detach(struct i2c_client *client) -+{ -+ int err; -+ struct rtc_device *rtc = i2c_get_clientdata(client); -+ -+ dev_dbg(&client->dev, "%s\n", __FUNCTION__); -+ -+ if (rtc) -+ rtc_device_unregister(rtc); -+ -+ if ((err = i2c_detach_client(client))) -+ return err; -+ -+ kfree(client); -+ -+ return 0; -+} -+ -+static int __init x1205_init(void) -+{ -+ return i2c_add_driver(&x1205_driver); -+} -+ -+static void __exit x1205_exit(void) -+{ -+ i2c_del_driver(&x1205_driver); -+} -+ -+MODULE_AUTHOR( -+ "Karen Spearel <kas11@tampabay.rr.com>, " -+ "Alessandro Zummo <a.zummo@towertech.it>"); -+MODULE_DESCRIPTION("Xicor/Intersil X1205 RTC driver"); -+MODULE_LICENSE("GPL"); -+MODULE_VERSION(DRV_VERSION); -+ -+module_init(x1205_init); -+module_exit(x1205_exit); ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-test.c 2006-01-04 01:27:19.000000000 +0100 -@@ -0,0 +1,189 @@ -+/* -+ * An RTC test device/driver -+ * Copyright (C) 2005 Tower Technologies -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * -+ * 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. -+ */ -+ -+#include <linux/module.h> -+#include <linux/err.h> -+#include <linux/rtc.h> -+#include <linux/platform_device.h> -+ -+static int test_rtc_read_alarm(struct device *dev, -+ struct rtc_wkalrm *alrm) -+{ -+ return 0; -+} -+ -+static int test_rtc_set_alarm(struct device *dev, -+ struct rtc_wkalrm *alrm) -+{ -+ return 0; -+} -+ -+static int test_rtc_read_time(struct device *dev, -+ struct rtc_time *tm) -+{ -+ rtc_time_to_tm(get_seconds(), tm); -+ return 0; -+} -+ -+static int test_rtc_set_time(struct device *dev, -+ struct rtc_time *tm) -+{ -+ return 0; -+} -+ -+static int test_rtc_set_mmss(struct device *dev, unsigned long secs) -+{ -+ return 0; -+} -+ -+static int test_rtc_proc(struct device *dev, struct seq_file *seq) -+{ -+ struct platform_device *plat_dev = to_platform_device(dev); -+ -+ seq_printf(seq, "24hr\t\t: yes\n"); -+ seq_printf(seq, "test\t\t: yes\n"); -+ seq_printf(seq, "id\t\t: %d\n", plat_dev->id); -+ -+ return 0; -+} -+ -+static int test_rtc_ioctl(struct device *dev, unsigned int cmd, -+ unsigned long arg) -+{ -+ /* We do support interrupts, they're generated -+ * using the sysfs interface. -+ */ -+ switch (cmd) { -+ case RTC_PIE_ON: -+ case RTC_PIE_OFF: -+ case RTC_UIE_ON: -+ case RTC_UIE_OFF: -+ case RTC_AIE_ON: -+ case RTC_AIE_OFF: -+ return 0; -+ -+ default: -+ return -EINVAL; -+ } -+} -+ -+static struct rtc_class_ops test_rtc_ops = { -+ .proc = test_rtc_proc, -+ .read_time = test_rtc_read_time, -+ .set_time = test_rtc_set_time, -+ .read_alarm = test_rtc_read_alarm, -+ .set_alarm = test_rtc_set_alarm, -+ .set_mmss = test_rtc_set_mmss, -+ .ioctl = test_rtc_ioctl, -+}; -+ -+static ssize_t test_irq_show(struct device *dev, -+ struct device_attribute *attr, char *buf) -+{ -+ return sprintf(buf, "%d\n", 42); -+} -+static ssize_t test_irq_store(struct device *dev, -+ struct device_attribute *attr, -+ const char *buf, size_t count) -+{ -+ int retval; -+ struct platform_device *plat_dev = to_platform_device(dev); -+ struct rtc_device *rtc = platform_get_drvdata(plat_dev); -+ -+ retval = count; -+ if (strncmp(buf, "tick", 4) == 0) -+ rtc_update_irq(&rtc->class_dev, 1, RTC_PF | RTC_IRQF); -+ else if (strncmp(buf, "alarm", 5) == 0) -+ rtc_update_irq(&rtc->class_dev, 1, RTC_AF | RTC_IRQF); -+ else if (strncmp(buf, "update", 6) == 0) -+ rtc_update_irq(&rtc->class_dev, 1, RTC_UF | RTC_IRQF); -+ else -+ retval = -EINVAL; -+ -+ return retval; -+} -+static DEVICE_ATTR(irq, S_IRUGO | S_IWUSR, test_irq_show, test_irq_store); -+ -+static int test_probe(struct platform_device *plat_dev) -+{ -+ int err; -+ struct rtc_device *rtc = rtc_device_register("test", &plat_dev->dev, -+ &test_rtc_ops, THIS_MODULE); -+ if (IS_ERR(rtc)) { -+ err = PTR_ERR(rtc); -+ dev_err(&plat_dev->dev, -+ "unable to register the class device\n"); -+ return err; -+ } -+ device_create_file(&plat_dev->dev, &dev_attr_irq); -+ -+ platform_set_drvdata(plat_dev, rtc); -+ -+ return 0; -+} -+ -+static int test_remove(struct platform_device *plat_dev) -+{ -+ struct rtc_device *rtc = platform_get_drvdata(plat_dev); -+ -+ rtc_device_unregister(rtc); -+ device_remove_file(&plat_dev->dev, &dev_attr_irq); -+ -+ return 0; -+} -+ -+static void test_release(struct device * dev) -+{ -+} -+ -+struct platform_device test_dev_zero = { -+ .name = "rtc-test", -+ .id = 0, -+ .dev.release = test_release, -+}; -+ -+struct platform_device test_dev_one = { -+ .name = "rtc-test", -+ .id = 1, -+ .dev.release = test_release, -+}; -+ -+struct platform_driver test_drv = { -+ .probe = test_probe, -+ .remove = test_remove, -+ .driver = { -+ .name = "rtc-test", -+ .owner = THIS_MODULE, -+ }, -+}; -+ -+static int __init test_init(void) -+{ -+ platform_device_register(&test_dev_zero); -+ platform_device_register(&test_dev_one); -+ platform_driver_register(&test_drv); -+ -+ return 0; -+} -+ -+static void __exit test_exit(void) -+{ -+ platform_driver_unregister(&test_drv); -+ platform_device_unregister(&test_dev_zero); -+ platform_device_unregister(&test_dev_one); -+} -+ -+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -+MODULE_DESCRIPTION("RTC test driver/device"); -+MODULE_LICENSE("GPL"); -+ -+module_init(test_init); -+module_exit(test_exit); ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nslu2/drivers/rtc/rtc-ds1672.c 2006-01-04 01:27:21.000000000 +0100 -@@ -0,0 +1,266 @@ -+/* -+ * An rtc/i2c driver for the Dallas DS1672 -+ * Copyright 2005 Alessandro Zummo -+ * -+ * 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. -+ */ -+ -+#include <linux/module.h> -+#include <linux/i2c.h> -+#include <linux/rtc.h> -+ -+#define DRV_VERSION "0.1" -+ -+/* Addresses to scan: none. This chip cannot be detected. */ -+static unsigned short normal_i2c[] = { I2C_CLIENT_END }; -+ -+/* Insmod parameters */ -+I2C_CLIENT_INSMOD; -+I2C_CLIENT_MODULE_PARM(hctosys, -+ "Set the system time from the hardware clock upon initialization"); -+ -+/* Registers */ -+ -+#define DS1672_REG_CNT_BASE 0 -+#define DS1672_REG_CONTROL 4 -+#define DS1672_REG_TRICKLE 5 -+ -+ -+/* Prototypes */ -+static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind); -+ -+/* -+ * In the routines that deal directly with the ds1672 hardware, we use -+ * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch -+ * Epoch is initialized as 2000. Time is set to UTC. -+ */ -+static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) -+{ -+ unsigned long time; -+ unsigned char buf[4]; -+ -+ dev_dbg(&client->dev, -+ "%s: raw read data - counters=%02x,%02x,%02x,%02x\n" -+ __FUNCTION__, -+ buf[0], buf[1], buf[2], buf[3]); -+ -+ time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; -+ -+ rtc_time_to_tm(time, tm); -+ -+ dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, " -+ "mday=%d, mon=%d, year=%d, wday=%d\n", -+ __FUNCTION__, -+ tm->tm_sec, tm->tm_min, tm->tm_hour, -+ tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); -+ -+ return 0; -+} -+ -+static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs) -+{ -+ int xfer; -+ unsigned char buf[5]; -+ -+ buf[0] = DS1672_REG_CNT_BASE; -+ buf[1] = secs & 0x000000FF; -+ buf[2] = (secs & 0x0000FF00) >> 8; -+ buf[3] = (secs & 0x00FF0000) >> 16; -+ buf[4] = (secs & 0xFF000000) >> 24; -+ -+ xfer = i2c_master_send(client, buf, 5); -+ if (xfer != 5) { -+ dev_err(&client->dev, "%s: send: %d\n", __FUNCTION__, xfer); -+ return -EIO; -+ } -+ -+ return 0; -+} -+ -+static int ds1672_set_datetime(struct i2c_client *client, struct rtc_time *tm) -+{ -+ unsigned long secs; -+ -+ dev_dbg(&client->dev, -+ "%s: secs=%d, mins=%d, hours=%d, ", -+ "mday=%d, mon=%d, year=%d, wday=%d\n", -+ __FUNCTION__, -+ tm->tm_sec, tm->tm_min, tm->tm_hour, -+ tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); -+ -+ rtc_tm_to_time(tm, &secs); -+ -+ return ds1672_set_mmss(client, secs); -+} -+ -+static int ds1672_hctosys(struct i2c_client *client) -+{ -+ int err; -+ struct rtc_time tm; -+ struct timespec tv; -+ -+ if ((err = ds1672_get_datetime(client, &tm)) != 0) -+ return err; -+ -+ /* IMPORTANT: the RTC only stores whole seconds. It is arbitrary -+ * whether it stores the most close value or the value with partial -+ * seconds truncated. However, it is important that we use it to store -+ * the truncated value. This is because otherwise it is necessary, -+ * in an rtc sync function, to read both xtime.tv_sec and -+ * xtime.tv_nsec. On some processors (i.e. ARM), an atomic read -+ * of >32bits is not possible. So storing the most close value would -+ * slow down the sync API. So here we have the truncated value and -+ * the best guess is to add 0.5s. -+ */ -+ -+ tv.tv_nsec = NSEC_PER_SEC >> 1; -+ -+ rtc_tm_to_time(&tm, &tv.tv_sec); -+ -+ do_settimeofday(&tv); -+ -+ dev_info(&client->dev, -+ "setting the system clock to %d-%02d-%02d %02d:%02d:%02d\n", -+ tm.tm_year + 1900, tm.tm_mon + 1, -+ tm.tm_mday, tm.tm_hour, tm.tm_min, -+ tm.tm_sec); -+ -+ return 0; -+} -+ -+static int ds1672_rtc_read_time(struct device *dev, struct rtc_time *tm) -+{ -+ return ds1672_get_datetime(to_i2c_client(dev), tm); -+} -+ -+static int ds1672_rtc_set_time(struct device *dev, struct rtc_time *tm) -+{ -+ return ds1672_set_datetime(to_i2c_client(dev), tm); -+} -+ -+static int ds1672_rtc_set_mmss(struct device *dev, unsigned long secs) -+{ -+ return ds1672_set_mmss(to_i2c_client(dev), secs); -+} -+ -+static struct rtc_class_ops ds1672_rtc_ops = { -+ .read_time = ds1672_rtc_read_time, -+ .set_time = ds1672_rtc_set_time, -+ .set_mmss = ds1672_rtc_set_mmss, -+}; -+ -+static int ds1672_attach(struct i2c_adapter *adapter) -+{ -+ dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); -+ -+ return i2c_probe(adapter, &addr_data, ds1672_probe); -+} -+ -+static int ds1672_detach(struct i2c_client *client) -+{ -+ int err; -+ struct rtc_device *rtc = i2c_get_clientdata(client); -+ -+ dev_dbg(&client->dev, "%s\n", __FUNCTION__); -+ -+ if (rtc) -+ rtc_device_unregister(rtc); -+ -+ if ((err = i2c_detach_client(client))) -+ return err; -+ -+ kfree(client); -+ -+ return 0; -+} -+ -+static struct i2c_driver ds1672_driver = { -+ .owner = THIS_MODULE, -+ .name = "ds1672", -+ .flags = I2C_DF_NOTIFY, -+ .attach_adapter = &ds1672_attach, -+ .detach_client = &ds1672_detach, -+}; -+ -+static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind) -+{ -+ int err = 0; -+ struct i2c_client *client; -+ struct rtc_device *rtc; -+ -+ dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); -+ -+ if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { -+ err = -ENODEV; -+ goto exit; -+ } -+ -+ if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) { -+ err = -ENOMEM; -+ goto exit; -+ } -+ -+ /* I2C client */ -+ client->addr = address; -+ client->driver = &ds1672_driver; -+ client->adapter = adapter; -+ -+ strlcpy(client->name, ds1672_driver.name, I2C_NAME_SIZE); -+ -+ /* Inform the i2c layer */ -+ if ((err = i2c_attach_client(client))) -+ goto exit_kfree; -+ -+ dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n"); -+ -+ rtc = rtc_device_register(ds1672_driver.name, &client->dev, -+ &ds1672_rtc_ops, THIS_MODULE); -+ -+ if (IS_ERR(rtc)) { -+ err = PTR_ERR(rtc); -+ dev_err(&client->dev, -+ "unable to register the class device\n"); -+ goto exit_detach; -+ } -+ -+ i2c_set_clientdata(client, rtc); -+ -+ /* If requested, set the system time */ -+ if (hctosys) { -+ if ((err = ds1672_hctosys(client)) < 0) -+ dev_err(&client->dev, -+ "unable to set the system clock\n"); -+ } -+ -+ return 0; -+ -+exit_detach: -+ i2c_detach_client(client); -+ -+exit_kfree: -+ kfree(client); -+ -+exit: -+ return err; -+} -+ -+static int __init ds1672_init(void) -+{ -+ return i2c_add_driver(&ds1672_driver); -+} -+ -+static void __exit ds1672_exit(void) -+{ -+ i2c_del_driver(&ds1672_driver); -+} -+ -+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -+MODULE_DESCRIPTION("Dallas/Maxim DS1672 timekeeper driver"); -+MODULE_LICENSE("GPL"); -+MODULE_VERSION(DRV_VERSION); -+ -+module_init(ds1672_init); -+module_exit(ds1672_exit); diff --git a/packages/linux/nas100d-kernel/2.6.15/50-nas100d-arch.patch b/packages/linux/nas100d-kernel/2.6.15/50-nas100d-arch.patch deleted file mode 100644 index cb3eac2433..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/50-nas100d-arch.patch +++ /dev/null @@ -1,453 +0,0 @@ -http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=3215/1 - -Iomega NAS 100d (MACH_NAS100D) machine support - -This patch adds support for a new arm/ixp4xx machine - the Iomega NAS -100d network attached storage product. The NAS100D is a consumer -device containing a 266MHz Intel IXP420 processor, 16MB of flash, 64MB -of RAM, a 160Gb internal IDE hard disk, and 802.11b/g wireless on an -Atheros mini-PCI card. - -Work on porting the latest 2.6.x kernel to this device is being done by -the NSLU2-Linux project (the same team who maintains the port to the -Linksys NSLU2 device). In particular, the majority of this patch was -authored by Alessandro Zummo, based on the work done for MACH_NSLU2 -support by the NSLU2-Linux core team of developers. - -MACH_NAS100D (as implemented by this patch) can be enabled in jumbo -ixp4xx kernels without any affect on the other machines supported by -that kernel. - -This patch applies cleanly against 2.6.15-rc7 and should be trivial to -apply to later kernel versions. It does not depend upon any other -patches. - -Modified files (and number of lines inserted): -arch/arm/mach-ixp4xx/Kconfig | 8 -arch/arm/mach-ixp4xx/Makefile | 1 -include/asm-arm/arch-ixp4xx/hardware.h | 1 -include/asm-arm/arch-ixp4xx/irqs.h | 9 -include/asm-arm/arch-ixp4xx/nas100d.h | 75 -arch/arm/mach-ixp4xx/nas100d-pci.c | 77 -arch/arm/mach-ixp4xx/nas100d-power.c | 69 -arch/arm/mach-ixp4xx/nas100d-setup.c | 133 - -Signed-off-by: Rod Whitby <rod@whitby.id.au> -Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> - ---- linux-2.6.15-rc7/arch/arm/mach-ixp4xx/Kconfig 2005-12-27 22:29:00.000000000 +0100 -+++ linux-2.6.15-rc7/arch/arm/mach-ixp4xx/Kconfig 2005-12-27 22:29:52.000000000 +0100 -@@ -71,6 +71,14 @@ config ARCH_PRPMC1100 - PrPCM1100 Processor Mezanine Module. For more information on - this platform, see <file:Documentation/arm/IXP4xx>. - -+config MACH_NAS100D -+ bool -+ prompt "NAS100D" -+ help -+ Say 'Y' here if you want your kernel to support Iomega's -+ NAS 100d device. For more information on this platform, -+ see http://www.nslu2-linux.org/wiki/NAS100d/HomePage -+ - # - # Avila and IXDP share the same source for now. Will change in future - # ---- linux-2.6.15-rc7/arch/arm/mach-ixp4xx/Makefile 2005-12-27 22:29:00.000000000 +0100 -+++ linux-2.6.15-rc7/arch/arm/mach-ixp4xx/Makefile 2005-12-27 22:30:37.000000000 +0100 -@@ -9,4 +9,5 @@ obj-$(CONFIG_MACH_IXDPG425) += ixdpg425- - obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o coyote-setup.o - obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o - obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o -+obj-$(CONFIG_MACH_NAS100D) += nas100d-pci.o nas100d-setup.o nas100d-power.o - ---- linux-2.6.15-rc7/include/asm-arm/arch-ixp4xx/hardware.h 2005-12-27 22:29:18.000000000 +0100 -+++ linux-2.6.15-rc7/include/asm-arm/arch-ixp4xx/hardware.h 2005-12-27 22:31:08.000000000 +0100 -@@ -45,5 +45,6 @@ extern unsigned int processor_id; - #include "coyote.h" - #include "prpmc1100.h" - #include "nslu2.h" -+#include "nas100d.h" - - #endif /* _ASM_ARCH_HARDWARE_H */ ---- linux-2.6.15-rc7/include/asm-arm/arch-ixp4xx/irqs.h 2005-12-27 22:29:18.000000000 +0100 -+++ linux-2.6.15-rc7/include/asm-arm/arch-ixp4xx/irqs.h 2005-12-27 22:29:52.000000000 +0100 -@@ -100,4 +100,13 @@ - #define IRQ_NSLU2_PCI_INTB IRQ_IXP4XX_GPIO10 - #define IRQ_NSLU2_PCI_INTC IRQ_IXP4XX_GPIO9 - -+/* -+ * NAS100D board IRQs -+ */ -+#define IRQ_NAS100D_PCI_INTA IRQ_IXP4XX_GPIO11 -+#define IRQ_NAS100D_PCI_INTB IRQ_IXP4XX_GPIO10 -+#define IRQ_NAS100D_PCI_INTC IRQ_IXP4XX_GPIO9 -+#define IRQ_NAS100D_PCI_INTD IRQ_IXP4XX_GPIO8 -+#define IRQ_NAS100D_PCI_INTE IRQ_IXP4XX_GPIO7 -+ - #endif ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15-rc7/include/asm-arm/arch-ixp4xx/nas100d.h 2005-11-12 14:24:14.000000000 +0100 -@@ -0,0 +1,75 @@ -+/* -+ * include/asm-arm/arch-ixp4xx/nas100d.h -+ * -+ * NAS100D platform specific definitions -+ * -+ * Copyright (c) 2005 Tower Technologies -+ * -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * -+ * based on ixdp425.h: -+ * Copyright 2004 (c) MontaVista, Software, Inc. -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+#ifndef __ASM_ARCH_HARDWARE_H__ -+#error "Do not include this directly, instead #include <asm/hardware.h>" -+#endif -+ -+#define NAS100D_FLASH_BASE IXP4XX_EXP_BUS_CS0_BASE_PHYS -+#define NAS100D_FLASH_SIZE IXP4XX_EXP_BUS_CSX_REGION_SIZE -+ -+#define NAS100D_SDA_PIN 6 -+#define NAS100D_SCL_PIN 5 -+ -+/* -+ * NAS100D PCI IRQs -+ */ -+#define NAS100D_PCI_MAX_DEV 3 -+#define NAS100D_PCI_IRQ_LINES 3 -+ -+ -+/* PCI controller GPIO to IRQ pin mappings */ -+#define NAS100D_PCI_INTA_PIN 11 -+#define NAS100D_PCI_INTB_PIN 10 -+#define NAS100D_PCI_INTC_PIN 9 -+#define NAS100D_PCI_INTD_PIN 8 -+#define NAS100D_PCI_INTE_PIN 7 -+ -+/* GPIO */ -+ -+#define NAS100D_GPIO0 0 -+#define NAS100D_GPIO1 1 -+#define NAS100D_GPIO2 2 -+#define NAS100D_GPIO3 3 -+#define NAS100D_GPIO4 4 -+#define NAS100D_GPIO5 5 -+#define NAS100D_GPIO6 6 -+#define NAS100D_GPIO7 7 -+#define NAS100D_GPIO8 8 -+#define NAS100D_GPIO9 9 -+#define NAS100D_GPIO10 10 -+#define NAS100D_GPIO11 11 -+#define NAS100D_GPIO12 12 -+#define NAS100D_GPIO13 13 -+#define NAS100D_GPIO14 14 -+#define NAS100D_GPIO15 15 -+ -+ -+/* Buttons */ -+ -+#define NAS100D_PB_GPIO NAS100D_GPIO14 -+#define NAS100D_RB_GPIO NAS100D_GPIO4 -+#define NAS100D_PO_GPIO NAS100D_GPIO12 /* power off */ -+ -+#define NAS100D_PB_IRQ IRQ_IXP4XX_GPIO14 -+#define NAS100D_RB_IRQ IRQ_IXP4XX_GPIO4 -+ -+/* -+#define NAS100D_PB_BM (1L << NAS100D_PB_GPIO) -+#define NAS100D_PO_BM (1L << NAS100D_PO_GPIO) -+#define NAS100D_RB_BM (1L << NAS100D_RB_GPIO) -+*/ ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15-rc7/arch/arm/mach-ixp4xx/nas100d-pci.c 2005-11-12 14:24:14.000000000 +0100 -@@ -0,0 +1,77 @@ -+/* -+ * arch/arm/mach-ixp4xx/nas100d-pci.c -+ * -+ * NAS 100d board-level PCI initialization -+ * -+ * based on ixdp425-pci.c: -+ * Copyright (C) 2002 Intel Corporation. -+ * Copyright (C) 2003-2004 MontaVista Software, Inc. -+ * -+ * Maintainer: http://www.nslu2-linux.org/ -+ * -+ * 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/config.h> -+#include <linux/pci.h> -+#include <linux/init.h> -+ -+#include <asm/mach/pci.h> -+#include <asm/mach-types.h> -+ -+void __init nas100d_pci_preinit(void) -+{ -+ set_irq_type(IRQ_NAS100D_PCI_INTA, IRQT_LOW); -+ set_irq_type(IRQ_NAS100D_PCI_INTB, IRQT_LOW); -+ set_irq_type(IRQ_NAS100D_PCI_INTC, IRQT_LOW); -+ set_irq_type(IRQ_NAS100D_PCI_INTD, IRQT_LOW); -+ set_irq_type(IRQ_NAS100D_PCI_INTE, IRQT_LOW); -+ -+ gpio_line_isr_clear(NAS100D_PCI_INTA_PIN); -+ gpio_line_isr_clear(NAS100D_PCI_INTB_PIN); -+ gpio_line_isr_clear(NAS100D_PCI_INTC_PIN); -+ gpio_line_isr_clear(NAS100D_PCI_INTD_PIN); -+ gpio_line_isr_clear(NAS100D_PCI_INTE_PIN); -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init nas100d_map_irq(struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ static int pci_irq_table[NAS100D_PCI_MAX_DEV][NAS100D_PCI_IRQ_LINES] = -+ { -+ { IRQ_NAS100D_PCI_INTA, -1, -1 }, -+ { IRQ_NAS100D_PCI_INTB, -1, -1 }, -+ { IRQ_NAS100D_PCI_INTC, IRQ_NAS100D_PCI_INTD, IRQ_NAS100D_PCI_INTE }, -+ }; -+ -+ int irq = -1; -+ -+ if (slot >= 1 && slot <= NAS100D_PCI_MAX_DEV && -+ pin >= 1 && pin <= NAS100D_PCI_IRQ_LINES) -+ irq = pci_irq_table[slot-1][pin-1]; -+ -+ return irq; -+} -+ -+struct hw_pci __initdata nas100d_pci = { -+ .nr_controllers = 1, -+ .preinit = nas100d_pci_preinit, -+ .swizzle = pci_std_swizzle, -+ .setup = ixp4xx_setup, -+ .scan = ixp4xx_scan_bus, -+ .map_irq = nas100d_map_irq, -+}; -+ -+int __init nas100d_pci_init(void) -+{ -+ if (machine_is_nas100d()) -+ pci_common_init(&nas100d_pci); -+ -+ return 0; -+} -+ -+subsys_initcall(nas100d_pci_init); ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15-rc7/arch/arm/mach-ixp4xx/nas100d-power.c 2005-11-12 14:24:14.000000000 +0100 -@@ -0,0 +1,69 @@ -+/* -+ * arch/arm/mach-ixp4xx/nas100d-power.c -+ * -+ * NAS 100d Power/Reset driver -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * -+ * based on nas100d-io.c -+ * Copyright (C) 2004 Karen Spearel -+ * -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * Maintainers: http://www.nslu2-linux.org/ -+ * -+ * 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/module.h> -+#include <linux/reboot.h> -+#include <linux/interrupt.h> -+ -+#include <asm/mach-types.h> -+ -+extern void ctrl_alt_del(void); -+ -+static irqreturn_t nas100d_reset_handler(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ /* Signal init to do the ctrlaltdel action, this will bypass init if -+ * it hasn't started and do a kernel_restart. -+ */ -+ ctrl_alt_del(); -+ -+ return IRQ_HANDLED; -+} -+ -+static int __init nas100d_power_init(void) -+{ -+ if (!(machine_is_nas100d())) -+ return 0; -+ -+ set_irq_type(NAS100D_RB_IRQ, IRQT_LOW); -+ -+ gpio_line_isr_clear(NAS100D_RB_GPIO); -+ -+ if (request_irq(NAS100D_RB_IRQ, &nas100d_reset_handler, -+ SA_INTERRUPT, "NAS100D reset button", NULL) < 0) { -+ -+ printk(KERN_DEBUG "Reset Button IRQ %d not available\n", -+ NAS100D_RB_IRQ); -+ -+ return -EIO; -+ } -+ -+ return 0; -+} -+ -+static void __exit nas100d_power_exit(void) -+{ -+ free_irq(NAS100D_RB_IRQ, NULL); -+} -+ -+module_init(nas100d_power_init); -+module_exit(nas100d_power_exit); -+ -+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -+MODULE_DESCRIPTION("NAS100D Power/Reset driver"); -+MODULE_LICENSE("GPL"); ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15-rc7/arch/arm/mach-ixp4xx/nas100d-setup.c 2005-11-12 14:24:14.000000000 +0100 -@@ -0,0 +1,133 @@ -+/* -+ * arch/arm/mach-ixp4xx/nas100d-setup.c -+ * -+ * NAS 100d board-setup -+ * -+ * based ixdp425-setup.c: -+ * Copyright (C) 2003-2004 MontaVista Software, Inc. -+ * -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * Author: Rod Whitby <rod@whitby.id.au> -+ * Maintainers: http://www.nslu2-linux.org/ -+ * -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/serial.h> -+#include <linux/serial_8250.h> -+ -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <asm/mach/flash.h> -+ -+static struct flash_platform_data nas100d_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource nas100d_flash_resource = { -+ .start = NAS100D_FLASH_BASE, -+ .end = NAS100D_FLASH_BASE + NAS100D_FLASH_SIZE, -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device nas100d_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev.platform_data = &nas100d_flash_data, -+ .num_resources = 1, -+ .resource = &nas100d_flash_resource, -+}; -+ -+static struct ixp4xx_i2c_pins nas100d_i2c_gpio_pins = { -+ .sda_pin = NAS100D_SDA_PIN, -+ .scl_pin = NAS100D_SCL_PIN, -+}; -+ -+static struct platform_device nas100d_i2c_controller = { -+ .name = "IXP4XX-I2C", -+ .id = 0, -+ .dev.platform_data = &nas100d_i2c_gpio_pins, -+ .num_resources = 0, -+}; -+ -+static struct resource nas100d_uart_resources[] = { -+ { -+ .start = IXP4XX_UART1_BASE_PHYS, -+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .start = IXP4XX_UART2_BASE_PHYS, -+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ } -+}; -+ -+static struct plat_serial8250_port nas100d_uart_data[] = { -+ { -+ .mapbase = IXP4XX_UART1_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART1, -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { -+ .mapbase = IXP4XX_UART2_BASE_PHYS, -+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, -+ .irq = IRQ_IXP4XX_UART2, -+ .flags = UPF_BOOT_AUTOCONF, -+ .iotype = UPIO_MEM, -+ .regshift = 2, -+ .uartclk = IXP4XX_UART_XTAL, -+ }, -+ { } -+}; -+ -+static struct platform_device nas100d_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev.platform_data = nas100d_uart_data, -+ .num_resources = 2, -+ .resource = nas100d_uart_resources, -+}; -+ -+static struct platform_device *nas100d_devices[] __initdata = { -+ &nas100d_i2c_controller, -+ &nas100d_flash, -+ &nas100d_uart, -+}; -+ -+static void nas100d_power_off(void) -+{ -+ /* This causes the box to drop the power and go dead. */ -+ -+ /* enable the pwr cntl gpio */ -+ gpio_line_config(NAS100D_PO_GPIO, IXP4XX_GPIO_OUT); -+ -+ /* do the deed */ -+ gpio_line_set(NAS100D_PO_GPIO, IXP4XX_GPIO_HIGH); -+} -+ -+static void __init nas100d_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ pm_power_off = nas100d_power_off; -+ -+ platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices)); -+} -+ -+MACHINE_START(NAS100D, "Iomega NAS 100d") -+ /* Maintainer: www.nslu2-linux.org */ -+ .phys_ram = PHYS_OFFSET, -+ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, -+ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, -+ .boot_params = 0x00000100, -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .timer = &ixp4xx_timer, -+ .init_machine = nas100d_init, -+MACHINE_END diff --git a/packages/linux/nas100d-kernel/2.6.15/60-nas100d-i2c.patch b/packages/linux/nas100d-kernel/2.6.15/60-nas100d-i2c.patch deleted file mode 100644 index 5dfed57c0e..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/60-nas100d-i2c.patch +++ /dev/null @@ -1,531 +0,0 @@ - drivers/i2c/chips/Kconfig | 9 - drivers/i2c/chips/Makefile | 1 - drivers/i2c/chips/pcf8563.c | 466 ++++++++++++++++++++++++++++++++++++++++++++ - include/linux/pcf8563.h | 27 ++ - 4 files changed, 503 insertions(+) - ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nas100d/drivers/i2c/chips/pcf8563.c 2005-11-22 17:32:35.000000000 +0100 -@@ -0,0 +1,466 @@ -+/* -+ * pcf8563.c - An i2c driver for the Philips PCF8563 RTC -+ * Copyright 2005 Tower Technologies -+ * -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * Maintainers: http://www.nslu2-linux.org/ -+ * -+ * based on the other drivers in this same directory. -+ * -+ * http://www.semiconductors.philips.com/acrobat/datasheets/PCF8563-04.pdf -+ * -+ * 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. -+ */ -+ -+#include <linux/module.h> -+#include <linux/init.h> -+#include <linux/slab.h> -+#include <linux/i2c.h> -+#include <linux/string.h> -+#include <linux/bcd.h> -+#include <linux/rtc.h> -+#include <linux/list.h> -+ -+#include <linux/pcf8563.h> -+ -+#define DRV_VERSION "0.3.4" -+ -+/* Addresses to scan */ -+static unsigned short normal_i2c[] = { 0x51, I2C_CLIENT_END }; -+ -+/* Module parameters */ -+I2C_CLIENT_INSMOD; -+I2C_CLIENT_MODULE_PARM(hctosys, -+ "Set the system time from the hardware clock upon initialization"); -+ -+#define PCF8563_REG_ST1 0x00 /* status */ -+#define PCF8563_REG_ST2 0x01 -+ -+#define PCF8563_REG_SC 0x02 /* datetime */ -+#define PCF8563_REG_MN 0x03 -+#define PCF8563_REG_HR 0x04 -+#define PCF8563_REG_DM 0x05 -+#define PCF8563_REG_DW 0x06 -+#define PCF8563_REG_MO 0x07 -+#define PCF8563_REG_YR 0x08 -+ -+#define PCF8563_REG_AMN 0x09 /* alarm */ -+#define PCF8563_REG_AHR 0x0A -+#define PCF8563_REG_ADM 0x0B -+#define PCF8563_REG_ADW 0x0C -+ -+#define PCF8563_REG_CLKO 0x0D /* clock out */ -+#define PCF8563_REG_TMRC 0x0E /* timer control */ -+#define PCF8563_REG_TMR 0x0F /* timer */ -+ -+#define PCF8563_SC_LV 0x80 /* low voltage */ -+#define PCF8563_MO_C 0x80 /* century */ -+ -+/* Prototypes */ -+static int pcf8563_attach(struct i2c_adapter *adapter); -+static int pcf8563_detach(struct i2c_client *client); -+static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind); -+static int pcf8563_command(struct i2c_client *client, unsigned int cmd, -+ void *arg); -+ -+static struct i2c_driver pcf8563_driver = { -+ .owner = THIS_MODULE, -+ .name = "pcf8563", -+ .flags = I2C_DF_NOTIFY, -+ .attach_adapter = &pcf8563_attach, -+ .detach_client = &pcf8563_detach, -+}; -+ -+struct pcf8563_data { -+ struct i2c_client client; -+ struct list_head list; -+}; -+ -+static const unsigned char days_in_mo[] = -+ { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; -+ -+static LIST_HEAD(pcf8563_clients); -+ -+/* Workaround until the I2C subsytem will allow to send -+ * commands to a specific client. This function will send the command -+ * to the first client. -+ */ -+int pcf8563_do_command(unsigned int cmd, void *arg) -+{ -+ struct list_head *walk; -+ struct list_head *tmp; -+ struct pcf8563_data *data; -+ -+ list_for_each_safe(walk, tmp, &pcf8563_clients) { -+ data = list_entry(walk, struct pcf8563_data, list); -+ return pcf8563_command(&data->client, cmd, arg); -+ } -+ -+ return -ENODEV; -+} -+ -+#define is_leap(year) \ -+ ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0)) -+ -+/* make sure the rtc_time values are in bounds */ -+ -+static int pcf8563_validate_tm(struct rtc_time *tm) -+{ -+ int year = tm->tm_year + 1900; -+ -+ if ((tm->tm_year < 70) || (tm->tm_year > 255)) -+ return -EINVAL; -+ -+ if ((tm->tm_mon > 11) || (tm->tm_mday == 0)) -+ return -EINVAL; -+ -+ if (tm->tm_mday > days_in_mo[tm->tm_mon] -+ + ((tm->tm_mon == 1) && is_leap(year))) -+ return -EINVAL; -+ -+ if ((tm->tm_hour >= 24) || (tm->tm_min >= 60) || (tm->tm_sec >= 60)) -+ return -EINVAL; -+ -+ return 0; -+} -+ -+/* -+ * In the routines that deal directly with the pcf8563 hardware, we use -+ * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch. -+ */ -+static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm) -+{ -+ unsigned char buf[13]; -+ unsigned char addr = PCF8563_REG_ST1; -+ -+ struct i2c_msg msgs[] = { -+ { client->addr, 0, 1, &addr }, /* setup read ptr */ -+ { client->addr, I2C_M_RD, 13, buf }, /* read status + date */ -+ }; -+ -+ /* read registers */ -+ if ((i2c_transfer(client->adapter, msgs, 2)) != 2) { -+ dev_err(&client->dev, "%s: read error\n", __FUNCTION__); -+ return -EIO; -+ } -+ -+ if (buf[PCF8563_REG_SC] & PCF8563_SC_LV) -+ dev_info(&client->dev, -+ "low voltage detected, date/time is not reliable.\n"); -+ -+ dev_dbg(&client->dev, -+ "%s: raw data is st1=%02x, st2=%02x, sec=%02x, min=%02x, hr=%02x, " -+ "mday=%02x, wday=%02x, mon=%02x, year=%02x\n", -+ __FUNCTION__, -+ buf[0], buf[1], buf[2], buf[3], -+ buf[4], buf[5], buf[6], buf[7], -+ buf[8]); -+ -+ -+ tm->tm_sec = BCD2BIN(buf[PCF8563_REG_SC] & 0x7F); -+ tm->tm_min = BCD2BIN(buf[PCF8563_REG_MN] & 0x7F); -+ tm->tm_hour = BCD2BIN(buf[PCF8563_REG_HR] & 0x3F); /* rtc hr 0-23 */ -+ tm->tm_mday = BCD2BIN(buf[PCF8563_REG_DM] & 0x3F); -+ tm->tm_wday = buf[PCF8563_REG_DW] & 0x07; -+ tm->tm_mon = BCD2BIN(buf[PCF8563_REG_MO] & 0x1F) - 1; /* rtc mn 1-12 */ -+ tm->tm_year = BCD2BIN(buf[PCF8563_REG_YR]) -+ + (buf[PCF8563_REG_MO] & PCF8563_MO_C ? 100 : 0); -+ -+ dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, " -+ "mday=%d, mon=%d, year=%d, wday=%d\n", -+ __FUNCTION__, -+ tm->tm_sec, tm->tm_min, tm->tm_hour, -+ tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); -+ -+ if (pcf8563_validate_tm(tm) < 0) { -+ dev_err(&client->dev, "retrieved date/time is not valid.\n"); -+ return -EINVAL; -+ } -+ -+ return 0; -+} -+ -+static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm, -+ int datetoo) -+{ -+ int i, err; -+ unsigned char buf[9]; -+ -+ /* check if all values in the tm struct are correct */ -+ if ((err = pcf8563_validate_tm(tm)) < 0) -+ return err; -+ -+ dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, " -+ "mday=%d, mon=%d, year=%d, wday=%d\n", -+ __FUNCTION__, -+ tm->tm_sec, tm->tm_min, tm->tm_hour, -+ tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); -+ -+ /* hours, minutes and seconds */ -+ buf[PCF8563_REG_SC] = BIN2BCD(tm->tm_sec); -+ buf[PCF8563_REG_MN] = BIN2BCD(tm->tm_min); -+ buf[PCF8563_REG_HR] = BIN2BCD(tm->tm_hour); -+ -+ /* should we also set the date? */ -+ if (datetoo) { -+ buf[PCF8563_REG_DM] = BIN2BCD(tm->tm_mday); -+ -+ /* month, 1 - 12 */ -+ buf[PCF8563_REG_MO] = BIN2BCD(tm->tm_mon + 1); -+ -+ /* year and century */ -+ buf[PCF8563_REG_YR] = BIN2BCD(tm->tm_year % 100); -+ if (tm->tm_year / 100) -+ buf[PCF8563_REG_MO] |= PCF8563_MO_C; -+ -+ buf[PCF8563_REG_DW] = tm->tm_wday & 0x07; -+ } -+ -+ /* write register's data */ -+ for (i = 0; i < (datetoo ? 7 : 3); i++) { -+ unsigned char data[2] = { PCF8563_REG_SC + i, -+ buf[PCF8563_REG_SC + i] }; -+ -+ err = i2c_master_send(client, data, sizeof(data)); -+ if (err != sizeof(data)) { -+ dev_err(&client->dev, -+ "%s: err=%d addr=%02x, data=%02x\n", -+ __FUNCTION__, err, data[0], data[1]); -+ return -EIO; -+ } -+ }; -+ -+ return 0; -+} -+ -+static int pcf8563_hctosys(struct i2c_client *client) -+{ -+ int err; -+ -+ struct rtc_time tm; -+ struct timespec tv; -+ -+ err = pcf8563_command(client, PCF8563_CMD_GETDATETIME, &tm); -+ -+ if (err) { -+ dev_err(&client->dev, -+ "Unable to set the system clock\n"); -+ return err; -+ } -+ -+ /* IMPORTANT: the RTC only stores whole seconds. It is arbitrary -+ * whether it stores the most close value or the value with partial -+ * seconds truncated. However, it is important that we use it to store -+ * the truncated value. This is because otherwise it is necessary, -+ * in an rtc sync function, to read both xtime.tv_sec and -+ * xtime.tv_nsec. On some processors (i.e. ARM), an atomic read -+ * of >32bits is not possible. So storing the most close value would -+ * slow down the sync API. So here we have the truncated value and -+ * the best guess is to add 0.5s. -+ */ -+ -+ tv.tv_nsec = NSEC_PER_SEC >> 1; -+ -+ /* WARNING: this is not the C library 'mktime' call, it is a built in -+ * inline function from include/linux/time.h. It expects (requires) -+ * the month to be in the range 1-12 -+ */ -+ -+ tv.tv_sec = mktime(tm.tm_year + 1900, tm.tm_mon + 1, -+ tm.tm_mday, tm.tm_hour, -+ tm.tm_min, tm.tm_sec); -+ -+ do_settimeofday(&tv); -+ -+ dev_info(&client->dev, -+ "setting the system clock to %d-%d-%d %d:%d:%d\n", -+ tm.tm_year + 1900, tm.tm_mon + 1, -+ tm.tm_mday, tm.tm_hour, tm.tm_min, -+ tm.tm_sec); -+ -+ return 0; -+} -+ -+struct pcf8563_limit -+{ -+ unsigned char reg; -+ unsigned char mask; -+ unsigned char min; -+ unsigned char max; -+}; -+ -+static int pcf8563_validate_client(struct i2c_client *client) -+{ -+ int i, xfer; -+ -+ static const struct pcf8563_limit probe_limits_pattern[] = { -+ /* register, mask, min, max */ -+ { PCF8563_REG_SC, 0x7F, 0, 59 }, -+ { PCF8563_REG_MN, 0x7F, 0, 59 }, -+ { PCF8563_REG_HR, 0x3F, 0, 23 }, -+ { PCF8563_REG_DM, 0x3F, 0, 31 }, -+ { PCF8563_REG_MO, 0x1F, 0, 12 }, -+ { PCF8563_REG_YR, 0xFF, 0, 99 }, -+ }; -+ -+ /* check limits (only registers with bcd values) */ -+ for (i = 0; i < ARRAY_SIZE(probe_limits_pattern); i++) { -+ unsigned char addr, buf, value; -+ -+ addr = probe_limits_pattern[i].reg; -+ -+ struct i2c_msg msgs[2] = { -+ { client->addr, 0, 2, &addr }, -+ { client->addr, I2C_M_RD, 1, &buf }, -+ }; -+ -+ xfer = i2c_transfer(client->adapter, msgs, 2); -+ -+ if (xfer != 2) { -+ dev_err(&client->adapter->dev, -+ "%s: could not read register %x\n", -+ __FUNCTION__, probe_limits_pattern[i].reg); -+ -+ return -EIO; -+ } -+ -+ value = BCD2BIN(buf & probe_limits_pattern[i].mask); -+ -+ if (value > probe_limits_pattern[i].max || -+ value < probe_limits_pattern[i].min) { -+ dev_dbg(&client->adapter->dev, -+ "%s: register=%x, lim pattern=%d, value=%d\n", -+ __FUNCTION__, probe_limits_pattern[i].reg, i, value); -+ -+ return -ENODEV; -+ } -+ } -+ -+ return 0; -+} -+ -+static int pcf8563_attach(struct i2c_adapter *adapter) -+{ -+ return i2c_probe(adapter, &addr_data, pcf8563_probe); -+} -+ -+static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind) -+{ -+ struct i2c_client *client; -+ struct pcf8563_data *data; -+ -+ int err = 0; -+ -+ dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); -+ -+ if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { -+ err = -ENODEV; -+ goto exit; -+ } -+ -+ if (!(data = kzalloc(sizeof(struct pcf8563_data), GFP_KERNEL))) { -+ err = -ENOMEM; -+ goto exit; -+ } -+ -+ client = &data->client; -+ client->addr = address; -+ client->driver = &pcf8563_driver; -+ client->adapter = adapter; -+ -+ strlcpy(client->name, pcf8563_driver.name, I2C_NAME_SIZE); -+ -+ i2c_set_clientdata(client, data); -+ -+ /* Verify the chip is really an PCF8563 */ -+ if (kind < 0) { -+ if (pcf8563_validate_client(client) < 0) { -+ err = -ENODEV; -+ goto exit_kfree; -+ } -+ } -+ -+ /* Inform the i2c layer */ -+ if ((err = i2c_attach_client(client))) -+ goto exit_kfree; -+ -+ list_add(&data->list, &pcf8563_clients); -+ -+ dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n"); -+ -+ /* If requested, set the system time */ -+ if (hctosys) -+ pcf8563_hctosys(client); -+ -+ return 0; -+ -+exit_kfree: -+ kfree(data); -+ -+exit: -+ return err; -+} -+ -+static int pcf8563_detach(struct i2c_client *client) -+{ -+ int err; -+ struct pcf8563_data *data = i2c_get_clientdata(client); -+ -+ if ((err = i2c_detach_client(client))) -+ return err; -+ -+ list_del(&data->list); -+ -+ kfree(data); -+ -+ return 0; -+} -+ -+static int pcf8563_command(struct i2c_client *client, unsigned int cmd, -+ void *param) -+{ -+ if (param == NULL) -+ return -EINVAL; -+ -+ if (!capable(CAP_SYS_TIME)) -+ return -EACCES; -+ -+ dev_dbg(&client->dev, "%s: cmd=%d\n", __FUNCTION__, cmd); -+ -+ switch (cmd) { -+ case PCF8563_CMD_GETDATETIME: -+ return pcf8563_get_datetime(client, param); -+ -+ case PCF8563_CMD_SETTIME: -+ return pcf8563_set_datetime(client, param, 0); -+ -+ case PCF8563_CMD_SETDATETIME: -+ return pcf8563_set_datetime(client, param, 1); -+ -+ default: -+ return -EINVAL; -+ } -+} -+ -+static int __init pcf8563_init(void) -+{ -+ return i2c_add_driver(&pcf8563_driver); -+} -+ -+static void __exit pcf8563_exit(void) -+{ -+ i2c_del_driver(&pcf8563_driver); -+} -+ -+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -+MODULE_DESCRIPTION("Philips PCF8563 RTC driver"); -+MODULE_LICENSE("GPL"); -+MODULE_VERSION(DRV_VERSION); -+ -+EXPORT_SYMBOL_GPL(pcf8563_do_command); -+ -+module_init(pcf8563_init); -+module_exit(pcf8563_exit); ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nas100d/include/linux/pcf8563.h 2005-11-22 01:36:46.000000000 +0100 -@@ -0,0 +1,27 @@ -+/* -+ * pcf8563.h - defines for drivers/i2c/chips/pcf8563.c -+ * Copyright 2005 Tower Technologies -+ * -+ * Author: Alessandro Zummo <a.zummo@towertech.it> -+ * Maintainers: http://www.nslu2-linux.org/ -+ * -+ * 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. -+ */ -+ -+#ifndef __LINUX_PCF8563_H__ -+#define __LINUX_PCF8563_H__ -+ -+/* commands */ -+ -+#define PCF8563_CMD_GETDATETIME 0 -+#define PCF8563_CMD_SETTIME 1 -+#define PCF8563_CMD_SETDATETIME 2 -+#define PCF8563_CMD_GETALARM 3 -+#define PCF8563_CMD_SETALARM 4 -+ -+extern int pcf8563_do_command(unsigned int cmd, void *arg); -+ -+#endif /* __LINUX_PCF8563_H__ */ ---- linux-nas100d.orig/drivers/i2c/chips/Kconfig 2005-11-21 22:01:31.000000000 +0100 -+++ linux-nas100d/drivers/i2c/chips/Kconfig 2005-11-22 01:36:46.000000000 +0100 -@@ -135,4 +135,13 @@ config RTC_X1205_I2C - This driver can also be built as a module. If so, the module - will be called x1205. - -+config RTC_PCF8563_I2C -+ tristate "Philips PCF8563 RTC" -+ depends on I2C && EXPERIMENTAL -+ help -+ If you say yes here you get support for the Philips PCF8563 -+ Real Time Clock chip. This chip is used by the Iomega NAS100D. -+ -+ This driver can also be built as a module. If so, the module -+ will be called pcf8563. - endmenu ---- linux-nas100d.orig/drivers/i2c/chips/Makefile 2005-11-21 22:01:31.000000000 +0100 -+++ linux-nas100d/drivers/i2c/chips/Makefile 2005-11-22 01:36:46.000000000 +0100 -@@ -14,6 +14,7 @@ obj-$(CONFIG_SENSORS_RTC8564) += rtc8564 - obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o - obj-$(CONFIG_TPS65010) += tps65010.o - obj-$(CONFIG_RTC_X1205_I2C) += x1205.o -+obj-$(CONFIG_RTC_PCF8563_I2C) += pcf8563.o - - ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) - EXTRA_CFLAGS += -DDEBUG diff --git a/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch b/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch deleted file mode 100644 index fea83fbec7..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch +++ /dev/null @@ -1,155 +0,0 @@ - drivers/ide/pci/aec62xx.c | 67 +++++++++++++++++++++++++++++++++++++++++++--- - drivers/ide/setup-pci.c | 12 +++++++- - 2 files changed, 75 insertions(+), 4 deletions(-) - ---- linux-nas100d.orig/drivers/ide/pci/aec62xx.c 2005-11-21 20:49:50.000000000 +0100 -+++ linux-nas100d/drivers/ide/pci/aec62xx.c 2005-11-21 22:15:21.000000000 +0100 -@@ -145,6 +145,16 @@ static int aec6210_tune_chipset (ide_dri - unsigned long flags; - - local_irq_save(flags); -+ -+#ifdef CONFIG_MACH_NAS100D -+ printk(KERN_INFO "aec62xx: nas100d tuning\n"); -+ pci_write_config_word(hwif->pci_dev, PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MASTER); -+ pci_write_config_byte(hwif->pci_dev, PCI_LATENCY_TIMER, 0x80); -+ /* Enable burst mode & force 2 ports enable */ -+ pci_read_config_byte(hwif->pci_dev, 0x4a, &tmp0); -+ pci_write_config_byte(hwif->pci_dev, 0x4a, tmp0 | 0x80); -+#endif -+ - /* 0x40|(2*drive->dn): Active, 0x41|(2*drive->dn): Recovery */ - pci_read_config_word(dev, 0x40|(2*drive->dn), &d_conf); - tmp0 = pci_bus_clock_list(speed, BUSCLOCK(dev)); -@@ -206,9 +216,17 @@ static int config_chipset_for_dma (ide_d - { - u8 speed = ide_dma_speed(drive, aec62xx_ratemask(drive)); - -+#ifdef CONFIG_MACH_NAS100D -+ ide_hwif_t *hwif= HWIF(drive); -+ u8 unit = (drive->select.b.unit & 0x01); -+#endif - if (!(speed)) - return 0; - -+#ifdef CONFIG_MACH_NAS100D -+ outb((inb(hwif->dma_base+2) & ~(1<<(5+unit))), hwif->dma_base+2); -+#endif -+ - (void) aec62xx_tune_chipset(drive, speed); - return ide_dma_enable(drive); - } -@@ -299,6 +317,14 @@ static unsigned int __devinit init_chips - { - int bus_speed = system_bus_clock(); - -+#ifdef CONFIG_MACH_NAS100D -+ /* enable both ports */ -+ byte tmp; -+ printk(KERN_INFO "%s: nas100d ports enable\n", name); -+ pci_read_config_byte(dev, 0x4a, &tmp); -+ pci_write_config_byte(dev, 0x4a, tmp | 0x06); -+#endif -+ - if (dev->resource[PCI_ROM_RESOURCE].start) { - pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); - printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start); -@@ -312,12 +338,35 @@ static unsigned int __devinit init_chips - return dev->irq; - } - -+#ifdef CONFIG_MACH_NAS100D -+static void nas100d_insw (unsigned long port, u16 *addr, u32 count) -+{ -+ while (count--) -+ *addr++ = __cpu_to_le16(inw(port)); -+} -+ -+static void nas100d_outw (u16 val, unsigned long port) -+{ -+ u32 n, byte_enables, data; -+ n = port % 4; -+ byte_enables = (0xf & ~(BIT(n) | BIT(n+1))) << IXP4XX_PCI_NP_CBE_BESL; -+ data = val << (8*n); -+ ixp4xx_pci_write(port, byte_enables | NP_CMD_IOWRITE, __le16_to_cpu(data)); -+} -+#endif -+ - static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif) - { - hwif->autodma = 0; - hwif->tuneproc = &aec62xx_tune_drive; - hwif->speedproc = &aec62xx_tune_chipset; - -+#ifdef CONFIG_MACH_NAS100D -+ printk(KERN_INFO "aec62xx: enabling nas100d iops\n"); -+ hwif->OUTW = nas100d_outw; -+ hwif->INSW = nas100d_insw; -+#endif -+ - if (hwif->pci_dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) { - hwif->serialized = hwif->channel; - hwif->no_dsc = 1; -@@ -360,11 +409,18 @@ static void __devinit init_dma_aec62xx(i - } else { - u8 ata66 = 0; - pci_read_config_byte(hwif->pci_dev, 0x49, &ata66); -- if (!(hwif->udma_four)) -+ if (!(hwif->udma_four)) - hwif->udma_four = (ata66&(hwif->channel?0x02:0x01))?0:1; - } - - ide_setup_dma(hwif, dmabase, 8); -+#ifdef CONFIG_MACH_NAS100D -+ { -+ u8 dma_stat = hwif->INB(hwif->dma_status); -+ dma_stat |= (1 << 4); -+ hwif->OUTB(dma_stat, hwif->dma_status); -+ } -+#endif - } - - static int __devinit init_setup_aec62xx(struct pci_dev *dev, ide_pci_device_t *d) -@@ -427,6 +483,9 @@ static ide_pci_device_t aec62xx_chipsets - .init_dma = init_dma_aec62xx, - .channels = 2, - .autodma = AUTODMA, -+#ifdef CONFIG_MACH_NAS100D -+ .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, -+#endif - .bootable = OFF_BOARD, - },{ /* 4 */ - .name = "AEC6X80R", -@@ -454,6 +513,8 @@ static int __devinit aec62xx_init_one(st - { - ide_pci_device_t *d = &aec62xx_chipsets[id->driver_data]; - -+ printk(KERN_INFO "aec62xx: using config %lx\n", id->driver_data); -+ - return d->init_setup(dev, d); - } - ---- linux-nas100d.orig/drivers/ide/setup-pci.c 2005-11-21 20:49:50.000000000 +0100 -+++ linux-nas100d/drivers/ide/setup-pci.c 2005-11-21 22:01:22.000000000 +0100 -@@ -602,10 +602,20 @@ void ide_pci_setup_ports(struct pci_dev - if ((d->flags & IDEPCI_FLAG_FORCE_PDC) && - (secondpdc++==1) && (port==1)) - goto controller_ok; -- -+ - if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) || - (tmp & e->mask) != e->val)) -+#ifdef CONFIG_MACH_NAS100D -+ { -+ pci_write_config_byte(dev, e->reg, tmp & ~0x01); -+#endif - continue; /* port not enabled */ -+#ifdef CONFIG_MACH_NAS100D -+ } -+ else -+ pci_write_config_byte(dev, e->reg, tmp & ~0x01); -+#endif -+ - controller_ok: - - if (d->channels <= port) diff --git a/packages/linux/nas100d-kernel/2.6.15/85-timer.patch b/packages/linux/nas100d-kernel/2.6.15/85-timer.patch deleted file mode 100644 index e83120ca75..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/85-timer.patch +++ /dev/null @@ -1,246 +0,0 @@ ---- linux-2.6.15/arch/arm/mach-ixp4xx/common.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/arch/arm/mach-ixp4xx/common.c 1970-01-01 00:00:00.000000000 +0000 -@@ -239,36 +239,165 @@ void __init ixp4xx_init_irq(void) - * IXP4xx timer tick - * We use OS timer1 on the CPU for the timer tick and the timestamp - * counter as a source of real clock ticks to account for missed jiffies. -+ * -+ * 'CLOCK_TICK_RATE' is the nominal number of internal ticks per second, -+ * this is significantly greater than the actual number on any ixp4xx -+ * board. Neither this nor 'LATCH' are required by this code because -+ * the only requirement is to generate HZ timer_tick calls per second. - *************************************************************************/ -+#if TICK_NSEC * HZ != 1000000000 -+ /* This will cause the jiffies to drift unnecessarily. */ -+# error CLOCK_TICK_RATE should be a multiple of HZ for this code -+#endif -+ -+/* These are the control registers for the interrupt handler, they must -+ * only be read and written by the interrupt handler and by the init -+ * method (which sets them to 0). -+ */ -+static volatile u32 last_timer_time; -+static volatile int accumulated_error; -+ -+/* Most ixp4xx boards have 66.6666MHz crystals, so default to this, reset -+ * this from the board level code if required. The following variables -+ * must be *written* only by set_board_tick_rate -+ */ -+static u32 board_tick_rate; -+static u32 board_tick_per_1000; /* board_tick_rate/1000 */ -+static u32 timer_count; -+ -+/* The following symbol may be written to change the current tick rate, -+ * it is read by the interrupt handler and used to reload the timer. -+ * The 'real' value (the one in use) is 'board_tick_rate' above. -+ * NOTE: this can be tweaked to match the actual crystal on a particular -+ * machine. -+ */ -+volatile u32 ixp4xx_board_tick_rate = 66666600; -+EXPORT_SYMBOL(ixp4xx_board_tick_rate); -+ -+/* The set API may run asynchronously in the presence of interrupts, -+ * everything it does it is both atomic and complete (notice that it -+ * doesn't change any of the 'volatile' values). The mathematics in -+ * here require the following values. Changing the board tick rate -+ * implies an unknown error in the current timestamp tick count. -+ */ -+#if IXP4XX_OST_RELOAD_MASK != 3 || IXP4XX_OST_ENABLE != 1 -+# error unexpected value for timer reload mask -+#endif -+static void set_board_tick_rate(u32 rate) { -+ u32 reload; -+ -+ /* Store the two effectively informational rate values, the -+ * error calculation is (rate - count*HZ) (above), and rate -+ * is changed first, this can cause a temporary error which -+ * will be corrected on the next interrupt. -+ */ -+ board_tick_rate = rate; -+ board_tick_per_1000 = (rate+500)/1000; -+ -+ /* Calculate the correct value to load into the timer countdown -+ * register, the low two bits must be b01 (to enable the timer). -+ * Select the top bits to be as close to the desired value as -+ * possible. -+ * -+ * First find the best value, regardless of the low two bits - -+ * this is the value used in the interrupt calculation even though -+ * it cannot necessarily be set into the register. -+ */ -+ timer_count = (rate + (HZ/2))/HZ; -+ -+ /* Now the timer_ticks are being generated at this rate, calculate -+ * an appropriate value for the register. This stores a 30 bit -+ * value which gives a period of 4*x+1, we want: -+ * -+ * 4*x+1 = board_tick_rate/HZ -+ * -+ * This needs to be rounded to the closest 4*HZ value: -+ * -+ * x = ((board_tick_rate-HZ) + (4*HZ)/2) / 4*HZ -+ * x = (board_tick_rate+HZ) / (4*HZ); -+ */ -+ reload = (board_tick_rate + HZ) / HZ; -+ reload = (reload & ~IXP4XX_OST_RELOAD_MASK) | IXP4XX_OST_ENABLE; -+ *IXP4XX_OSRT1 = reload; - --static unsigned volatile last_jiffy_time; -+ /* If the clock is drifing, look in syslog: */ -+ printk(KERN_INFO "IXP4xx: FREQ=%d COUNT=%d\n", rate, reload); -+} - --#define CLOCK_TICKS_PER_USEC ((CLOCK_TICK_RATE + USEC_PER_SEC/2) / USEC_PER_SEC) -+/* This returns the time in timer ticks since the 'last_timer_time' -+ * recorded above. Use this to avoid arithmetic errors because of -+ * the overflow when the timer wraps. -+ */ -+static inline u32 ixp4xx_timer_delta(void) -+{ -+ return *IXP4XX_OSTS - last_timer_time; -+} - - /* IRQs are disabled before entering here from do_gettimeofday() */ - static unsigned long ixp4xx_gettimeoffset(void) - { -- u32 elapsed; -- -- elapsed = *IXP4XX_OSTS - last_jiffy_time; -+ /* Return the offset of the current time from the last time -+ * timer tick in microseconds. This is only used for the -+ * gettimeofday call. -+ * -+ * The result of this API is at most about 20000 (for a 50Hz -+ * HZ - 20000 uS/tick), the input delta is at most about -+ * 1.3M - 21 bits. -+ */ -+ u32 delta = ixp4xx_timer_delta(); /* About 21 bits max */ -+ /* return delta * 1000000 / board_tick_rate; */ -+ return (delta * 1000 + board_tick_per_1000/2) / board_tick_per_1000; -+} - -- return elapsed / CLOCK_TICKS_PER_USEC; -+/* This is the correct adjustment to the counter to compensate for an -+ * error iff timer_count-1 <= exact_count <= timer_count+1 -+ */ -+static inline int adjustment(int error) { -+ if (error >= HZ) -+ return 1; -+ else if (error <= -HZ) -+ return -1; -+ return 0; - } - - static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) - { -+ u32 rate; -+ u32 count; -+ int error; -+ - write_seqlock(&xtime_lock); - - /* Clear Pending Interrupt by writing '1' to it */ - *IXP4XX_OSST = IXP4XX_OSST_TIMER_1_PEND; - -+ /* If the board tick rate has been changed update the cached -+ * value. -+ */ -+ if (ixp4xx_board_tick_rate != board_tick_rate) { -+ set_board_tick_rate(ixp4xx_board_tick_rate); -+ accumulated_error = 0; -+ } -+ - /* - * Catch up with the real idea of time -+ * -+ * board_tick_rate: actual ixp4xx ticks/second, read-only -+ * accumulated_error: aggregate error/tick * HZ, read/write -+ * timer_count: best ixp4xx ticks per timer_tick, read-only - */ -- while ((*IXP4XX_OSTS - last_jiffy_time) > LATCH) { -+ rate = board_tick_rate; -+ error = accumulated_error; -+ count = timer_count; -+ do { -+ u32 adjusted_count = count + adjustment(error); -+ if (ixp4xx_timer_delta() < adjusted_count) -+ break; - timer_tick(regs); -- last_jiffy_time += LATCH; -- } -+ last_timer_time += adjusted_count; -+ error += rate - adjusted_count*HZ; -+ } while (1); -+ accumulated_error = error; - - write_sequnlock(&xtime_lock); - -@@ -281,17 +410,30 @@ static struct irqaction ixp4xx_timer_irq - .handler = ixp4xx_timer_interrupt, - }; - -+u32 ixp4xx_get_board_tick_rate(void) { -+ return board_tick_rate; -+} -+ -+EXPORT_SYMBOL(ixp4xx_get_board_tick_rate); -+ -+void ixp4xx_set_board_tick_rate(u32 rate) { -+ ixp4xx_board_tick_rate = rate; -+} -+ -+EXPORT_SYMBOL(ixp4xx_set_board_tick_rate); -+ - static void __init ixp4xx_timer_init(void) - { - /* Clear Pending Interrupt by writing '1' to it */ - *IXP4XX_OSST = IXP4XX_OSST_TIMER_1_PEND; - - /* Setup the Timer counter value */ -- *IXP4XX_OSRT1 = (LATCH & ~IXP4XX_OST_RELOAD_MASK) | IXP4XX_OST_ENABLE; -+ set_board_tick_rate(ixp4xx_board_tick_rate); - - /* Reset time-stamp counter */ - *IXP4XX_OSTS = 0; -- last_jiffy_time = 0; -+ last_timer_time = 0; -+ accumulated_error = 0; - - /* Connect the interrupt handler and enable the interrupt */ - setup_irq(IRQ_IXP4XX_TIMER1, &ixp4xx_timer_irq); -@@ -337,4 +479,3 @@ void __init ixp4xx_sys_init(void) - ARRAY_SIZE(ixp46x_devices)); - } - } -- ---- linux-2.6.15/include/asm-arm/arch-ixp4xx/timex.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/include/asm-arm/arch-ixp4xx/timex.h 1970-01-01 00:00:00.000000000 +0000 -@@ -6,10 +6,23 @@ - #include <asm/hardware.h> - - /* -- * We use IXP425 General purpose timer for our timer needs, it runs at -- * 66.66... MHz. We do a convulted calculation of CLOCK_TICK_RATE b/c the -- * timer register ignores the bottom 2 bits of the LATCH value. -+ * In linux/timex.h 'LATCH' is defined as CLOCK_TICK_RATE/HZ and -+ * is the number of internal counts per timer interrupt. Thus -+ * CLOCK_TICK_RATE is LATCH*HZ. -+ * -+ * The actual values of these numbers do not matter, because they -+ * are only used to calculate ACTHZ (rate/latch as a 24.8 fixed -+ * point number), so the value here gives a LATCH of 1 and pretty -+ * much guarantees to flush out any off-by-one errors. -+ * -+ * ACTHZ is equal to HZ, because CLOCK_TICK_RATE is a multiple of -+ * HZ, this is checked in the ixp4xx/common.c code. - */ --#define FREQ 66666666 --#define CLOCK_TICK_RATE (((FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ) -+#define CLOCK_TICK_RATE HZ - -+/* The following allow the exact board tick rate to be set and -+ * discovered. The value should be exactly twice the frequency -+ * (in Hz) of the onboard crystal. -+ */ -+extern u32 ixp4xx_get_board_tick_rate(void); -+extern void ixp4xx_set_board_tick_rate(u32 new_rate); diff --git a/packages/linux/nas100d-kernel/2.6.15/91-maclist.patch b/packages/linux/nas100d-kernel/2.6.15/91-maclist.patch deleted file mode 100644 index 27af1ea639..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/91-maclist.patch +++ /dev/null @@ -1,377 +0,0 @@ ---- linux-2.6.15/include/net/maclist.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/include/net/maclist.h 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,23 @@ -+#ifndef _MACLIST_H -+#define _MACLIST_H 1 -+/* -+ * Interfaces to the MAC repository -+ */ -+/* -+ * Add a single entry, returns 0 on success else an error -+ * code. Must *not* be called from an interrupt handler. -+ */ -+extern int maclist_add(const u8 id_to_add[6]); -+ -+/* -+ * Return the current entry count (valid in any context). -+ */ -+extern int maclist_count(void); -+ -+/* -+ * Return the ID from the n'th entry (valid in any context), -+ * returns 0 on success, -EINVAL if 'n' is out of range. -+ */ -+extern int maclist_read(u8 (*buffer_for_id)[6], int index_of_id_to_return); -+ -+#endif /*_MACLIST_H*/ ---- linux-2.6.15/drivers/net/maclist.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/drivers/net/maclist.c 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,314 @@ -+/* -+ * drivers/net/maclist.c -+ * -+ * a simple driver to remember ethernet MAC values -+ * -+ * Some Ethernet hardware implementations have no built-in -+ * storage for allocated MAC values - an example is the Intel -+ * IXP420 chip which has support for Ethernet but no defined -+ * way of storing allocated MAC values. With such hardware -+ * different board level implementations store the allocated -+ * MAC (or MACs) in different ways. Rather than put board -+ * level code into a specific Ethernet driver this driver -+ * provides a generally accessible repository for the MACs -+ * which can be written by board level code and read by the -+ * driver. -+ * -+ * The implementation also allows user level programs to -+ * access the MAC information in /proc/net/maclist. This is -+ * useful as it allows user space code to use the MAC if it -+ * is not used by a built-in driver. -+ * -+ * Copyright (C) 2005 John Bowler -+ * Author: John Bowler <jbowler@acm.org> -+ * Maintainers: http://www.nslu2-linux.org/ -+ * -+ * 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. -+ * -+ * External interfaces: -+ * Interfaces to linux kernel (and modules) -+ * maclist_add: add a single MAC -+ * maclist_count: total number of MACs stored -+ * maclist_read: read a MAC 0..(maclist_count-1) -+ */ -+#include <linux/module.h> -+#include <linux/moduleparam.h> -+#include <linux/etherdevice.h> -+#include <linux/proc_fs.h> -+#include <linux/errno.h> -+ -+#include <net/maclist.h> -+ -+#define MACLIST_NAME "maclist" -+ -+MODULE_AUTHOR("John Bowler <jbowler@acm.org>"); -+MODULE_DESCRIPTION("MAC list repository"); -+MODULE_LICENSE("GPL"); -+ -+typedef struct maclist_entry { -+ struct maclist_entry *next; /* Linked list, first first */ -+ u8 id[6]; /* 6 byte Ethernet MAC */ -+} maclist_entry_t; -+ -+/* Access to this list is possible at any time - entries in -+ * the list are never destroyed. Modification of the list is -+ * safe only from the init code (i.e. modification must be -+ * single threaded), but read from an interrupt at the same -+ * time is possible and safe. -+ */ -+static maclist_entry_t *maclist_list = 0; -+ -+/* -+ * External interfaces. -+ * -+ * Add a single entry, returns 0 on success else an error -+ * code. Must be single threaded. -+ */ -+int maclist_add(const u8 new_id[6]) { -+ maclist_entry_t *new_entry, **tail; -+ -+ if (new_id == 0 || !is_valid_ether_addr(new_id)) { -+ printk(KERN_ERR MACLIST_NAME ": invalid ethernet address\n"); -+ return -EINVAL; -+ } -+ new_entry = kmalloc(sizeof *new_entry, GFP_KERNEL); -+ if (new_entry == 0) -+ return -ENOMEM; -+ new_entry->next = 0; -+ memcpy(new_entry->id, new_id, sizeof new_entry->id); -+ -+ tail = &maclist_list; -+ while (*tail != 0) -+ tail = &(*tail)->next; -+ *tail = new_entry; -+ return 0; -+} -+EXPORT_SYMBOL(maclist_add); -+ -+/* -+ * Return the current entry count (valid in any context). -+ */ -+int maclist_count(void) { -+ maclist_entry_t *tail = maclist_list; -+ int count = 0; -+ -+ while (tail != 0) { -+ tail = tail->next; -+ ++count; -+ } -+ -+ return count; -+} -+EXPORT_SYMBOL(maclist_count); -+ -+/* -+ * Return the ID from the n'th entry (valid in any context), -+ * returns 0 on success, -EINVAL if 'n' is out of range. -+ */ -+int maclist_read(u8 (*id)[6], int n) { -+ maclist_entry_t *entry = maclist_list; -+ -+ while (n > 0 && entry != 0) { -+ --n; -+ entry = entry->next; -+ } -+ -+ if (n == 0 && entry != 0) { -+ memcpy(id, entry->id, sizeof *id); -+ return 0; -+ } -+ -+ printk(KERN_ERR MACLIST_NAME ": id does not exist\n"); -+ return -EINVAL; -+} -+EXPORT_SYMBOL(maclist_read); -+ -+/* -+ * Parameter parsing. The option string is a list of MAC -+ * addresses, comma separated. (The parsing really should -+ * be somewhere central...) -+ */ -+static int __init maclist_setup(char *param) { -+ int bytes = 0, seen_a_digit = 0; -+ u8 id[6]; -+ -+ memset(id, 0, sizeof id); -+ -+ if (param) do { -+ int digit = -1; -+ switch (*param) { -+ case '0': digit = 0; break; -+ case '1': digit = 1; break; -+ case '2': digit = 2; break; -+ case '3': digit = 3; break; -+ case '4': digit = 4; break; -+ case '5': digit = 5; break; -+ case '6': digit = 6; break; -+ case '7': digit = 7; break; -+ case '8': digit = 8; break; -+ case '9': digit = 9; break; -+ case 'a': case 'A': digit = 10; break; -+ case 'b': case 'B': digit = 11; break; -+ case 'c': case 'C': digit = 12; break; -+ case 'd': case 'D': digit = 13; break; -+ case 'e': case 'E': digit = 14; break; -+ case 'f': case 'F': digit = 15; break; -+ case ':': -+ if (seen_a_digit) -+ bytes = (bytes+1) & ~1; -+ else -+ bytes += 2; /* i.e. ff::ff is ff:00:ff */ -+ seen_a_digit = 0; -+ break; -+ case 0: -+ if (bytes == 0) /* nothing new seen so far */ -+ return 0; -+ /*fall through*/ -+ case ',': case ';': -+ if (bytes > 0) -+ bytes = 12; /* i.e. all trailing bytes 0 */ -+ break; -+ default: -+ printk(KERN_ERR MACLIST_NAME ": invalid character <%c[%d]>\n", -+ *param, *param); -+ return -EINVAL; -+ } -+ -+ if (digit >= 0) { -+ id[bytes>>1] = (id[bytes>>1] << 4) + digit; break; -+ ++bytes; -+ seen_a_digit = 1; -+ } -+ -+ if (bytes >= 12) { -+ int rc = maclist_add(id); -+ if (rc) -+ return rc; -+ bytes = 0; -+ seen_a_digit = 0; -+ memset(id, 0, sizeof id); -+ if (*param == 0) -+ return 0; -+ } -+ ++param; -+ } while (1); -+ -+ return 0; -+} -+ -+/* -+ * procfs support, if compiled in. -+ */ -+#ifdef CONFIG_PROC_FS -+/* -+ * Character device read -+ */ -+static int maclist_getchar(off_t n) { -+ static char xdigit[16] = "0123456789abcdef"; -+ maclist_entry_t *head = maclist_list; -+ int b; -+ -+ do { -+ if (head == 0) -+ return -1; -+ if (n < 18) -+ break; -+ head = head->next; -+ n -= 18; -+ } while (1); -+ -+ if (n == 17) -+ return '\n'; -+ -+ b = n/3; -+ switch (n - b*3) { -+ case 0: return xdigit[head->id[b] >> 4]; -+ case 1: return xdigit[head->id[b] & 0xf]; -+ default: return ':'; -+ } -+} -+ -+/* -+ * The extensively undocumented proc_read_t callback is implemented here. -+ * Go look in fs/proc/generic.c: -+ * -+ * Prototype: -+ * int f(char *buffer, char **start, off_t offset, -+ * int count, int *peof, void *dat) -+ * -+ * Assume that the buffer is "count" bytes in size. -+ * -+ * 2) Set *start = an address within the buffer. -+ * Put the data of the requested offset at *start. -+ * Return the number of bytes of data placed there. -+ * If this number is greater than zero and you -+ * didn't signal eof and the reader is prepared to -+ * take more data you will be called again with the -+ * requested offset advanced by the number of bytes -+ * absorbed. -+ */ -+static int maclist_proc_read(char *buffer, char **start, off_t offset, -+ int count, int *peof, void *dat) { -+ int total; -+ -+ *start = buffer; -+ total = 0; -+ -+ while (total < count) { -+ int ch = maclist_getchar(offset++); -+ if (ch == -1) { -+ *peof = 1; -+ break; -+ } -+ *buffer++ = ch; -+ ++total; -+ } -+ -+ return total; -+} -+#endif -+ -+/* -+ * Finally, the init/exit functions. -+ */ -+static void __exit maclist_exit(void) -+{ -+ maclist_entry_t *list; -+ -+ remove_proc_entry(MACLIST_NAME, proc_net); -+ -+ list = maclist_list; -+ maclist_list = 0; -+ -+ while (list != 0) { -+ maclist_entry_t *head = list; -+ list = head->next; -+ kfree(head); -+ } -+} -+ -+#ifdef MODULE -+static char ids[256]; -+module_param_string(ids, ids, sizeof ids, 0); -+MODULE_PARM_DESC(ids, "comma separated list of MAC ids\n"); -+#else -+__setup("maclist_ids=", maclist_setup); -+#endif -+ -+static int __init maclist_init(void) -+{ -+# ifdef MODULE -+ if (ids[0]) -+ maclist_setup(ids); -+# endif -+ -+ /* Ignore failure, the module will still work. */ -+ (void)create_proc_read_entry(MACLIST_NAME, S_IRUGO, proc_net, maclist_proc_read, NULL); -+ -+ return 0; -+} -+ -+module_init(maclist_init); -+module_exit(maclist_exit); ---- linux-2.6.15/drivers/net/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/drivers/net/Makefile 1970-01-01 00:00:00.000000000 +0000 -@@ -70,6 +70,7 @@ obj-$(CONFIG_RIONET) += rionet.o - # end link order section - # - -+obj-$(CONFIG_MACLIST) += maclist.o - obj-$(CONFIG_MII) += mii.o - obj-$(CONFIG_PHYLIB) += phy/ - ---- linux-2.6.15/drivers/net/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/drivers/net/Kconfig 1970-01-01 00:00:00.000000000 +0000 -@@ -166,6 +166,21 @@ config NET_ETHERNET - kernel: saying N will just cause the configurator to skip all - the questions about Ethernet network cards. If unsure, say N. - -+config MACLIST -+ tristate "Ethernet MAC repository" -+ depends on NET_ETHERNET -+ help -+ Some ethernet controllers have no built-in way of obtaining an -+ appropriate Ethernet MAC address. Such controllers have to be -+ initialised in a board-specific way, depending on how the allocated -+ MAC is stored. The MAC repository provides a set of APIs and a -+ proc entry (/proc/net/maclist) to store MAC values from the board -+ so that such drivers can obtain a MAC address without board-specific -+ code. You do not need to enable this device - it will be selected -+ automatically by any device which requires it. It is only useful -+ to enable it manually when building a device driver independently -+ of the kernel build. -+ - config MII - tristate "Generic Media Independent Interface device support" - depends on NET_ETHERNET diff --git a/packages/linux/nas100d-kernel/2.6.15/92-nas100d-maclist.patch b/packages/linux/nas100d-kernel/2.6.15/92-nas100d-maclist.patch deleted file mode 100644 index 3143850b22..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/92-nas100d-maclist.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- linux-2.6.15/arch/arm/mach-ixp4xx/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/arch/arm/mach-ixp4xx/Kconfig 1970-01-01 00:00:00.000000000 +0000 -@@ -74,6 +74,7 @@ comment "IXP4xx Platforms" - config MACH_NAS100D - bool - prompt "NAS100D" -+ select MACLIST - help - Say 'Y' here if you want your kernel to support Iomega's - NAS 100d device. For more information on this platform, ---- linux-2.6.15/arch/arm/mach-ixp4xx/nas100d-setup.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/arch/arm/mach-ixp4xx/nas100d-setup.c 1970-01-01 00:00:00.000000000 +0000 -@@ -14,11 +14,14 @@ - #include <linux/kernel.h> - #include <linux/serial.h> - #include <linux/serial_8250.h> -+#include <linux/mtd/mtd.h> - - #include <asm/mach-types.h> - #include <asm/mach/arch.h> - #include <asm/mach/flash.h> - -+#include <net/maclist.h> -+ - static struct flash_platform_data nas100d_flash_data = { - .map_name = "cfi_probe", - .width = 2, -@@ -110,8 +113,44 @@ - gpio_line_set(NAS100D_PO_GPIO, IXP4XX_GPIO_HIGH); - } - -+/* -+ * When the RedBoot config partition is added the MAC address is read from -+ * it. -+ */ -+void flash_add(struct mtd_info *mtd) { -+ if (strcmp(mtd->name, "RedBoot config") == 0) { -+ size_t retlen; -+ u_char mac[6]; -+ -+ /* The MAC is at a known offset... */ -+ if (mtd->read(mtd, 0x0FD8, 6, &retlen, mac) == 0 && retlen == 6) { -+ printk(KERN_INFO "NAS100D MAC: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", -+ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); -+ maclist_add(mac); -+ } else { -+ printk(KERN_ERR "NAS100D MAC: read failed\n"); -+ } -+ } -+} -+ -+/* -+ * Nothing to do on remove at present. -+ */ -+void flash_remove(struct mtd_info *mtd) { -+} -+ -+struct mtd_notifier flash_notifier = { -+ .add = flash_add, -+ .remove = flash_remove, -+}; -+ - static void __init nas100d_init(void) - { -+ /* The flash has an ethernet MAC embedded in it which we need, -+ * that is all this notifier does. -+ */ -+ register_mtd_user(&flash_notifier); -+ - ixp4xx_sys_init(); - - pm_power_off = nas100d_power_off; diff --git a/packages/linux/nas100d-kernel/2.6.15/anonymiser.patch b/packages/linux/nas100d-kernel/2.6.15/anonymiser.patch deleted file mode 100644 index 3384b15fe2..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/anonymiser.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- linux-2.6.11.2/scripts/mkcompile_h.orig 2005-05-07 05:27:02.440000000 +0000 -+++ linux-2.6.11.2/scripts/mkcompile_h 2005-05-07 05:28:30.360000000 +0000 -@@ -43,16 +43,9 @@ - echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\" - - echo \#define LINUX_COMPILE_TIME \"`LC_ALL=C LANG=C date +%T`\" -- echo \#define LINUX_COMPILE_BY \"`whoami`\" -- echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" -- -- if [ -x /bin/dnsdomainname ]; then -- echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\" -- elif [ -x /bin/domainname ]; then -- echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\" -- else -- echo \#define LINUX_COMPILE_DOMAIN -- fi -+ echo \#define LINUX_COMPILE_BY \"openslug\" -+ echo \#define LINUX_COMPILE_HOST \"openslug.org\" -+ echo \#define LINUX_COMPILE_DOMAIN \"openslug.org\" - - echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\" - ) > .tmpcompile diff --git a/packages/linux/nas100d-kernel/2.6.15/defconfig b/packages/linux/nas100d-kernel/2.6.15/defconfig deleted file mode 100644 index 3f7bbe9aa5..0000000000 --- a/packages/linux/nas100d-kernel/2.6.15/defconfig +++ /dev/null @@ -1,1672 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.14 -# Sun Nov 13 02:06:49 2005 -# -CONFIG_ARM=y -CONFIG_MMU=y -CONFIG_UID16=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -CONFIG_GENERIC_CALIBRATE_DELAY=y - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y -CONFIG_BROKEN_ON_SMP=y -CONFIG_INIT_ENV_ARG_LIMIT=32 - -# -# General setup -# -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -# CONFIG_POSIX_MQUEUE is not set -# CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_SYSCTL=y -# CONFIG_AUDIT is not set -CONFIG_HOTPLUG=y -CONFIG_KOBJECT_UEVENT=y -# CONFIG_IKCONFIG is not set -CONFIG_INITRAMFS_SOURCE="" -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_EMBEDDED=y -# CONFIG_KALLSYMS is not set -CONFIG_PRINTK=y -CONFIG_BUG=y -# CONFIG_BASE_FULL is not set -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SHMEM=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 -# CONFIG_TINY_SHMEM is not set -CONFIG_BASE_SMALL=1 - -# -# Loadable module support -# -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_OBSOLETE_MODPARM=y -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_KMOD=y - -# -# Block layer -# - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -CONFIG_IOSCHED_DEADLINE=y -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_DEFAULT_AS is not set -CONFIG_DEFAULT_DEADLINE=y -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="deadline" - -# -# System Type -# -# 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_CAMELOT is not set -# CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX is not set -CONFIG_ARCH_IXP4XX=y -# CONFIG_ARCH_IXP2000 is not set -# CONFIG_ARCH_L7200 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_OMAP is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_AAEC2000 is not set -CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y - -# -# Intel IXP4xx Implementation Options -# - -# -# IXP4xx Platforms -# -# CONFIG_MACH_NSLU2 is not set -# CONFIG_ARCH_AVILA is not set -# CONFIG_ARCH_ADI_COYOTE is not set -# CONFIG_ARCH_IXDP425 is not set -# CONFIG_MACH_IXDPG425 is not set -# CONFIG_MACH_IXDP465 is not set -# CONFIG_ARCH_PRPMC1100 is not set -CONFIG_MACH_NAS100D=y -# CONFIG_MACH_GTWX5715 is not set - -# -# IXP4xx Options -# -CONFIG_IXP4XX_INDIRECT_PCI=y - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_XSCALE=y -CONFIG_CPU_32v5=y -CONFIG_CPU_ABRT_EV5T=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_TLB_V4WBI=y - -# -# Processor Features -# -CONFIG_ARM_THUMB=y -CONFIG_CPU_BIG_ENDIAN=y -CONFIG_XSCALE_PMU=y -CONFIG_DMABOUNCE=y - -# -# Bus support -# -CONFIG_ISA_DMA_API=y -CONFIG_PCI=y -CONFIG_PCI_LEGACY_PROC=y - -# -# PCCARD (PCMCIA/CardBus) support -# -# CONFIG_PCCARD is not set - -# -# Kernel Features -# -# CONFIG_PREEMPT is not set -# CONFIG_NO_IDLE_HZ is not set -# 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_SPLIT_PTLOCK_CPUS=4096 -CONFIG_ALIGNMENT_TRAP=y - -# -# Boot options -# -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc pcf8563.hctosys=1 console=ttyS0,115200n8" -# CONFIG_XIP_KERNEL 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 - -# -# Userspace binary formats -# -CONFIG_BINFMT_ELF=y -# CONFIG_BINFMT_AOUT is not set -# CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set - -# -# Power management options -# -# CONFIG_PM is not set - -# -# Networking -# -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=m -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set -# CONFIG_NET_KEY 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_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=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y - -# -# IP: Virtual Server Configuration -# -# CONFIG_IP_VS is not set -CONFIG_IPV6=m -# CONFIG_IPV6_PRIVACY is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_INET6_TUNNEL=m -CONFIG_IPV6_TUNNEL=m -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_BRIDGE_NETFILTER=y - -# -# Core Netfilter Configuration -# -# CONFIG_NETFILTER_NETLINK is not set - -# -# IP: Netfilter Configuration -# -CONFIG_IP_NF_CONNTRACK=m -# CONFIG_IP_NF_CT_ACCT is not set -# CONFIG_IP_NF_CONNTRACK_MARK is not set -# CONFIG_IP_NF_CONNTRACK_EVENTS is not set -CONFIG_IP_NF_CT_PROTO_SCTP=m -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -# CONFIG_IP_NF_NETBIOS_NS is not set -CONFIG_IP_NF_TFTP=m -CONFIG_IP_NF_AMANDA=m -# CONFIG_IP_NF_PPTP is not set -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_LIMIT=m -CONFIG_IP_NF_MATCH_IPRANGE=m -CONFIG_IP_NF_MATCH_MAC=m -CONFIG_IP_NF_MATCH_PKTTYPE=m -CONFIG_IP_NF_MATCH_MARK=m -CONFIG_IP_NF_MATCH_MULTIPORT=m -CONFIG_IP_NF_MATCH_TOS=m -CONFIG_IP_NF_MATCH_RECENT=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_DSCP=m -CONFIG_IP_NF_MATCH_AH_ESP=m -CONFIG_IP_NF_MATCH_LENGTH=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_TCPMSS=m -CONFIG_IP_NF_MATCH_HELPER=m -CONFIG_IP_NF_MATCH_STATE=m -CONFIG_IP_NF_MATCH_CONNTRACK=m -CONFIG_IP_NF_MATCH_OWNER=m -CONFIG_IP_NF_MATCH_PHYSDEV=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_REALM=m -# CONFIG_IP_NF_MATCH_SCTP is not set -# CONFIG_IP_NF_MATCH_DCCP is not set -CONFIG_IP_NF_MATCH_COMMENT=m -CONFIG_IP_NF_MATCH_HASHLIMIT=m -# CONFIG_IP_NF_MATCH_STRING is not set -CONFIG_IP_NF_FILTER=m -# CONFIG_IP_NF_TARGET_REJECT is not set -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_TARGET_TCPMSS=m -# CONFIG_IP_NF_TARGET_NFQUEUE is not set -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_SAME=m -CONFIG_IP_NF_NAT_SNMP_BASIC=m -CONFIG_IP_NF_NAT_IRC=m -CONFIG_IP_NF_NAT_FTP=m -CONFIG_IP_NF_NAT_TFTP=m -CONFIG_IP_NF_NAT_AMANDA=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_TOS=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_DSCP=m -CONFIG_IP_NF_TARGET_MARK=m -CONFIG_IP_NF_TARGET_CLASSIFY=m -# CONFIG_IP_NF_TARGET_TTL is not set -# CONFIG_IP_NF_RAW is not set -# CONFIG_IP_NF_ARPTABLES is not set - -# -# IPv6: Netfilter Configuration (EXPERIMENTAL) -# -# CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set - -# -# Bridge: Netfilter Configuration -# -# CONFIG_BRIDGE_NF_EBTABLES is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_SCTP is not set -# CONFIG_ATM is not set -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -# CONFIG_DECNET is not set -CONFIG_LLC=m -# CONFIG_LLC2 is not set -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=y -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_NET_DIVERT 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 -CONFIG_NET_CLS_ROUTE=y - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -# CONFIG_HAMRADIO 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_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -# CONFIG_BT_HIDP is not set - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUSB=m -CONFIG_BT_HCIUSB_SCO=y -# CONFIG_BT_HCIUART is not set -CONFIG_BT_HCIBCM203X=m -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIVHCI is not set -# CONFIG_IEEE80211 is not set - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=m - -# -# Connector - unified userspace <-> kernelspace linker -# -# CONFIG_CONNECTOR is not set - -# -# Memory Technology Devices (MTD) -# -CONFIG_MTD=y -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY 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_BLOCK=y -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=y -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_GEN_PROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -# CONFIG_MTD_CFI_NOSWAP is not set -CONFIG_MTD_CFI_BE_BYTE_SWAP=y -# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -CONFIG_MTD_MAP_BANK_WIDTH_2=y -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -# 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_OTP is not set -CONFIG_MTD_CFI_INTELEXT=y -# CONFIG_MTD_CFI_AMDSTD is not set -# 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 -# CONFIG_MTD_XIP is not set - -# -# Mapping drivers for chip access -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_ARM_INTEGRATOR is not set -CONFIG_MTD_IXP4XX=y -# CONFIG_MTD_PCI is not set -# CONFIG_MTD_PLATRAM is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLKMTD 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 - -# -# NAND Flash Device Drivers -# -# CONFIG_MTD_NAND is not set - -# -# OneNAND Flash Device Drivers -# -# CONFIG_MTD_ONENAND is not set - -# -# Parallel port support -# -# CONFIG_PARPORT is not set - -# -# Plug and Play support -# - -# -# Block devices -# -# CONFIG_BLK_CPQ_DA is not set -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_UMEM is not set -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=4 -CONFIG_BLK_DEV_RAM_SIZE=10240 -CONFIG_BLK_DEV_INITRD=y -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_ATA_OVER_ETH is not set - -# -# ATA/ATAPI/MFM/RLL support -# -CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=y -# CONFIG_IDEDISK_MULTI_MODE is not set -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_IDEPCI_SHARE_IRQ is not set -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_SL82C105 is not set -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -CONFIG_IDEDMA_PCI_AUTO=y -# CONFIG_IDEDMA_ONLYDISK is not set -CONFIG_BLK_DEV_AEC62XX=m -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -# CONFIG_BLK_DEV_HPT34X is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_SC1200 is not set -# CONFIG_BLK_DEV_PIIX is not set -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set -# CONFIG_IDE_ARM is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set -CONFIG_IDEDMA_AUTO=y -# CONFIG_BLK_DEV_HD is not set - -# -# SCSI device support -# -# CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CHR_DEV_OSST is not set -CONFIG_BLK_DEV_SR=m -# CONFIG_BLK_DEV_SR_VENDOR 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 - -# -# SCSI Transport Attributes -# -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_ATTRS is not set - -# -# SCSI low-level drivers -# -# CONFIG_ISCSI_TCP is not set -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_3W_9XXX is not set -# CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC7XXX_OLD is not set -# CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_DPT_I2O is not set -# CONFIG_MEGARAID_NEWGEN is not set -# CONFIG_MEGARAID_LEGACY is not set -# CONFIG_MEGARAID_SAS is not set -# CONFIG_SCSI_SATA is not set -# CONFIG_SCSI_BUSLOGIC is not set -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -# CONFIG_SCSI_GDTH is not set -# CONFIG_SCSI_IPS is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_IPR is not set -# CONFIG_SCSI_QLOGIC_FC is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -CONFIG_SCSI_QLA2XXX=n -# CONFIG_SCSI_QLA21XX is not set -# CONFIG_SCSI_QLA22XX is not set -# CONFIG_SCSI_QLA2300 is not set -# CONFIG_SCSI_QLA2322 is not set -# CONFIG_SCSI_QLA6312 is not set -# CONFIG_SCSI_QLA24XX is not set -# CONFIG_SCSI_LPFC is not set -# CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set - -# -# Multi-device support (RAID and LVM) -# -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_RAID5=m -CONFIG_MD_RAID6=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_CRYPT is not set -# CONFIG_DM_SNAPSHOT is not set -# CONFIG_DM_MIRROR is not set -# CONFIG_DM_ZERO is not set -# CONFIG_DM_MULTIPATH is not set - -# -# Fusion MPT device support -# -# CONFIG_FUSION is not set -# CONFIG_FUSION_SPI is not set -# CONFIG_FUSION_FC is not set -# CONFIG_FUSION_SAS is not set - -# -# IEEE 1394 (FireWire) support -# -# CONFIG_IEEE1394 is not set - -# -# I2O device support -# -# CONFIG_I2O is not set - -# -# Network device support -# -CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_EQUALIZER is not set -CONFIG_TUN=m - -# -# ARCnet devices -# -# CONFIG_ARCNET is not set - -# -# PHY device support -# -# CONFIG_PHYLIB is not set - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -CONFIG_MACLIST=y -CONFIG_MII=y -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -# CONFIG_CASSINI is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_SMC91X is not set -# CONFIG_DM9000 is not set - -# -# Tulip family network device support -# -# CONFIG_NET_TULIP is not set -# CONFIG_HP100 is not set -CONFIG_NET_PCI=y -# CONFIG_PCNET32 is not set -# CONFIG_AMD8111_ETH is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_B44 is not set -# CONFIG_FORCEDETH is not set -# CONFIG_DGRS is not set -# CONFIG_EEPRO100 is not set -# CONFIG_E100 is not set -# CONFIG_FEALNX is not set -# CONFIG_NATSEMI is not set -# CONFIG_NE2K_PCI is not set -# CONFIG_8139CP is not set -# CONFIG_8139TOO is not set -# CONFIG_SIS900 is not set -# CONFIG_EPIC100 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_TLAN is not set -# CONFIG_VIA_RHINE is not set - -# -# Ethernet (1000 Mbit) -# -# CONFIG_ACENIC is not set -# CONFIG_DL2K is not set -# CONFIG_E1000 is not set -# CONFIG_NS83820 is not set -# CONFIG_HAMACHI is not set -# CONFIG_YELLOWFIN is not set -# CONFIG_R8169 is not set -# CONFIG_SIS190 is not set -# CONFIG_SKGE is not set -# CONFIG_SK98LIN is not set -# CONFIG_VIA_VELOCITY is not set -# CONFIG_TIGON3 is not set -# CONFIG_BNX2 is not set - -# -# Ethernet (10000 Mbit) -# -# CONFIG_CHELSIO_T1 is not set -# CONFIG_IXGB is not set -# CONFIG_S2IO is not set - -# -# Token Ring devices -# -# CONFIG_TR is not set - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y - -# -# Obsolete Wireless cards support (pre-802.11) -# -# CONFIG_STRIP is not set - -# -# Wireless 802.11b ISA/PCI cards support -# -# CONFIG_AIRO is not set -# CONFIG_HERMES is not set -# CONFIG_ATMEL is not set - -# -# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support -# -# CONFIG_PRISM54 is not set -# CONFIG_HOSTAP is not set -CONFIG_NET_WIRELESS=y - -# -# Wan interfaces -# -# CONFIG_WAN is not set -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -CONFIG_PPP=m -# CONFIG_PPP_MULTILINK is not set -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -# CONFIG_PPP_SYNC_TTY is not set -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -# CONFIG_PPP_MPPE is not set -# CONFIG_PPPOE is not set -# CONFIG_SLIP is not set -# CONFIG_NET_FC is not set -# CONFIG_SHAPER is not set -CONFIG_NETCONSOLE=m -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_RX is not set -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y - -# -# ISDN subsystem -# -# CONFIG_ISDN is not set - -# -# Input device support -# -CONFIG_INPUT=m - -# -# Userland interfaces -# -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_TSDEV is not set -CONFIG_INPUT_EVDEV=m -# 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_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 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=2 -# CONFIG_SERIAL_8250_EXTENDED is not set - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_JSM is not set -CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=16 - -# -# IPMI -# -# CONFIG_IPMI_HANDLER is not set - -# -# Watchdog Cards -# -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -# CONFIG_SOFT_WATCHDOG is not set -CONFIG_IXP4XX_WATCHDOG=y - -# -# PCI-based Watchdog Cards -# -# CONFIG_PCIPCWATCHDOG is not set -# CONFIG_WDTPCI is not set - -# -# USB-based Watchdog Cards -# -# CONFIG_USBPCWATCHDOG is not set -# CONFIG_NVRAM is not set -CONFIG_RTC=y -# CONFIG_DTLK is not set -# CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set - -# -# Ftape, the floppy tape device driver -# -# CONFIG_DRM is not set -# CONFIG_RAW_DRIVER is not set - -# -# TPM devices -# -# CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set - -# -# I2C support -# -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y - -# -# I2C Algorithms -# -CONFIG_I2C_ALGOBIT=y -# CONFIG_I2C_ALGOPCF is not set -# CONFIG_I2C_ALGOPCA is not set - -# -# I2C Hardware Bus support -# -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI1563 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD8111 is not set -# CONFIG_I2C_I801 is not set -# CONFIG_I2C_I810 is not set -# CONFIG_I2C_PIIX4 is not set -# CONFIG_I2C_IOP3XX is not set -CONFIG_I2C_IXP4XX=y -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_PROSAVAGE is not set -# CONFIG_I2C_SAVAGE4 is not set -# CONFIG_SCx200_ACB is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set -# CONFIG_I2C_SIS96X is not set -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_VIA is not set -# CONFIG_I2C_VIAPRO is not set -# CONFIG_I2C_VOODOO3 is not set -# CONFIG_I2C_PCA_ISA is not set - -# -# Miscellaneous I2C Chip support -# -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_DS1374 is not set -# CONFIG_SENSORS_EEPROM is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_RTC8564 is not set -# CONFIG_SENSORS_MAX6875 is not set -# CONFIG_RTC_X1205_I2C is not set -CONFIG_RTC_PCF8563_I2C=y -CONFIG_I2C_DEBUG_CORE=y -CONFIG_I2C_DEBUG_ALGO=y -CONFIG_I2C_DEBUG_BUS=y -CONFIG_I2C_DEBUG_CHIP=y - -# -# Hardware Monitoring support -# -CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SIS5595 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_VIA686A is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Misc devices -# - -# -# Multimedia Capabilities Port drivers -# - -# -# Multimedia devices -# -CONFIG_VIDEO_DEV=m - -# -# Video For Linux -# - -# -# Video Adapters -# -CONFIG_VIDEO_BT848=m -# CONFIG_VIDEO_SAA6588 is not set -CONFIG_VIDEO_CPIA=m -CONFIG_VIDEO_CPIA_USB=m -CONFIG_VIDEO_SAA5246A=m -CONFIG_VIDEO_SAA5249=m -CONFIG_TUNER_3036=m -CONFIG_VIDEO_STRADIS=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_SAA7134=m -# CONFIG_VIDEO_SAA7134_ALSA is not set -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DPC=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_CX88=m -# CONFIG_VIDEO_EM28XX is not set -CONFIG_VIDEO_OVCAMCHIP=m -# CONFIG_VIDEO_AUDIO_DECODER is not set -# CONFIG_VIDEO_DECODER is not set - -# -# Radio Adapters -# -# CONFIG_RADIO_GEMTEK_PCI is not set -# CONFIG_RADIO_MAXIRADIO is not set -# CONFIG_RADIO_MAESTRO is not set - -# -# Digital Video Broadcasting Devices -# -# CONFIG_DVB is not set -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_VIDEO_VIDEOBUF=m -CONFIG_VIDEO_TUNER=m -CONFIG_VIDEO_BUF=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_IR=m -CONFIG_VIDEO_TVEEPROM=m - -# -# Graphics support -# -# CONFIG_FB is not set - -# -# Sound -# -CONFIG_SOUND=m - -# -# Advanced Linux Sound Architecture -# -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -# CONFIG_SND_SEQUENCER is not set -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -# CONFIG_SND_RTCTIMER is not set -# 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 - -# -# PCI devices -# -# CONFIG_SND_ALI5451 is not set -# CONFIG_SND_ATIIXP is not set -# CONFIG_SND_ATIIXP_MODEM is not set -# CONFIG_SND_AU8810 is not set -# CONFIG_SND_AU8820 is not set -# CONFIG_SND_AU8830 is not set -# CONFIG_SND_AZT3328 is not set -# CONFIG_SND_BT87X is not set -# CONFIG_SND_CS46XX is not set -# CONFIG_SND_CS4281 is not set -# CONFIG_SND_EMU10K1 is not set -# CONFIG_SND_EMU10K1X is not set -# CONFIG_SND_CA0106 is not set -# CONFIG_SND_KORG1212 is not set -# CONFIG_SND_MIXART is not set -# CONFIG_SND_NM256 is not set -# CONFIG_SND_RME32 is not set -# CONFIG_SND_RME96 is not set -# CONFIG_SND_RME9652 is not set -# CONFIG_SND_HDSP is not set -# CONFIG_SND_HDSPM is not set -# CONFIG_SND_TRIDENT is not set -# CONFIG_SND_YMFPCI is not set -# CONFIG_SND_AD1889 is not set -# CONFIG_SND_ALS4000 is not set -# CONFIG_SND_CMIPCI is not set -# CONFIG_SND_ENS1370 is not set -# CONFIG_SND_ENS1371 is not set -# CONFIG_SND_ES1938 is not set -# CONFIG_SND_ES1968 is not set -# CONFIG_SND_MAESTRO3 is not set -# CONFIG_SND_FM801 is not set -# CONFIG_SND_ICE1712 is not set -# CONFIG_SND_ICE1724 is not set -# CONFIG_SND_INTEL8X0 is not set -# CONFIG_SND_INTEL8X0M is not set -# CONFIG_SND_SONICVIBES is not set -# CONFIG_SND_VIA82XX is not set -# CONFIG_SND_VIA82XX_MODEM is not set -# CONFIG_SND_VX222 is not set -# CONFIG_SND_HDA_INTEL is not set - -# -# ALSA ARM devices -# - -# -# USB devices -# -CONFIG_SND_USB_AUDIO=m - -# -# Open Sound System -# -# CONFIG_SOUND_PRIME is not set - -# -# USB support -# -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_SPLIT_ISO=y -# CONFIG_USB_EHCI_ROOT_HUB_TT is not set -# CONFIG_USB_ISP116X_HCD is not set -CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_BIG_ENDIAN is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=y -# CONFIG_USB_SL811_HCD is not set - -# -# USB Device Class drivers -# -# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m - -# -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' -# - -# -# 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_ONETOUCH is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=m -CONFIG_USB_HIDINPUT=y -# CONFIG_HID_FF is not set -CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -CONFIG_USB_KBD=m -# CONFIG_USB_MOUSE is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_ACECAD is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set -# CONFIG_USB_MTOUCH is not set -# CONFIG_USB_ITMTOUCH is not set -# CONFIG_USB_EGALAX is not set -# CONFIG_USB_YEALINK is not set -# CONFIG_USB_XPAD is not set -# CONFIG_USB_ATI_REMOTE is not set -# CONFIG_USB_KEYSPAN_REMOTE is not set -# CONFIG_USB_APPLETOUCH is not set - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - -# -# USB Multimedia devices -# -# CONFIG_USB_DABUSB is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_DSBR is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_OV511 is not set -# CONFIG_USB_SE401 is not set -# CONFIG_USB_SN9C102 is not set -# CONFIG_USB_STV680 is not set -# CONFIG_USB_W9968CF is not set -CONFIG_USB_PWC=m - -# -# 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_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_GL620A is not set -CONFIG_USB_NET_NET1080=m -# CONFIG_USB_NET_PLUSB is not set -# CONFIG_USB_NET_RNDIS_HOST is not set -# CONFIG_USB_NET_CDC_SUBSET is not set -CONFIG_USB_NET_ZAURUS=m -# CONFIG_USB_ZD1201 is not set -# CONFIG_USB_MON is not set - -# -# USB port drivers -# - -# -# USB Serial Converter support -# -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_AIRPRIME is not set -# CONFIG_USB_SERIAL_ANYDATA is not set -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -# CONFIG_USB_SERIAL_KEYSPAN is not set -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_PL2303=m -# CONFIG_USB_SERIAL_HP4X is not set -CONFIG_USB_SERIAL_SAFE=m -# CONFIG_USB_SERIAL_SAFE_PADDED is not set -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_EZUSB=y - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_AUERSWALD is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGETKIT is not set -# CONFIG_USB_PHIDGETSERVO is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_LD is not set -# CONFIG_USB_TEST is not set - -# -# USB DSL modem support -# - -# -# USB Gadget Support -# -# CONFIG_USB_GADGET is not set - -# -# MMC/SD Card support -# -# CONFIG_MMC is not set - -# -# Real Time Clock -# -CONFIG_RTC_CLASS=y - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y - -# -# RTC drivers -# -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_TEST is not set - -# -# File systems -# -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -# CONFIG_JFS_FS is not set -CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_ROMFS_FS is not set -CONFIG_INOTIFY=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 - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_ZISOFS_FS=m -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_HUGETLB_PAGE is not set -CONFIG_RAMFS=y -# CONFIG_RELAYFS_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_JFFS_FS is not set -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -# CONFIG_JFFS2_NATIVE_ENDIAN is not set -CONFIG_JFFS2_BIG_ENDIAN=y -# CONFIG_JFFS2_LITTLE_ENDIAN is not set -# CONFIG_CRAMFS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set - -# -# Network File Systems -# -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set -CONFIG_NFS_V4=y -CONFIG_NFS_DIRECTIO=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set -CONFIG_NFSD_V4=y -CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_EXPERIMENTAL is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set -# CONFIG_9P_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_EFI_PARTITION is not set - -# -# Native Language Support -# -CONFIG_NLS=m -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m - -# -# Profiling support -# -# CONFIG_PROFILING is not set - -# -# Kernel hacking -# -# CONFIG_PRINTK_TIME is not set -# CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_FRAME_POINTER=y -# CONFIG_DEBUG_USER is not set - -# -# Security options -# -# CONFIG_KEYS is not set -# CONFIG_SECURITY is not set - -# -# Cryptographic options -# -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -# CONFIG_CRYPTO_NULL is not set -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_TEST=m - -# -# Hardware crypto devices -# - -# -# Library routines -# -CONFIG_CRC_CCITT=m -# CONFIG_CRC16 is not set -CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y diff --git a/packages/linux/nas100d-kernel_2.6.15.bb b/packages/linux/nas100d-kernel_2.6.15.bb deleted file mode 100644 index 092f5ffc31..0000000000 --- a/packages/linux/nas100d-kernel_2.6.15.bb +++ /dev/null @@ -1,34 +0,0 @@ -# Kernel for Iomega NAS 100d -# -# Increment PR_CONFIG for changes to the nas100d-kernel specific -# defconfig (do *NOT* increment anything in here for changes -# to other kernel configs!) -PR_CONFIG = "0" -# -# Increment the number below (i.e. the digits after PR) when -# making changes within this file or for changes to the patches -# applied to the kernel. -PR = "r2.${PR_CONFIG}" - -include nas100d-kernel.inc - -# N1K_PATCHES - full list of patches to apply -N1K_PATCHES = "\ - file://00-memory-h-page-shift.patch;patch=1 \ - file://10-mtdpart-redboot-fis-byteswap.patch;patch=1 \ - file://15-jffs2-endian-config.patch;patch=1 \ - file://40-rtc-class.patch;patch=1 \ - file://50-nas100d-arch.patch;patch=1 \ - file://60-nas100d-ide.patch;patch=1 \ - file://60-nas100d-i2c.patch;patch=1 \ - file://85-timer.patch;patch=1 \ - file://91-maclist.patch;patch=1 \ - file://92-nas100d-maclist.patch;patch=1 \ - file://anonymiser.patch;patch=1 \ -" - -# These options get added to the kernel command line, only put things -# specific to the bootstrap of *this* kernel in here - DISTRO specfic -# config must be in CMDLINE_ROOT (see the full definition of CMDLINE -# in nas100d-kernel.inc) -CMDLINE_KERNEL_OPTIONS = "pcf8563.hctosys=1" diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb index df3103fd79..0944089f12 100644 --- a/packages/meta/slugos-image.bb +++ b/packages/meta/slugos-image.bb @@ -1,10 +1,13 @@ -# This describes a generic NSLU2 image, even though the bb file is +# This describes a generic SlugOS image, even though the bb file is # called 'slugos-image.bb' the distro specific configuration is # done in conf/distro/${DISTRO}.conf (which should always include # conf/distro/slugos.conf to get the standard settings). # +DESCRIPTION = "Generic SlugOS image" +MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" +HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r19" +PR = "r20" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! @@ -40,7 +43,7 @@ EXTRA_IMAGEDEPENDS += "${PACK_IMAGE_DEPENDS}" # This hack removes '${MACHINE}' from the end of the arch.conf for ipk, # preventing _mach.ipk (with no byte sex) taking precedence over everything # else. -IMAGE_POSTPROCESS_COMMAND += "sed '$d' '${IMAGE_ROOTFS}/etc/ipkg/arch.conf';" +IMAGE_POSTPROCESS_COMMAND += "sed -i '$d' '${IMAGE_ROOTFS}/etc/ipkg/arch.conf';" # These depends define native utilities - they do not get put in the flash and # are not required to build the image. diff --git a/packages/meta/slugos-imagename.bb b/packages/meta/slugos-imagename.bb index a6967a6208..2637524407 100644 --- a/packages/meta/slugos-imagename.bb +++ b/packages/meta/slugos-imagename.bb @@ -1,6 +1,7 @@ # This is an inglorious hack to provide a package to match # ${SLUGOS_IMAGENAME}-image MAINTAINER = "John Bowler <jbowler@acm.org> +LICENSE = "MIT" PN = "${SLUGOS_IMAGENAME}-image" PV = "0" PR = "r0" diff --git a/packages/mplayer/mplayer-atty-1.1.4/.mtn2git_empty b/packages/mplayer/mplayer-atty-1.1.4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.4/.mtn2git_empty +++ /dev/null diff --git a/packages/mplayer/mplayer-atty-1.1.4/Makefile-libs.patch b/packages/mplayer/mplayer-atty-1.1.4/Makefile-libs.patch deleted file mode 100644 index 03456aca4a..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.4/Makefile-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mplayer-1.1.4/Makefile.orig 2005-06-24 15:36:12.974059040 +0000 -+++ mplayer-1.1.4/Makefile 2005-06-24 15:36:31.628223176 +0000 -@@ -245,7 +245,7 @@ - ifeq ($(TARGET_WIN32),yes) - windres -o osdep/mplayer-rc.o osdep/mplayer.rc - endif -- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) -+ $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) $(LDFLAGS) - cp $(PRG) $(PRG).debug - $(STRIP) $(PRG) - diff --git a/packages/mplayer/mplayer-atty-1.1.4/Makefile.patch b/packages/mplayer/mplayer-atty-1.1.4/Makefile.patch deleted file mode 100644 index 78161e79ee..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.4/Makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.orig 2005-04-07 10:19:08.392784784 +0100 -+++ Makefile 2005-04-07 10:21:26.262825352 +0100 -@@ -8,11 +8,6 @@ - - PRG_CFG = codec-cfg - --# Do not strip the binaries at installation --ifeq ($(STRIPBINARIES),yes) --INSTALLSTRIP = -s --endif -- - # These subdirectories require installation due to binaries within them. - ifeq ($(VIDIX),yes) - SUBDIRS += libdha vidix -@@ -283,7 +278,7 @@ - $(MENCODER_DEP): version.h help_mp.h - - $(PRG_CFG): version.h codec-cfg.c codec-cfg.h -- $(HOST_CC) $(HOST_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS) -+ $(BUILD_CC) $(BUILD_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS) - - install: $(ALL_PRG) - ifeq ($(VIDIX),yes) -@@ -368,7 +363,6 @@ - @for a in $(PARTS); do $(MAKE) -C $$a distclean; done - - strip: -- strip -s $(ALL_PRG) - - dep: depend - diff --git a/packages/mplayer/mplayer-atty-1.1.4/dsputil.patch b/packages/mplayer/mplayer-atty-1.1.4/dsputil.patch deleted file mode 100644 index 962f1bc1e3..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.4/dsputil.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- mplayer-1.0.1/libavcodec/armv4l/dsputil_arm.c.orig 2005-04-08 09:16:18.310720680 +0000 -+++ mplayer-1.0.1/libavcodec/armv4l/dsputil_arm.c 2005-04-08 09:18:11.679486008 +0000 -@@ -248,22 +248,22 @@ - c->idct_permutation_type= FF_NO_IDCT_PERM; - } - -- c->put_pixels_tab[0][0] = put_pixels16_arm; -- c->put_pixels_tab[0][1] = put_pixels16_x2_arm; -- c->put_pixels_tab[0][2] = put_pixels16_y2_arm; -- c->put_pixels_tab[0][3] = put_pixels16_xy2_arm; -- c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm; -- c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm; -- c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm; -- c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm; -- c->put_pixels_tab[1][0] = put_pixels8_arm; -- c->put_pixels_tab[1][1] = put_pixels8_x2_arm; -- c->put_pixels_tab[1][2] = put_pixels8_y2_arm; -- c->put_pixels_tab[1][3] = put_pixels8_xy2_arm; -- c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm; -- c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm; -- c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm; -- c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm; -+ /* c->put_pixels_tab[0][0] = put_pixels16_arm; */ // NG! -+ c->put_pixels_tab[0][1] = put_pixels16_x2_arm; //OK! -+ c->put_pixels_tab[0][2] = put_pixels16_y2_arm; //OK! -+ /* c->put_pixels_tab[0][3] = put_pixels16_xy2_arm; /\* NG *\/ */ -+ /* c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm; // ?(.....) */ -+ c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm; // OK -+ c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm; //OK -+ /* c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm; //NG */ -+ c->put_pixels_tab[1][0] = put_pixels8_arm; //OK -+ c->put_pixels_tab[1][1] = put_pixels8_x2_arm; //OK -+ /* c->put_pixels_tab[1][2] = put_pixels8_y2_arm; //NG */ -+ /* c->put_pixels_tab[1][3] = put_pixels8_xy2_arm; //NG */ -+ c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm;//OK -+ c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm; //OK -+ c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm; //OK -+ /* c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm;//NG */ - - #ifdef HAVE_IWMMXT - dsputil_init_iwmmxt(c, avctx); diff --git a/packages/mplayer/mplayer-atty-1.1.4/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.4/libmpcodecs-ogg-include.patch deleted file mode 100644 index 9ca1266c4b..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.4/libmpcodecs-ogg-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- MPlayer-1.0pre7/libmpcodecs/Makefile.orig 2005-04-19 12:09:24.313075760 +0100 -+++ MPlayer-1.0pre7/libmpcodecs/Makefile 2005-04-19 12:09:55.204379568 +0100 -@@ -50,7 +50,7 @@ - SRCS2=$(ENCODER_SRCS) - OBJS2=$(SRCS2:.c=.o) - --CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE -+CFLAGS = -I.. $(OPTFLAGS) -I. -Inative -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE - - .SUFFIXES: .c .o - diff --git a/packages/mplayer/mplayer-atty-1.1.4/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.4/libmpdemux-ogg-include.patch deleted file mode 100644 index 059a397926..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.4/libmpdemux-ogg-include.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- MPlayer-1.0pre7/libmpdemux/Makefile.orig 2005-04-19 12:03:18.032758832 +0100 -+++ MPlayer-1.0pre7/libmpdemux/Makefile 2005-04-19 12:04:01.934084816 +0100 -@@ -36,8 +36,8 @@ - - OBJS = $(SRCS:.c=.o) - OBJS += $(CPLUSPLUSSRCS:.cpp=.o) --INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) --CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) -+INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) -+CFLAGS = -I.. $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) - CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) - CPLUSPLUS = $(CC) - diff --git a/packages/mplayer/mplayer-atty-1.1.4/sdl.patch b/packages/mplayer/mplayer-atty-1.1.4/sdl.patch deleted file mode 100644 index d74c8397b9..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.4/sdl.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./configure.orig 2004-09-24 19:09:56.000000000 +0930 -+++ ./configure 2004-09-24 19:22:21.000000000 +0930 -@@ -3554,38 +3554,6 @@ - ################# - - --echocheck "SDL" --if test -z "$_sdlconfig" ; then -- if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then -- _sdlconfig="sdl-config" -- elif ( sdl11-config --version ) >>"$TMPLOG" 2>&1 ; then -- _sdlconfig="sdl11-config" -- else -- _sdlconfig=false -- fi --fi --if test "$_sdl" = auto || test "$_sdl" = yes ; then -- cat > $TMPC << EOF --#include <SDL.h> --int main(int argc, char *argv[]) { return 0; } --EOF -- _sdl=no -- if "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then -- if cc_check `$_sdlconfig --cflags` `$_sdlconfig --libs` >>"$TMPLOG" 2>&1 ; then -- _sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'` -- if test "$_sdlversion" -gt 116 ; then -- if test "$_sdlversion" -lt 121 ; then -- _def_sdlbuggy='#define BUGGY_SDL' -- else -- _def_sdlbuggy='#undef BUGGY_SDL' -- fi -- _sdl=yes -- else -- _sdl=outdated -- fi -- fi -- fi --fi - if test "$_sdl" = yes ; then - _def_sdl='#define HAVE_SDL 1' - if cygwin ; then diff --git a/packages/mplayer/mplayer-atty_1.1.4.bb b/packages/mplayer/mplayer-atty_1.1.4.bb deleted file mode 100644 index 9afdab203b..0000000000 --- a/packages/mplayer/mplayer-atty_1.1.4.bb +++ /dev/null @@ -1,97 +0,0 @@ -DESCRIPTION = "Open Source multimedia player." -SECTION = "opie/multimedia" -PRIORITY = "optional" -HOMEPAGE = "http://atty.jp/?Zaurus%2Fmplayer" -DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg" -LICENSE = "GPL" -RCONFLICTS = "mplayer" -MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" -PR = "r1" - -SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \ - file://Makefile.patch;patch=1;pnum=0 \ - file://sdl.patch;patch=1 \ - file://Makefile-libs.patch;patch=1 \ - file://libmpdemux-ogg-include.patch;patch=1 \ - file://libmpcodecs-ogg-include.patch;patch=1 " - -PARALLEL_MAKE = "" - -DEPENDS_append_c7x0 = " sharp-aticore-oss" -PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}" -PACKAGE_ARCH_akita = "${MACHINE_ARCH}" -PACKAGE_ARCH_spitz = "${MACHINE_ARCH}" - -S = "${WORKDIR}/mplayer-${PV}" - -PACKAGES =+ "postproc postproc-dev" - -FILES_${PN} = "${bindir}/mplayer" - -FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0" -FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a" - -inherit autotools - -EXTRA_OECONF = " \ - --prefix=/usr \ - --mandir=${mandir} \ - --target=${TARGET_SYS} \ - --enable-shared-pp \ - \ - --disable-win32 \ - --disable-macosx \ - --disable-dvdread \ - --disable-mpdvdkit \ - --disable-tv \ - --disable-tv-v4l \ - --disable-tv-v4l2 \ - --disable-tv-bsdbt848 \ - --disable-mencoder \ - --disable-live \ - --disable-smb \ - \ - --enable-dynamic-plugins \ - --enable-fbdev \ - --enable-sdl \ - --with-sdl-config=${STAGING_BINDIR}/sdl-config \ - \ - --enable-mad \ - --enable-vorbis \ - \ - --enable-ossaudio \ - \ - --enable-rtc \ - --disable-ipp \ - --disable-iwmmxt \ - \ - --with-extralibdir=${STAGING_LIBDIR} " - -EXTRA_OECONF_append_c7x0 = " --enable-w100" -EXTRA_OECONF_append_akita = " --enable-bvdd" -EXTRA_OECONF_append_spitz = " --enable-bvdd" - -do_configure() { - ./configure ${EXTRA_OECONF} -} - -do_install_append () { - install -d ${D}${libdir} ${D}${includedir} ${D}${includedir}/postproc - install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/ - oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}${libdir} - cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0 - cd ${D}${libdir} - ln -sf libpostproc.so.0.0.0 libpostproc.so.0 - ln -sf libpostproc.so.0 libpostproc.so -} - -do_stage () { - oe_libinstall -a -so -C libavcodec/libpostproc libpostproc ${STAGING_LIBDIR} - cd ${STAGING_LIBDIR} - ln -sf libpostproc.so libpostproc.so.0.0.0 - ln -sf libpostproc.so libpostproc.so.0 - - install -d ${STAGING_INCDIR}/postproc - install -m 0644 ${S}/libavcodec/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h -} - diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb index eb8d8ad124..a45c43b05d 100644 --- a/packages/mplayer/mplayer-atty_1.1.5.bb +++ b/packages/mplayer/mplayer-atty_1.1.5.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" -HOMEPAGE = "http://atty.jp/?Zaurus%2Fmplayer" +HOMEPAGE = "http://atty.skr.jp/?Zaurus%2Fmplayer" DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib" LICENSE = "GPL" RCONFLICTS = "mplayer" MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" -PR = "r3" +PR = "r4" SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \ file://Makefile.patch;patch=1;pnum=0 \ @@ -25,20 +25,15 @@ PACKAGE_ARCH_spitz = "${MACHINE_ARCH}" S = "${WORKDIR}/mplayer-${PV}" -PACKAGES =+ "postproc postproc-dev" - FILES_${PN} = "${bindir}/mplayer" -FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0" -FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a" - inherit autotools EXTRA_OECONF = " \ --prefix=/usr \ --mandir=${mandir} \ --target=${TARGET_SYS} \ - --enable-shared-pp \ + --disable-shared-pp \ \ --disable-win32 \ --disable-macosx \ @@ -78,23 +73,3 @@ do_configure() { ./configure ${EXTRA_OECONF} } -do_install_append () { - install -d ${D}${libdir} ${D}${includedir} ${D}${includedir}/postproc - install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/ - oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}${libdir} - cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0 - cd ${D}${libdir} - ln -sf libpostproc.so.0.0.0 libpostproc.so.0 - ln -sf libpostproc.so.0 libpostproc.so -} - -do_stage () { - oe_libinstall -a -so -C libavcodec/libpostproc libpostproc ${STAGING_LIBDIR} - cd ${STAGING_LIBDIR} - ln -sf libpostproc.so libpostproc.so.0.0.0 - ln -sf libpostproc.so libpostproc.so.0 - - install -d ${STAGING_INCDIR}/postproc - install -m 0644 ${S}/libavcodec/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h -} - diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb index 961f68ec92..a9ace88530 100644 --- a/packages/mplayer/mplayer_1.0pre7.bb +++ b/packages/mplayer/mplayer_1.0pre7.bb @@ -11,8 +11,8 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://libmpdemux-ogg-include.patch;patch=1 \ file://libmpcodecs-ogg-include.patch;patch=1 " MAINTAINER="Graeme Gregory <dp@xora.org.uk>" -RCONFLICTS="mplayer-atty" -PR = "r1" +RCONFLICTS_${PN} = "mplayer-atty" +PR = "r2" PARALLEL_MAKE = "" diff --git a/packages/linux/nas100d-kernel/.mtn2git_empty b/packages/opie-packagemanager/opie-packagemanager-1.2.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/nas100d-kernel/.mtn2git_empty +++ b/packages/opie-packagemanager/opie-packagemanager-1.2.1/.mtn2git_empty diff --git a/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff b/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff new file mode 100644 index 0000000000..37b4b9bc13 --- /dev/null +++ b/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff @@ -0,0 +1,123 @@ +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.cpp,v +retrieving revision 1.23 +diff -u -u -r1.23 oipkg.cpp +--- packagemanager/oipkg.cpp 5 Jun 2005 22:18:10 -0000 1.23 ++++ packagemanager/oipkg.cpp 14 Jan 2006 12:10:24 -0000 +@@ -422,6 +422,8 @@ + m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL ); + // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); + m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); ++ m_ipkgArgs.force_removal_of_dependent_packages = ( m_ipkgExecOptions & FORCE_RECURSIVE ); ++ m_ipkgArgs.verbose_wget = ( m_ipkgExecOptions & FORCE_VERBOSE_WGET ); + m_ipkgArgs.verbosity = m_ipkgExecVerbosity; + if ( m_ipkgArgs.dest ) + free( m_ipkgArgs.dest ); +Index: oipkg.h +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.h,v +retrieving revision 1.8 +diff -u -u -r1.8 oipkg.h +--- packagemanager/oipkg.h 5 Jun 2005 22:18:10 -0000 1.8 ++++ packagemanager/oipkg.h 14 Jan 2006 12:10:24 -0000 +@@ -43,6 +43,8 @@ + #define FORCE_REMOVE 0x0002 + #define FORCE_REINSTALL 0x0004 + #define FORCE_OVERWRITE 0x0008 ++#define FORCE_RECURSIVE 0x0010 ++#define FORCE_VERBOSE_WGET 0x0020 + + class OConfItemList; + +Index: oipkgconfigdlg.cpp +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/oipkgconfigdlg.cpp,v +retrieving revision 1.20 +diff -u -u -r1.20 oipkgconfigdlg.cpp +--- packagemanager/oipkgconfigdlg.cpp 5 Jun 2005 22:41:15 -0000 1.20 ++++ packagemanager/oipkgconfigdlg.cpp 14 Jan 2006 12:10:24 -0000 +@@ -150,6 +150,10 @@ + options |= FORCE_REMOVE; + if ( m_optForceOverwrite->isChecked() ) + options |= FORCE_OVERWRITE; ++ if ( m_optForceRecursive->isChecked() ) ++ options |= FORCE_RECURSIVE; ++ if ( m_optVerboseWget->isChecked() ) ++ options |= FORCE_VERBOSE_WGET; + m_ipkg->setIpkgExecOptions( options ); + m_ipkg->setIpkgExecVerbosity( m_optVerboseIpkg->currentItem() ); + +@@ -336,9 +340,17 @@ + QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) ); + layout->addMultiCellWidget( m_optForceOverwrite, 3, 3, 0, 1 ); + ++ m_optForceRecursive = new QCheckBox( tr( "Force Recursive" ), container ); ++ QWhatsThis::add( m_optForceRecursive, tr( "Tap here to enable or disable the '-recursive' option for Ipkg." ) ); ++ layout->addMultiCellWidget( m_optForceRecursive, 4, 4, 0, 1 ); ++ ++ m_optVerboseWget = new QCheckBox( tr( "Verbose fetch" ), container ); ++ QWhatsThis::add( m_optVerboseWget, tr( "Tap here to enable or disable the '-verbose_wget' option for Ipkg." ) ); ++ layout->addMultiCellWidget( m_optVerboseWget, 5, 5, 0, 1 ); ++ + QLabel *l = new QLabel( tr( "Information level:" ), container ); + QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); +- layout->addMultiCellWidget( l, 4, 4, 0, 1 ); ++ layout->addMultiCellWidget( l, 6, 6, 0, 1 ); + + m_optVerboseIpkg = new QComboBox( container ); + QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); +@@ -346,15 +358,15 @@ + m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); + m_optVerboseIpkg->insertItem( tr( "Informative messages" ) ); + m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); +- layout->addMultiCellWidget( m_optVerboseIpkg, 5, 5, 0, 1 ); ++ layout->addMultiCellWidget( m_optVerboseIpkg, 7, 7, 0, 1 ); + + l = new QLabel( tr( "Package source lists directory:" ), container ); + QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) ); +- layout->addMultiCellWidget( l, 6, 6, 0, 1 ); ++ layout->addMultiCellWidget( l, 8, 8, 0, 1 ); + + m_optSourceLists = new QLineEdit( container ); + QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); +- layout->addWidget( m_optSourceLists, 7, 0 ); ++ layout->addWidget( m_optSourceLists, 9, 0 ); + + QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ), + QString::null, container ); +@@ -362,7 +374,7 @@ + btn->setMaximumWidth( btn->height() ); + QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); + connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); +- layout->addWidget( btn, 7, 1 ); ++ layout->addWidget( btn, 9, 1 ); + + layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); + } +@@ -433,6 +445,10 @@ + m_optForceRemove->setChecked( true ); + if ( options & FORCE_OVERWRITE ) + m_optForceOverwrite->setChecked( true ); ++ if ( options & FORCE_RECURSIVE ) ++ m_optForceRecursive->setChecked( true ); ++ if ( options & FORCE_VERBOSE_WGET ) ++ m_optVerboseWget->setChecked( true ); + + m_optVerboseIpkg->setCurrentItem( m_ipkg->ipkgExecVerbosity() ); + } +Index: oipkgconfigdlg.h +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/oipkgconfigdlg.h,v +retrieving revision 1.10 +diff -u -u -r1.10 oipkgconfigdlg.h +--- packagemanager/oipkgconfigdlg.h 5 Jun 2005 22:18:10 -0000 1.10 ++++ packagemanager/oipkgconfigdlg.h 14 Jan 2006 12:10:24 -0000 +@@ -96,6 +96,8 @@ + QCheckBox *m_optForceReinstall; // Force reinstall ipkg option checkbox + QCheckBox *m_optForceRemove; // Force remove ipkg option checkbox + QCheckBox *m_optForceOverwrite; // Force overwrite ipkg option checkbox ++ QCheckBox *m_optForceRecursive; // Force recursive ipkg option checkbox ++ QCheckBox *m_optVerboseWget; // Force verbose_wget ipkg option checkbox + QComboBox *m_optVerboseIpkg; // Ipkg verbosity option selection + QLineEdit *m_optSourceLists; // Ipkg source lists destination directory + diff --git a/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb b/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb index 385ca61fdb..66dfd0604d 100644 --- a/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb +++ b/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb @@ -1,6 +1,8 @@ include ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://0114_opie-pm-recursive-verbose_wget.diff;patch=1" diff --git a/packages/qpf-fonts/qpf-dejavusans_2.1.bb b/packages/qpf-fonts/qpf-dejavusans_2.2.bb index 3428d98a89..3428d98a89 100644 --- a/packages/qpf-fonts/qpf-dejavusans_2.1.bb +++ b/packages/qpf-fonts/qpf-dejavusans_2.2.bb diff --git a/packages/qpf-fonts/qpf-dejavusanscondensed_2.1.bb b/packages/qpf-fonts/qpf-dejavusanscondensed_2.2.bb index 7494374023..7494374023 100644 --- a/packages/qpf-fonts/qpf-dejavusanscondensed_2.1.bb +++ b/packages/qpf-fonts/qpf-dejavusanscondensed_2.2.bb diff --git a/packages/qpf-fonts/qpf-dejavusansmono_2.1.bb b/packages/qpf-fonts/qpf-dejavusansmono_2.2.bb index 51c9e1b925..51c9e1b925 100644 --- a/packages/qpf-fonts/qpf-dejavusansmono_2.1.bb +++ b/packages/qpf-fonts/qpf-dejavusansmono_2.2.bb diff --git a/packages/qpf-fonts/qpf-dejavuserif_2.1.bb b/packages/qpf-fonts/qpf-dejavuserif_2.2.bb index 81009e8a8c..81009e8a8c 100644 --- a/packages/qpf-fonts/qpf-dejavuserif_2.1.bb +++ b/packages/qpf-fonts/qpf-dejavuserif_2.2.bb diff --git a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.1.bb b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.2.bb index db31216907..db31216907 100644 --- a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.1.bb +++ b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.2.bb diff --git a/packages/sylpheed/files/Makefile-am.patch b/packages/sylpheed/files/Makefile-am.patch new file mode 100644 index 0000000000..d1fb09ffcf --- /dev/null +++ b/packages/sylpheed/files/Makefile-am.patch @@ -0,0 +1,12 @@ +--- sylpheed-1.9.12/src/Makefile.am.orig 2006-01-16 13:14:05.000000000 +0000 ++++ sylpheed-1.9.12/src/Makefile.am 2006-01-16 13:14:19.000000000 +0000 +@@ -177,8 +177,7 @@ + -DG_LOG_DOMAIN=\"Sylpheed\" \ + $(GTK_CFLAGS) \ + $(GDK_PIXBUF_CFLAGS) \ +- $(GPGME_CFLAGS) \ +- -I$(includedir) ++ $(GPGME_CFLAGS) + + sylpheed_LDADD = \ + $(INTLLIBS) \ diff --git a/packages/sylpheed/sylpheed_1.9.12.bb b/packages/sylpheed/sylpheed_1.9.12.bb index 00da7907a7..b02aead205 100644 --- a/packages/sylpheed/sylpheed_1.9.12.bb +++ b/packages/sylpheed/sylpheed_1.9.12.bb @@ -3,10 +3,11 @@ DESCRIPTION = "Mail user agent" DEPENDS = "gtk+ gpgme gnutls" MAINTAINER = "Phil Blundell <pb@handhelds.org>" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://sylpheed.good-day.net/sylpheed/v1.9/sylpheed-1.9.12.tar.bz2 \ - file://sylpheed-gnutls.patch;patch=1" + file://sylpheed-gnutls.patch;patch=1 \ + file://Makefile-am.patch;patch=1" FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN}-doc += "${datadir}" diff --git a/packages/ttf-fonts/ttf-dejavu_2.1.bb b/packages/ttf-fonts/ttf-dejavu_2.2.bb index ca84ccbe8e..ca84ccbe8e 100644 --- a/packages/ttf-fonts/ttf-dejavu_2.1.bb +++ b/packages/ttf-fonts/ttf-dejavu_2.2.bb diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb index 6ebbd2ce40..788b8580c4 100644 --- a/packages/xserver/xserver-kdrive_20050207.bb +++ b/packages/xserver/xserver-kdrive_20050207.bb @@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r10" +PR = "r11" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" @@ -66,4 +66,5 @@ S = "${WORKDIR}/xserver" inherit autotools pkgconfig -EXTRA_OECONF = "--enable-composite --disable-xinerama" +LDFLAGS += " -lXfont -lXdmcp -lXau " +EXTRA_OECONF = "--enable-static=no --disable-static --enable-composite --disable-xinerama" |