diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-12 18:34:07 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-12 18:34:07 +0000 |
| commit | 474883fbc33df9784812e4ccd669d48b0cfd75ce (patch) | |
| tree | d5f0615f447389170cbf48954f9a614815e2e000 | |
| parent | 761bfdca711fcfd38a1be2f15119ec3a6a0d63ee (diff) | |
| parent | d0e9d51dbd5fc3bf911861a3349a13b84aa7b97a (diff) | |
merge of '5ff0c6a73c856c171a050f6f6bc0df2ce24137b2'
and 'f3780bcc3524d0bdc5a415852de6fa66fc3526ba'
212 files changed, 2089 insertions, 19346 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 054fc18ce6..eae78b2b8b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -141,6 +141,12 @@ Machines: omap5912osk Distros: openomap Recipes: xerces-c, omniorb +Person: Philippe De Swert +Mail: philippedeswert@scarlet.be +Recipes: gpe-*_svn, libgpe*_svn, libgtkstylus_svn, libtododb_svn +Recipes: libxsettings*_svn, libgtkinput_svn, libschedule_svn +Recipes: blueprobe_svn, detect-stylus_svn. + Person: Richard Purdie Mail: rpurdie@rpsys.net Distros: poky, openzaurus, Ã…ngström diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 5d6d5649c7..80e6e32af7 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -40,7 +40,8 @@ def get_siteinfo_list(d): "mipsel-linux": "endian-little bit-32 common-glibc",\ "mipsel-linux-uclibc": "endian-little bit-32 common-uclibc",\ "powerpc-darwin": "endian-big bit-32 common-darwin",\ - "powerpc-linux": "endian-big bit-32 common-glibc",\ + "ppc-linux": "endian-big bit-32 common-glibc",\ + "powerpc-linux": "endian-big bit-32 common-glibc",\ "powerpc-linux-uclibc": "endian-big bit-32 common-uclibc",\ "sh3-linux": "endian-little bit-32 common-glibc sh-common",\ "sh4-linux": "endian-little bit-32 common-glibc sh-common",\ diff --git a/conf/bitbake.conf b/conf/bitbake.conf index f86dd4c7ef..55c0e51295 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -324,6 +324,7 @@ SOURCEFORGE_MIRROR = "http://surfnet.dl.sourceforge.net" GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" GPEPHONE_MIRROR = "http://gpephone.linuxtogo.org/download/gpephone" GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}" +GPE_EXTRA_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra;module=${PN}" GPEPHONE_SVN = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source;module=${PN}" XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" XORG_MIRROR = "http://xorg.freedesktop.org/releases" diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index 2a33ad4164..59123fd6b5 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -2,131 +2,10 @@ #@NAME: DebianSlug #@DESCRIPTION: DebianSlug Linux Distribution for the NSLU2 -#---------------------------------------------------------------------------------- -# STANDARD DebianSlug DEFINITIONS -#---------------------------------------------------------------------------------- DISTRO_NAME = "DebianSlug" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED = "unstable" -DISTRO_TYPE = "beta" -SLUGOS_IMAGENAME = "debianslug" -SLUGOS_IMAGESEX = "little-endian" +IMAGE_BASENAME = "debianslug" +TARGET_ARCH = "arm" +ARM_INSTRUCTION_SET = "arm" +TARGET_OS = "linux" -# debianslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "1" - -# NOTE: to build new packages set DEBIANSLUG_EXTRA_BBFILES to the full path name to -# the .bb files for the packages to build - see debianslug-packages.conf in this -# directory -DEBIANSLUG_EXTRA_BBFILES ?= "" - -#---------------------------------------------------------------------------------- -# FIRMWARE CONFIGURATION -#---------------------------------------------------------------------------------- -# EXTRA PACKAGES -# -------------- -# Filesystem support modules are listed in here for easy removal, -# as is the lrzsz serial package and other kernel modules which are -# not absolutely required for boot. -# NOTE: only jffs2 support is an absolute requirement of boot, even -# the ext2/ext3 support is optional! -DEBIANSLUG_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks" - -# The standard firmware contents and additional packages built as requirements -# of the firmware are defined here in DEBIANSLUG_STANDARD_RDEPENDS and -# DEBIANSLUG_STANDARD_DEPENDS respectively. -DEBIANSLUG_STANDARD_RDEPENDS = "" - -# Support for a variety of file systems is built in to the debianslug -# image, programs to format disks with these file systems may be -# added or removed. By default ext2 and ext3 support -# is included by the following lines. -# -# These lines add support for formatting ext2 and ext3 file systems -# on a hard disk attached to the NSLU2. ext3 is the standard Linux -# file system. -DEBIANSLUG_STANDARD_RDEPENDS += "${DEBIANSLUG_EXT2_PROGS}" - -# These lines add support for an X/Y/ZModem package called lrzsz -# (this is of use for people with modified NSLU2 hardware which -# supports a serial port.) -DEBIANSLUG_STANDARD_RDEPENDS += "lrzsz" - -# Filesystem selection. Adding entries here adds the module to the -# image. The module must be built as part of nslu2-kernel (i.e. it -# must be specified as a module in the defconfig file). The NLS -# support charset modules must be given explicitly and must match -# the codepage/iocharset and NLS handling for the file systems which -# require them. The installed lanugage set is minimal but sufficient -# for any file system (since it uses utf8). See -# http://www.nslu2-linux.orgwiki/HowTo/MountFATFileSystems -# for more information on the language behaviour of the DOS file -# systems. -# -# KERNEL LEVEL FILE SYSTEM SUPPORT -# -------------------------------- -# NOTE: removing kernel-module-nfs from this list will prevent NFS -# boot (however you can do a simple flash file system boot - no -# attached disk - and install the nfs modules from ssh.) -DEBIANSLUG_STANDARD_RDEPENDS += "\ -kernel-module-ext2 \ -kernel-module-jbd \ -kernel-module-ext3 \ -kernel-module-vfat \ -kernel-module-ntfs \ -kernel-module-isofs \ -kernel-module-udf \ -kernel-module-nls-cp437 \ -kernel-module-nls-utf8 \ -" - -# Add daemon required for HW RNG support -DEBIANSLUG_STANDARD_RDEPENDS += "\ -rng-tools \ -" - -# Add modules required for usb support -DEBIANSLUG_STANDARD_RDEPENDS += "\ -kernel-module-ohci-hcd \ -kernel-module-uhci-hcd \ -" - -# Add modules required for IDE support -DEBIANSLUG_STANDARD_RDEPENDS += "\ -kernel-module-libata \ -kernel-module-pata-artop \ -" - -# Add modules required for Network support -OPENSLUG_STANDARD_RDEPENDS += "\ -kernel-module-via-velocity \ -" - -# This documents other file systems which are built but not installed -# by default in the flash image. -# -# kernel-module-msdos - mounts a FAT file system without long file names -# (use kernel-module-vfat, it shows the long names -# if present.) - -# The 'standard' values are the defaults for the 'extra' packages added -# to the firmware image. None of these things are requirements to have -# a bootable, useable, system however they *are* expected to be present -# in DebianSlug - see slugos-lag for a more minimal configuration and some -# more instructions about how to make a non-debianslug image. -DEBIANSLUG_EXTRA_RDEPENDS ?= "" -SLUGOS_EXTRA_RDEPENDS = "${DEBIANSLUG_STANDARD_RDEPENDS} ${DEBIANSLUG_EXTRA_RDEPENDS}" - -#---------------------------------------------------------------------------------- -# PACKAGE VERSION CONTROL -#---------------------------------------------------------------------------------- -PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" - -#---------------------------------------------------------------------------------- -# BASE VERSION SELECTION -#---------------------------------------------------------------------------------- -# l - little-endian -# a - ARM instruction set -# g - glibc -# -require conf/distro/slugos-lag.conf +require conf/distro/slugos.conf diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 79ec27af72..9efe1d5d90 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -37,10 +37,6 @@ TARGET_FPU_arm ?= "soft" TARGET_FPU_armeb ?= "soft" TARGET_FPU_ixp4xx ?= "soft" - -#Make a LE jffs2 image -SLUGOS_IMAGESEX = "little-endian" - #Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" @@ -50,4 +46,4 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci" -DISTRO_FEATURES_nslu2le = "nfs smbfs alsa bluetooth ext2 usbhost pci" +DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci" diff --git a/conf/distro/include/debianslug-packages.inc b/conf/distro/include/debianslug-packages.inc deleted file mode 100644 index a4b9a6720f..0000000000 --- a/conf/distro/include/debianslug-packages.inc +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${DEBIANSLUG_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/freeze.inc b/conf/distro/include/freeze.inc index d41cb89111..4c2c8b1e2e 100644 --- a/conf/distro/include/freeze.inc +++ b/conf/distro/include/freeze.inc @@ -14,12 +14,10 @@ FROZEN_DIR ?= "/non/-existent/-directory/-for/-security" # Pull in the frozen definitions (if they exist) The multiple # includes allow the frozen file to be stored alongside local.conf -# and in the conf/distro directory - the former take precedence over -# the latter. -require conf/distro/include/${DISTRO}-packages.inc +# and in a distro-specific frozen directory - the former take +# precedence over the latter. include conf/${DISTRO}-packages.conf include ${FROZEN_DIR}/${DISTRO}-packages.conf -require conf/distro/include/${DISTRO}-bbfiles.inc include conf/${DISTRO}-bbfiles.conf include ${FROZEN_DIR}/${DISTRO}-bbfiles.conf diff --git a/conf/distro/include/openslug-native-packages.inc b/conf/distro/include/openslug-native-packages.inc deleted file mode 100644 index 7f7a448434..0000000000 --- a/conf/distro/include/openslug-native-packages.inc +++ /dev/null @@ -1,11 +0,0 @@ -# automatically generated by bitbake freeze -BBFILES := "\ -${PKGDIR}/packages/apache/*.bb \ -${PKGDIR}/packages/openssl/*.bb \ -${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/meta/package-index.bb \ -${PKGDIR}/packages/meta/openslug-native-packages.bb \ -${PKGDIR}/packages/freeze/*.bb \ -${PKGDIR}/packages/pcre/*.bb \ -${PKGDIR}/packages/expat/*.bb \ -${OPENSLUG_NATIVE_EXTRA_BBFILES}" diff --git a/conf/distro/include/openslug-packages.inc b/conf/distro/include/openslug-packages.inc deleted file mode 100644 index fe09a7bcfa..0000000000 --- a/conf/distro/include/openslug-packages.inc +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${OPENSLUG_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/slugos-packages.inc b/conf/distro/include/slugos-packages.inc deleted file mode 100644 index 650368a990..0000000000 --- a/conf/distro/include/slugos-packages.inc +++ /dev/null @@ -1,259 +0,0 @@ -BBFILES := "\ -${PKGDIR}/packages/alsa/*.bb \ -${PKGDIR}/packages/apr/*.bb \ -${PKGDIR}/packages/asterisk/*.bb \ -${PKGDIR}/packages/asterisk-sounds/*.bb \ -${PKGDIR}/packages/atftp/*.bb \ -${PKGDIR}/packages/audiofile/*.bb \ -${PKGDIR}/packages/aumix/*.bb \ -${PKGDIR}/packages/autoconf/*.bb \ -${PKGDIR}/packages/automake/*.bb \ -${PKGDIR}/packages/base-files/*.bb \ -${PKGDIR}/packages/base-passwd/*.bb \ -${PKGDIR}/packages/bash/*.bb \ -${PKGDIR}/packages/beep/*.bb \ -${PKGDIR}/packages/bind/*.bb \ -${PKGDIR}/packages/binutils/*.bb \ -${PKGDIR}/packages/bison/*.bb \ -${PKGDIR}/packages/bluez/*.bb \ -${PKGDIR}/packages/bogofilter/*.bb \ -${PKGDIR}/packages/boost/*.bb \ -${PKGDIR}/packages/bridge-utils/*.bb \ -${PKGDIR}/packages/btsco/*.bb \ -${PKGDIR}/packages/busybox/*.bb \ -${PKGDIR}/packages/bwmon/*.bb \ -${PKGDIR}/packages/bzip2/*.bb \ -${PKGDIR}/packages/ccxstream/*.bb \ -${PKGDIR}/packages/cdparanoia/*.bb \ -${PKGDIR}/packages/cdstatus/*.bb \ -${PKGDIR}/packages/cherokee/*.bb \ -${PKGDIR}/packages/coreutils/*.bb \ -${PKGDIR}/packages/cpio/*.bb \ -${PKGDIR}/packages/cron/*.bb \ -${PKGDIR}/packages/ctorrent/*.bb \ -${PKGDIR}/packages/ctrlproxy/*.bb \ -${PKGDIR}/packages/curl/*.bb \ -${PKGDIR}/packages/cvs/*.bb \ -${PKGDIR}/packages/cyrus-imapd/*.bb \ -${PKGDIR}/packages/cyrus-sasl/*.bb \ -${PKGDIR}/packages/davfs2/*.bb \ -${PKGDIR}/packages/db/*.bb \ -${PKGDIR}/packages/dbus/*.bb \ -${PKGDIR}/packages/devio/*.bb \ -${PKGDIR}/packages/device-mapper/*.bb \ -${PKGDIR}/packages/devlabel/*.bb \ -${PKGDIR}/packages/dhcp/*.bb \ -${PKGDIR}/packages/didiwiki/*.bb \ -${PKGDIR}/packages/diffstat/*.bb \ -${PKGDIR}/packages/diffutils/*.bb \ -${PKGDIR}/packages/dnsmasq/*.bb \ -${PKGDIR}/packages/docbook-utils/*.bb \ -${PKGDIR}/packages/dropbear/*.bb \ -${PKGDIR}/packages/dsniff/*.bb \ -${PKGDIR}/packages/e2fsprogs/*.bb \ -${PKGDIR}/packages/e2fsprogs-libs/*.bb \ -${PKGDIR}/packages/eciadsl/*.bb \ -${PKGDIR}/packages/expat/*.bb \ -${PKGDIR}/packages/ez-ipupdate/*.bb \ -${PKGDIR}/packages/fakeroot/*.bb \ -${PKGDIR}/packages/fetchmail/*.bb \ -${PKGDIR}/packages/file/*.bb \ -${PKGDIR}/packages/findutils/*.bb \ -${PKGDIR}/packages/flac/*.bb \ -${PKGDIR}/packages/flex/*.bb \ -${PKGDIR}/packages/freeze/*.bb \ -${PKGDIR}/packages/ftpd-topfield/*.bb \ -${PKGDIR}/packages/gawk/*.bb \ -${PKGDIR}/packages/gcc/*.bb \ -${PKGDIR}/packages/gd/*.bb \ -${PKGDIR}/packages/gdb/*.bb \ -${PKGDIR}/packages/gdbm/*.bb \ -${PKGDIR}/packages/gettext/*.bb \ -${PKGDIR}/packages/glib-1.2/*.bb \ -${PKGDIR}/packages/glib-2.0/*.bb \ -${PKGDIR}/packages/glibc/*.bb \ -${PKGDIR}/packages/gnu-config/*.bb \ -${PKGDIR}/packages/gnutls/*.bb \ -${PKGDIR}/packages/gphoto2/*.bb \ -${PKGDIR}/packages/gpsd/*.bb \ -${PKGDIR}/packages/grep/*.bb \ -${PKGDIR}/packages/groff/*.bb \ -${PKGDIR}/packages/gtk-doc/*.bb \ -${PKGDIR}/packages/gzip/*.bb \ -${PKGDIR}/packages/hal/*.bb \ -${PKGDIR}/packages/hotplug-ng/*.bb \ -${PKGDIR}/packages/icecast/*.bb \ -${PKGDIR}/packages/ifupdown/*.bb \ -${PKGDIR}/packages/initscripts/*.bb \ -${PKGDIR}/packages/install/*.bb \ -${PKGDIR}/packages/intltool/*.bb \ -${PKGDIR}/packages/iperf/*.bb \ -${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/ipkg/*.bb \ -${PKGDIR}/packages/iptables/*.bb \ -${PKGDIR}/packages/ircp/*.bb \ -${PKGDIR}/packages/irssi/*.bb \ -${PKGDIR}/packages/ixp425-eth/*.bb \ -${PKGDIR}/packages/ixp4xx/*.bb \ -${PKGDIR}/packages/joe/*.bb \ -${PKGDIR}/packages/jpeg/*.bb \ -${PKGDIR}/packages/lcdproc/*.bb \ -${PKGDIR}/packages/less/*.bb \ -${PKGDIR}/packages/libaal/*.bb \ -${PKGDIR}/packages/libao/*.bb \ -${PKGDIR}/packages/libdvb/*.bb \ -${PKGDIR}/packages/libexif/*.bb \ -${PKGDIR}/packages/libgcrypt/*.bb \ -${PKGDIR}/packages/libgpg-error/*.bb \ -${PKGDIR}/packages/libgphoto2/*.bb \ -${PKGDIR}/packages/libgsm/*.bb \ -${PKGDIR}/packages/libiconv/*.bb \ -${PKGDIR}/packages/libid3tag/*.bb \ -${PKGDIR}/packages/liblockfile/*.bb \ -${PKGDIR}/packages/libmad/*.bb \ -${PKGDIR}/packages/libmikmod/*.bb \ -${PKGDIR}/packages/libnet/*.bb \ -${PKGDIR}/packages/libnids/*.bb \ -${PKGDIR}/packages/libogg/*.bb \ -${PKGDIR}/packages/libol/*.bb \ -${PKGDIR}/packages/libpcap/*.bb \ -${PKGDIR}/packages/libpng/*.bb \ -${PKGDIR}/packages/libtiff/*.bb \ -${PKGDIR}/packages/libtool/*.bb \ -${PKGDIR}/packages/libusb/*.bb \ -${PKGDIR}/packages/libvorbis/*.bb \ -${PKGDIR}/packages/libxml/*.bb \ -${PKGDIR}/packages/libxslt/* \ -${PKGDIR}/packages/linux-libc-headers/*.bb \ -${PKGDIR}/packages/linux/*.bb \ -${PKGDIR}/packages/lirc/*.bb \ -${PKGDIR}/packages/lrzsz/*.bb \ -${PKGDIR}/packages/lsof/*.bb \ -${PKGDIR}/packages/lvm2/*.bb \ -${PKGDIR}/packages/lzo/*.bb \ -${PKGDIR}/packages/m4/*.bb \ -${PKGDIR}/packages/madplay/*.bb \ -${PKGDIR}/packages/madwifi/*.bb \ -${PKGDIR}/packages/mailx/*.bb \ -${PKGDIR}/packages/make/*.bb \ -${PKGDIR}/packages/makedevs/*.bb \ -${PKGDIR}/packages/man-pages/*.bb \ -${PKGDIR}/packages/man/*.bb \ -${PKGDIR}/packages/masqmail/*.bb \ -${PKGDIR}/packages/mdadm/*.bb \ -${PKGDIR}/packages/memtester/*.bb \ -${PKGDIR}/packages/meta/*.bb \ -${PKGDIR}/packages/mgetty/*.bb \ -${PKGDIR}/packages/miau/*.bb \ -${PKGDIR}/packages/microcom/*.bb \ -${PKGDIR}/packages/minicom/*.bb \ -${PKGDIR}/packages/module-init-tools/*.bb \ -${PKGDIR}/packages/modutils/*.bb \ -${PKGDIR}/packages/monotone/*.bb \ -${PKGDIR}/packages/motion/*.bb \ -${PKGDIR}/packages/mt-daapd/*.bb \ -${PKGDIR}/packages/mtd/*.bb \ -${PKGDIR}/packages/musicpd/*.bb \ -${PKGDIR}/packages/mutt/*.bb \ -${PKGDIR}/packages/mysql/*.bb \ -${PKGDIR}/packages/nail/*.bb \ -${PKGDIR}/packages/nano/*.bb \ -${PKGDIR}/packages/ncftp/*.bb \ -${PKGDIR}/packages/ncurses/*.bb \ -${PKGDIR}/packages/neon/*.bb \ -${PKGDIR}/packages/netbase/*.bb \ -${PKGDIR}/packages/netcat/*.bb \ -${PKGDIR}/packages/netpbm/*.bb \ -${PKGDIR}/packages/nfs-utils/*.bb \ -${PKGDIR}/packages/nis/*.bb \ -${PKGDIR}/packages/nmap/*.bb \ -${PKGDIR}/packages/nslu2-binary-only/*.bb \ -${PKGDIR}/packages/ntp/*.bb \ -${PKGDIR}/packages/obexftp/*.bb \ -${PKGDIR}/packages/openjade/*.bb \ -${PKGDIR}/packages/openldap/*.bb \ -${PKGDIR}/packages/openntpd/*.bb \ -${PKGDIR}/packages/openobex/*.bb \ -${PKGDIR}/packages/opensp/*.bb \ -${PKGDIR}/packages/openssh/*.bb \ -${PKGDIR}/packages/openssl/*.bb \ -${PKGDIR}/packages/openvpn/*.bb \ -${PKGDIR}/packages/pam/*.bb \ -${PKGDIR}/packages/patch/*.bb \ -${PKGDIR}/packages/patcher/*.bb \ -${PKGDIR}/packages/patchutils/*.bb \ -${PKGDIR}/packages/pciutils/*.bb \ -${PKGDIR}/packages/pcmcia-cs/*.bb \ -${PKGDIR}/packages/pcre/*.bb \ -${PKGDIR}/packages/perl/*.bb \ -${PKGDIR}/packages/php/*.bb \ -${PKGDIR}/packages/pkgconfig/*.bb \ -${PKGDIR}/packages/popt/*.bb \ -${PKGDIR}/packages/portmap/*.bb \ -${PKGDIR}/packages/postfix/*.bb \ -${PKGDIR}/packages/ppp/*.bb \ -${PKGDIR}/packages/procps/*.bb \ -${PKGDIR}/packages/psmisc/*.bb \ -${PKGDIR}/packages/puppy/*.bb \ -${PKGDIR}/packages/pvrusb2-mci/*.bb \ -${PKGDIR}/packages/pwc/*.bb \ -${PKGDIR}/packages/python/*.bb \ -${PKGDIR}/packages/qc-usb/*.bb \ -${PKGDIR}/packages/quilt/*.bb \ -${PKGDIR}/packages/radlib/*.bb \ -${PKGDIR}/packages/readline/*.bb \ -${PKGDIR}/packages/reiser4progs/*.bb \ -${PKGDIR}/packages/reiserfsprogs/*.bb \ -${PKGDIR}/packages/rsync/*.bb \ -${PKGDIR}/packages/samba/*.bb \ -${PKGDIR}/packages/sane-backends/*.bb \ -${PKGDIR}/packages/screen/*.bb \ -${PKGDIR}/packages/sed/*.bb \ -${PKGDIR}/packages/setpwc/*.bb \ -${PKGDIR}/packages/setserial/*.bb \ -${PKGDIR}/packages/sgml-common/*.bb \ -${PKGDIR}/packages/slugimage/*.bb \ -${PKGDIR}/packages/slugos-init/*.bb \ -${PKGDIR}/packages/spca5xx/*.bb \ -${PKGDIR}/packages/ssmtp/*.bb \ -${PKGDIR}/packages/strace/*.bb \ -${PKGDIR}/packages/streamripper/*.bb \ -${PKGDIR}/packages/subversion/*.bb \ -${PKGDIR}/packages/sudo/*.bb \ -${PKGDIR}/packages/sysfsutils/*.bb \ -${PKGDIR}/packages/syslog-ng/*.bb \ -${PKGDIR}/packages/sysvinit/*.bb \ -${PKGDIR}/packages/tar/*.bb \ -${PKGDIR}/packages/tcltk/*.bb \ -${PKGDIR}/packages/thttpd/*.bb \ -${PKGDIR}/packages/time/*.bb \ -${PKGDIR}/packages/timezones/*.bb \ -${PKGDIR}/packages/tinylogin/*.bb \ -${PKGDIR}/packages/uclibc/*.bb \ -${PKGDIR}/packages/udev/*.bb \ -${PKGDIR}/packages/unionfs/*.bb \ -${PKGDIR}/packages/unzip/*.bb \ -${PKGDIR}/packages/update-modules/*.bb \ -${PKGDIR}/packages/update-rc.d/*.bb \ -${PKGDIR}/packages/upslug/*.bb \ -${PKGDIR}/packages/usbutils/*.bb \ -${PKGDIR}/packages/util-linux/*.bb \ -${PKGDIR}/packages/vim/*.bb \ -${PKGDIR}/packages/vlan/*.bb \ -${PKGDIR}/packages/vpnc/*.bb \ -${PKGDIR}/packages/vsftpd/*.bb \ -${PKGDIR}/packages/w3cam/*.bb \ -${PKGDIR}/packages/wakelan/*.bb \ -${PKGDIR}/packages/wget/*.bb \ -${PKGDIR}/packages/whois/*.bb \ -${PKGDIR}/packages/wireless-tools/*.bb \ -${PKGDIR}/packages/wpa-supplicant/*.bb \ -${PKGDIR}/packages/wview/*.bb \ -${PKGDIR}/packages/xlibs/*.bb \ -${PKGDIR}/packages/xextensions/*.bb \ -${PKGDIR}/packages/xinetd/*.bb \ -${PKGDIR}/packages/xproto/*.bb \ -${PKGDIR}/packages/zd1211/*.bb \ -${PKGDIR}/packages/zip/*.bb \ -${PKGDIR}/packages/zlib/*.bb \ -${SLUGOS_EXTRA_BBFILES}" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c0401d93d3..a26a069fa0 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -3,28 +3,7 @@ #@DESCRIPTION: SlugOS Linux Distribution for the NSLU2 # WARNING: this file should not be used directly, use one of -# the supported slugos-???.conf instead: - -# Explanation of the naming -# -# slugos-dist - the base distro configuration for an NSLU2 -# slugos-[bl][at][gu] - a specific configuration encoded as follows: -# -# b or l - big or little endian -# -# a or t - ARM or Thumb instructions in the low level libraries -# set ARM_INSTRUCTION_SET to match -# -# g or u - glibc or uclibc libc implementation -# set TARGET_OS to match -# -# The following names are deprecated: -# -# openslug - the historical name of a canonical slugos-bag distro -# also the name of a standard slugos-bag distro with a package feed -# ucslugc - the historical (and obsolete) name of slugos-btu -# also the name of a standard slugos-btu distro with a package feed -# +# the supported slugos-derived distributions instead. #---------------------------------------------------------------------------------- # STANDARD SLUGOS DEFINITIONS @@ -33,6 +12,8 @@ # #DISTRO_NAME #DISTRO_TYPE +#ARM_INSTRUCTION_SET "arm" or "thumb" +#TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions SLUGOS_VERSION = "4.3" @@ -42,11 +23,7 @@ DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}" DISTRO_FEED ?= "unstable" -# The following must also be set, they define the basic format of the build -# -#ARM_INSTRUCTION_SET "arm" or "thumb" -#TARGET_OS "linux" or "linux-uclibc" -#SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format) +IMAGE_BASENAME = "${@['slugos${SITEINFO_ENDIANESS}', 'ucslugc'][bb.data.getVar('TARGET_OS', d, 1) == 'linux-uclibc']}" # The following need not be set, the defaults should be adequate #USE_NLS = "no" or "yes" @@ -62,21 +39,19 @@ TARGET_FPU = "soft" # glib-2.0 builds require USE_NLS to be overridden USE_NLS_glib-2.0 = "yes" -INHERIT += "package_ipk debian" - -DISTRO_BASE = ":slugos" - -# packages/meta/slugos-image.bb generates a binary image of the root file system -# with a name controlled by the following setting - it defaults to the top level -# ${DISTRO_NAME} and this should always be correct, but it may be too specific (e.g. -# if you change the DISTRO from one of the standard ones in a way which does not -# change the generated image). -SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" +INHERIT += "package_ipk debian multimachine" -# pull in the frozen list of bbfiles - this sets BBFILES and this will override any -# setting in local.conf Since this depends on ${DISTRO} it doesn't actually do -# anything by default unless conf/distro/${DISTRO}-packages.conf exists. -# require conf/distro/include/freeze.conf +# FULL_OPTIMIZATION +# Optimization settings. Os works fine and is significantly better than O2. +# The other settings are somewhat arbitrary. The optimisations chosen here +# include the ones which 'break' symbolic debugging (because the compiler does +# not include enough information to allow the debugger to know where given +# values are.) The -fno options are an attempt to cancel explicit use of space +# consuming options found in some packages (this isn't a complete list, this is +# just the ones which package writers seem to know about and abuse). +FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \ + -fno-unroll-loops -fno-inline-functions \ + -fweb -funit-at-a-time" #---------------------------------------------------------------------------------- # FEEDS @@ -84,21 +59,9 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" # when downloading new packages or updating existing packages. Additional feeds # (such as a local feed) can be defined in local.conf #---------------------------------------------------------------------------------- -# Add to the user's feeds from local.conf (there may be none). -# In general slugos-[bl][at][gu] is sufficient to identify a set of packages which -# will work on any derived distro. The slugos-???.conf files set the FEED_URIS to -# an appropriate ipkg.nslu2-linux.org default if nslu2-linux is actually building -# such a feed: # -#FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/${DISTRO_FEED}" -#FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/${DISTRO_FEED}" -# -# When such a feed exists the corresponding 'unstable' feed will normally also -# exist - the packages in unstable are the latest but very unlikely to be the -# greatest. Use at your own risk! -# -#FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/unstable" -#FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/unstable" +FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/cross/${DISTRO_FEED}" +FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/native/${DISTRO_FEED}" #---------------------------------------------------------------------------------- # FIRMWARE CONFIGURATION @@ -111,20 +74,6 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) CMDLINE_DEBUG = "noirqdebug" -# Building a full image. If you set SLUGOS_FLASH_IMAGE to "nslu2" a complete -# 8MByte flash image will be built after the rootfs JFFS2 image. Other options -# may later be defined for other vendor-flashable image types. -# -# If you do this you will need to find a source for the LinkSys software to be -# placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch -# of bytes to flag the image as valid) and 'SysConf' (actually just a block of -# unset data - you could modify this to pre-configure the SysConf partition of the -# image). If you own an NSLU2 then this data is already in the flash of the NSLU2 -# and you can download it (including new versions) from the LinkSys web site - see -# packages/meta/slugos-image.bb for information about where to put the downloaded -# data. -SLUGOS_FLASH_IMAGE ?= "no" - # EXTRA PACKAGES # -------------- # SlugOS builds an image with no extra packages - to add packages to the @@ -154,8 +103,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# compiler/binary/library versions (unslung uses different ones so these -# cannot be in ${MACHINE}.conf) +# compiler/binary/library versions PREFERRED_VERSION_binutils ?= "2.16" PREFERRED_VERSION_binutils-cross ?= "2.16" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" @@ -189,6 +137,8 @@ SRCDATE_irssi ?= "20050930" CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" INHERIT += "nslu2-mirrors" +PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" + PREFERRED_VERSION_ipkg ?= "0.99.154" PREFERRED_VERSION_ipkg-native ?= "0.99.154" diff --git a/conf/distro/include/ucslugc-packages.inc b/conf/distro/include/ucslugc-packages.inc deleted file mode 100644 index 3b3e9fca75..0000000000 --- a/conf/distro/include/ucslugc-packages.inc +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${UCSLUGC_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/unslung-packages.inc b/conf/distro/include/unslung-packages.inc deleted file mode 100644 index e889a65df5..0000000000 --- a/conf/distro/include/unslung-packages.inc +++ /dev/null @@ -1,41 +0,0 @@ -BBFILES := "\ -${PKGDIR}/packages/autoconf/*.bb \ -${PKGDIR}/packages/automake/*.bb \ -${PKGDIR}/packages/binutils/*.bb \ -${PKGDIR}/packages/bison/*.bb \ -${PKGDIR}/packages/busybox/*.bb \ -${PKGDIR}/packages/cpio/*.bb \ -${PKGDIR}/packages/devio/*.bb \ -${PKGDIR}/packages/fakeroot/*.bb \ -${PKGDIR}/packages/file/*.bb \ -${PKGDIR}/packages/findutils/*.bb \ -${PKGDIR}/packages/flex/*.bb \ -${PKGDIR}/packages/freeze/*.bb \ -${PKGDIR}/packages/gcc/*.bb \ -${PKGDIR}/packages/genext2fs/*.bb \ -${PKGDIR}/packages/gettext/*.bb \ -${PKGDIR}/packages/glibc/*.bb \ -${PKGDIR}/packages/gnu-config/*.bb \ -${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/ipkg/*.bb \ -${PKGDIR}/packages/libtool/*.bb \ -${PKGDIR}/packages/linux-libc-headers/*.bb \ -${PKGDIR}/packages/linux/*.bb \ -${PKGDIR}/packages/m4/*.bb \ -${PKGDIR}/packages/makedevs/*.bb \ -${PKGDIR}/packages/meta/*.bb \ -${PKGDIR}/packages/modutils/*.bb \ -${PKGDIR}/packages/mtd/*.bb \ -${PKGDIR}/packages/nslu2-binary-only/*.bb \ -${PKGDIR}/packages/pkgconfig/*.bb \ -${PKGDIR}/packages/portmap/*.bb \ -${PKGDIR}/packages/python/*.bb \ -${PKGDIR}/packages/quilt/*.bb \ -${PKGDIR}/packages/slugimage/*.bb \ -${PKGDIR}/packages/unzip/*.bb \ -${PKGDIR}/packages/update-modules/*.bb \ -${PKGDIR}/packages/wget/*.bb \ -${PKGDIR}/packages/wireless-tools/*.bb \ -${PKGDIR}/packages/zlib/*.bb \ -${PKGDIR}/packages/zd1211/*.bb \ -${UNSLUNG_EXTRA_BBFILES}" diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf index 7452c26eaa..ac77532697 100644 --- a/conf/distro/openslug-native.conf +++ b/conf/distro/openslug-native.conf @@ -1,6 +1,9 @@ +# Our build host is armeb, not armv5eb that the kernel reports +BUILD_ARCH = "armeb" + require conf/distro/openslug.conf -# Corresponting packages should be in openslug-native.bb, +# Corresponding packages should be in openslug-native.bb, # currently missing: ipkg-utils libtool quilt pkgconfig ASSUME_PROVIDED = "libtool-cross \ libtool-native \ @@ -15,6 +18,3 @@ ASSUME_PROVIDED = "libtool-cross \ update-rc.d \ " -# Our build host is armeb, not armv5eb that the kernel reports -BUILD_ARCH = "armeb" - diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 02becf3bae..f03c4f653e 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -2,131 +2,10 @@ #@NAME: OpenSlug #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2 -#---------------------------------------------------------------------------------- -# STANDARD OpenSlug DEFINITIONS -#---------------------------------------------------------------------------------- DISTRO_NAME = "OpenSlug" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED = "unstable" -DISTRO_TYPE = "beta" -SLUGOS_IMAGENAME = "openslug" -SLUGOS_IMAGESEX = "big-endian" +IMAGE_BASENAME = "openslug" +TARGET_ARCH = "armeb" +ARM_INSTRUCTION_SET = "arm" +TARGET_OS = "linux" -# openslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "1" - -# NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to -# the .bb files for the packages to build - see ucslugc-packages.conf in this -# directory -OPENSLUG_EXTRA_BBFILES ?= "" - -#---------------------------------------------------------------------------------- -# FIRMWARE CONFIGURATION -#---------------------------------------------------------------------------------- -# EXTRA PACKAGES -# -------------- -# Filesystem support modules are listed in here for easy removal, -# as is the lrzsz serial package and other kernel modules which are -# not absolutely required for boot. -# NOTE: only jffs2 support is an absolute requirement of boot, even -# the ext2/ext3 support is optional! -OPENSLUG_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks" - -# The standard firmware contents and additional packages built as requirements -# of the firmware are defined here in OPENSLUG_STANDARD_RDEPENDS and -# OPENSLUG_STANDARD_DEPENDS respectively. -OPENSLUG_STANDARD_RDEPENDS = "" - -# Support for a variety of file systems is built in to the openslug -# image, programs to format disks with these file systems may be -# added or removed. By default ext2 and ext3 support -# is included by the following lines. -# -# These lines add support for formatting ext2 and ext3 file systems -# on a hard disk attached to the NSLU2. ext3 is the standard Linux -# file system. -OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_EXT2_PROGS}" - -# These lines add support for an X/Y/ZModem package called lrzsz -# (this is of use for people with modified NSLU2 hardware which -# supports a serial port.) -OPENSLUG_STANDARD_RDEPENDS += "lrzsz" - -# Filesystem selection. Adding entries here adds the module to the -# image. The module must be built as part of nslu2-kernel (i.e. it -# must be specified as a module in the defconfig file). The NLS -# support charset modules must be given explicitly and must match -# the codepage/iocharset and NLS handling for the file systems which -# require them. The installed lanugage set is minimal but sufficient -# for any file system (since it uses utf8). See -# http://www.nslu2-linux.orgwiki/HowTo/MountFATFileSystems -# for more information on the language behaviour of the DOS file -# systems. -# -# KERNEL LEVEL FILE SYSTEM SUPPORT -# -------------------------------- -# NOTE: removing kernel-module-nfs from this list will prevent NFS -# boot (however you can do a simple flash file system boot - no -# attached disk - and install the nfs modules from ssh.) -OPENSLUG_STANDARD_RDEPENDS += "\ -kernel-module-ext2 \ -kernel-module-jbd \ -kernel-module-ext3 \ -kernel-module-vfat \ -kernel-module-ntfs \ -kernel-module-isofs \ -kernel-module-udf \ -kernel-module-nls-cp437 \ -kernel-module-nls-utf8 \ -" - -# Add daemon required for HW RNG support -OPENSLUG_STANDARD_RDEPENDS += "\ -rng-tools \ -" - -# Add modules required for usb support -OPENSLUG_STANDARD_RDEPENDS += "\ -kernel-module-ohci-hcd \ -kernel-module-uhci-hcd \ -" - -# Add modules required for IDE support -OPENSLUG_STANDARD_RDEPENDS += "\ -kernel-module-libata \ -kernel-module-pata-artop \ -" - -# Add modules required for Network support -OPENSLUG_STANDARD_RDEPENDS += "\ -kernel-module-via-velocity \ -" - -# This documents other file systems which are built but not installed -# by default in the flash image. -# -# kernel-module-msdos - mounts a FAT file system without long file names -# (use kernel-module-vfat, it shows the long names -# if present.) - -# The 'standard' values are the defaults for the 'extra' packages added -# to the firmware image. None of these things are requirements to have -# a bootable, useable, system however they *are* expected to be present -# in OpenSlug - see nslu2-bag for a more minimal configuration and some -# more instructions about how to make a non-openslug image. -OPENSLUG_EXTRA_RDEPENDS ?= "" -SLUGOS_EXTRA_RDEPENDS = "${OPENSLUG_STANDARD_RDEPENDS} ${OPENSLUG_EXTRA_RDEPENDS}" - -#---------------------------------------------------------------------------------- -# PACKAGE VERSION CONTROL -#---------------------------------------------------------------------------------- -PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" - -#---------------------------------------------------------------------------------- -# BASE VERSION SELECTION -#---------------------------------------------------------------------------------- -# b - big-endian -# a - ARM instruction set -# g - glibc -# -require conf/distro/slugos-bag.conf +require conf/distro/slugos.conf diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf deleted file mode 100644 index 23e8690752..0000000000 --- a/conf/distro/slugos-bag.conf +++ /dev/null @@ -1,21 +0,0 @@ -#@TYPE: Distribution -#@NAME: SLUGOS-BAG -#@DESCRIPTION: Linux Distribution for the NSLU2 - -# See slugos.conf for an explanation of this file. - -# This slugos variant corresponds to OpenSlug -DISTRO_NAME ?= "slugos-bag" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED ?= "unstable" -DISTRO_TYPE ?= "beta" - -TARGET_ARCH = "armeb" -ARM_INSTRUCTION_SET = "arm" -TARGET_OS = "linux" -SLUGOS_IMAGESEX ?= "big-endian" - -FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-bag/cross/${DISTRO_FEED}" -FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-bag/native/${DISTRO_FEED}" - -require conf/distro/include/slugos.inc diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf deleted file mode 100644 index 5e461ff063..0000000000 --- a/conf/distro/slugos-bau.conf +++ /dev/null @@ -1,19 +0,0 @@ -#@TYPE: Distribution -#@NAME: SLUGOS-BAU -#@DESCRIPTION: Linux Distribution for the NSLU2 - -# See slugos.conf for an explanation of this file. - -# This slugos variant is not supported - there are no nslu2-linux.org -# regular builds and there is no feed. -DISTRO_NAME ?= "slugos-bau" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED ?= "unstable" -DISTRO_TYPE ?= "alpha" - -TARGET_ARCH = "armeb" -ARM_INSTRUCTION_SET = "arm" -TARGET_OS = "linux-uclibc" -SLUGOS_IMAGESEX ?= "big-endian" - -require conf/distro/include/slugos.inc diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf deleted file mode 100644 index 4fbdd9e37b..0000000000 --- a/conf/distro/slugos-btu.conf +++ /dev/null @@ -1,21 +0,0 @@ -#@TYPE: Distribution -#@NAME: SLUGOS-BTU -#@DESCRIPTION: Linux Distribution for the NSLU2 - -# See slugos.conf for an explanation of this file. - -# This slugos variant corresponds to UcSlugC -DISTRO_NAME ?= "slugos-btu" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED ?= "unstable" -DISTRO_TYPE ?= "beta" - -TARGET_ARCH = "armeb" -ARM_INSTRUCTION_SET = "thumb" -TARGET_OS = "linux-uclibc" -SLUGOS_IMAGESEX ?= "big-endian" - -FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-btu/cross/${DISTRO_FEED}" -FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-btu/native/${DISTRO_FEED}" - -require conf/distro/include/slugos.inc diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf deleted file mode 100644 index 838d6cf48b..0000000000 --- a/conf/distro/slugos-lag.conf +++ /dev/null @@ -1,22 +0,0 @@ -#@TYPE: Distribution -#@NAME: SLUGOS-LAG -#@DESCRIPTION: Linux Distribution for the NSLU2 - -# See slugos.conf for an explanation of this file. - -# This slugos variant corresponds to DebianSlug -DISTRO_NAME ?= "slugos-lag" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED ?= "unstable" -DISTRO_TYPE ?= "beta" - -TARGET_ARCH = "arm" -ARM_INSTRUCTION_SET = "arm" -TARGET_OS = "linux" -SLUGOS_IMAGESEX ?= "big-endian" - -FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-lag/cross/${DISTRO_FEED}" -FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-lag/native/${DISTRO_FEED}" - - -require conf/distro/include/slugos.inc diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf deleted file mode 100644 index 7294c1dfd2..0000000000 --- a/conf/distro/slugos-lau.conf +++ /dev/null @@ -1,19 +0,0 @@ -#@TYPE: Distribution -#@NAME: SLUGOS-LAU -#@DESCRIPTION: Linux Distribution for the NSLU2 - -# This slugos variant is not supported - there are no nslu2-linux.org -# regular builds and there is no feed. -DISTRO_NAME ?= "slugos-lau" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED ?= "unstable" -DISTRO_TYPE ?= "alpha" - -TARGET_ARCH = "arm" -ARM_INSTRUCTION_SET = "arm" -TARGET_OS = "linux-uclibc" -SLUGOS_IMAGESEX ?= "big-endian" - -# no feeds - -require conf/distro/include/slugos.inc diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf deleted file mode 100644 index 53fbb407a7..0000000000 --- a/conf/distro/slugos-ltu.conf +++ /dev/null @@ -1,21 +0,0 @@ -#@TYPE: Distribution -#@NAME: SLUGOS-LTU -#@DESCRIPTION: Linux Distribution for the NSLU2 - -# See slugos.conf for an explanation of this file. - -DISTRO_NAME ?= "slugos-ltu" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED ?= "unstable" -DISTRO_TYPE ?= "beta" - -TARGET_ARCH = "arm" -ARM_INSTRUCTION_SET = "thumb" -TARGET_OS = "linux-uclibc" -SLUGOS_IMAGESEX ?= "big-endian" - -FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/cross/${DISTRO_FEED}" -FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/native/${DISTRO_FEED}" - - -require conf/distro/include/slugos.inc diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf new file mode 100644 index 0000000000..32b047aeae --- /dev/null +++ b/conf/distro/slugos.conf @@ -0,0 +1,110 @@ +#@TYPE: Distribution +#@NAME: SlugOS +#@DESCRIPTION: SlugOS Linux Distribution for the NSLU2 + +#---------------------------------------------------------------------------------- +# STANDARD SlugOS/BE DEFINITIONS +#---------------------------------------------------------------------------------- +DISTRO_NAME = "SlugOS" +# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" +# DISTRO_FEED = "unstable" +DISTRO_TYPE = "beta" +TARGET_ARCH ?= "armeb" +ARM_INSTRUCTION_SET = "arm" +TARGET_OS = "linux" + +#---------------------------------------------------------------------------------- +# FIRMWARE CONFIGURATION +#---------------------------------------------------------------------------------- +# EXTRA PACKAGES +# -------------- +# Filesystem support modules are listed in here for easy removal, +# as is the lrzsz serial package and other kernel modules which are +# not absolutely required for boot. +# NOTE: only jffs2 support is an absolute requirement of boot, even +# the ext2/ext3 support is optional! +SLUGOS_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks" + +# The standard firmware contents and additional packages built as requirements +# of the firmware are defined here in SLUGOS_STANDARD_RDEPENDS. +SLUGOS_STANDARD_RDEPENDS = "" + +# Support for a variety of file systems is built in to the slugos +# image, programs to format disks with these file systems may be +# added or removed. By default ext2 and ext3 support +# is included by the following lines. +# +# These lines add support for formatting ext2 and ext3 file systems +# on a hard disk attached to the NSLU2. ext3 is the standard Linux +# file system. +SLUGOS_STANDARD_RDEPENDS += "${SLUGOS_EXT2_PROGS}" + +# These lines add support for an X/Y/ZModem package called lrzsz +# (this is of use for people with modified NSLU2 hardware which +# supports a serial port.) +SLUGOS_STANDARD_RDEPENDS += "lrzsz" + +# Filesystem selection. Adding entries here adds the module to the +# image. The module must be built as part of nslu2-kernel (i.e. it +# must be specified as a module in the defconfig file). The NLS +# support charset modules must be given explicitly and must match +# the codepage/iocharset and NLS handling for the file systems which +# require them. The installed lanugage set is minimal but sufficient +# for any file system (since it uses utf8). See +# http://www.nslu2-linux.orgwiki/HowTo/MountFATFileSystems +# for more information on the language behaviour of the DOS file +# systems. +# +# KERNEL LEVEL FILE SYSTEM SUPPORT +# -------------------------------- +# NOTE: removing kernel-module-nfs from this list will prevent NFS +# boot (however you can do a simple flash file system boot - no +# attached disk - and install the nfs modules from ssh.) +SLUGOS_STANDARD_RDEPENDS += "\ +kernel-module-ext2 \ +kernel-module-jbd \ +kernel-module-ext3 \ +kernel-module-vfat \ +kernel-module-ntfs \ +kernel-module-isofs \ +kernel-module-udf \ +kernel-module-nls-cp437 \ +kernel-module-nls-utf8 \ +" + +# Add daemon required for HW RNG support +SLUGOS_STANDARD_RDEPENDS += "\ +rng-tools \ +" + +# Add modules required for usb support +SLUGOS_STANDARD_RDEPENDS += "\ +kernel-module-ohci-hcd \ +kernel-module-uhci-hcd \ +" + +# Add modules required for IDE support +SLUGOS_STANDARD_RDEPENDS += "\ +kernel-module-libata \ +kernel-module-pata-artop \ +" + +# Add modules required for Network support +SLUGOS_STANDARD_RDEPENDS += "\ +kernel-module-via-velocity \ +" + +# This documents other file systems which are built but not installed +# by default in the flash image. +# +# kernel-module-msdos - mounts a FAT file system without long file names +# (use kernel-module-vfat, it shows the long names +# if present.) + +# The 'standard' values are the defaults for the 'extra' packages added +# to the firmware image. None of these things are requirements to have +# a bootable, useable, system however they *are* expected to be present +# in SlugOS. +SLUGOS_EXTRA_RDEPENDS = "${SLUGOS_STANDARD_RDEPENDS}" + +require conf/distro/include/slugos.inc diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 81d5ea7397..8b64746fe3 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -2,29 +2,14 @@ #@NAME: UcSlugC #@DESCRIPTION: UcSlugC Linux Distribution for the NSLU2 -# This is SLUGOS-BTU with a different name... DISTRO_NAME = "UcSlugC" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED = "unstable" -DISTRO_TYPE = "beta" -SLUGOS_IMAGENAME = "ucslugc" -SLUGOS_IMAGESEX = "big-endian" +IMAGE_BASENAME = "ucslugc" +TARGET_ARCH = "armeb" +ARM_INSTRUCTION_SET = "thumb" +TARGET_OS = "linux-uclibc" PREFERRED_VERSION_gcc-cross-initial = "3.4.4" PREFERRED_VERSION_gcc-cross = "3.4.4" PREFERRED_VERSION_gcc = "3.4.4" -# NOTE: to build new packages set UCSLUGC_EXTRA_BBFILES to the full path name to -# the .bb files for the packages to build - see ucslugc-packages.conf in this -# directory -UCSLUGC_EXTRA_BBFILES ?= "" - -# For compatibility with the old way of overriding these settings names with the -# prefix UCSLUGC_ are used here to default the values of the corresponding NSLU2_ -# setting - either may be set in local.conf to override these values. -UCSLUGC_EXTRA_RDEPENDS ?= "" - -# -SLUGOS_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}" - -require conf/distro/slugos-btu.conf +require conf/distro/include/slugos.inc diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index b25b94d79f..f7ea4ded4d 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -10,10 +10,6 @@ FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stabl FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable" FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable" -# pull in the frozen list of bbfiles -# UNSLUNG_EXTRA_BBFILES ?= "" -# require conf/distro/include/freeze.inc - TARGET_FPU = "soft" TARGET_OS = "linux" diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 0558e03e35..1bab2f5fc7 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -4,56 +4,10 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" -EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 --faketime -n" +EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -#------------------------------------------------------------------------------- -# INPUTS -#------------------------------------------------------------------------------- -# conf/${DISTRO}.conf is included after this file and should be used to modify -# variables identified as 'INPUTS' to the required values for the DISTRO, this -# will cause the board specific settings (which depend for the most part on the -# exact CPU used) to be set correctly within this file. The results are the -# variables identifies here as 'OUTPUTS' -# -#variable = "default" -# <possible values> -# description - -ARM_INSTRUCTION_SET = "arm" -# "arm" "thumb" -# The instruction set the compiler should use when generating application -# code. The kernel is always compiled with arm code at present. arm code -# is the original 32 bit ARM instruction set, thumb code is the 16 bit -# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size) -# but requires more instructions (140% for 70% smaller code) so may be -# slower. - -THUMB_INTERWORK = "yes" -# "yes" "no" -# Whether to compile with code to allow interworking between the two -# instruction sets. This allows thumb code to be executed on a primarily -# arm system and vice versa. It is strongly recommended that DISTROs not -# turn this off - the actual cost is very small. - -DISTRO_BASE = "" -# "" ":<base>" -# If given this must be the name of a 'distro' to add to the bitbake OVERRIDES -# after ${DISTRO}, this allows different distros to share a common base of -# overrides. The value given must include a leading ':' or chaos will result. - -#------------------------------------------------------------------------------- -# OUTPUTS -#------------------------------------------------------------------------------- - -#OVERRIDES -# The standard ':' separated list of overrides used by bitbake - see the -# basic setting in bitbake.conf. This list is based on that used for the -# standard setting however :<base> will be -# inserted at appropriate points if a base distro is enabled in the inputs. -OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast" - require conf/machine/include/tune-xscale.conf require conf/machine/include/tune-thumb.conf @@ -65,16 +19,3 @@ require conf/machine/include/tune-thumb.conf SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" - -# FULL_OPTIMIZATION -# Optimization settings. Os works fine and is significantly better than O2. -# The other settings are somewhat arbitrary. The optimisations chosen here -# include the ones which 'break' symbolic debugging (because the compiler does -# not include enough information to allow the debugger to know where given -# values are.) The -fno options are an attempt to cancel explicit use of space -# consuming options found in some packages (this isn't a complete list, this is -# just the ones which package writers seem to know about and abuse). -FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \ - -fno-unroll-loops -fno-inline-functions \ - -fweb -funit-at-a-time" - diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf index 3397d170f8..0a1e54c324 100644 --- a/conf/machine/ixp4xx.conf +++ b/conf/machine/ixp4xx.conf @@ -2,4 +2,4 @@ #@NAME: Generic IXP4XX kernel #@DESCRIPTION: Machine configuration for a generic ixp4xx board -require conf/machine/include/ixp4xx.conf +MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to ixp4xxle or ixp4xxbe.')} diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf index d9737c9964..f208852d3a 100644 --- a/conf/machine/ixp4xxbe.conf +++ b/conf/machine/ixp4xxbe.conf @@ -3,10 +3,8 @@ #@DESCRIPTION: Machine configuration for a generic ixp4xx board in big-endian mode TARGET_ARCH = "armeb" -# PACKAGE_ARCH is set in tune-xscale.conf -PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb" -MACHINE_ARCH = "ixp4xxbe" +PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb" require conf/machine/include/ixp4xx.conf diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf index 4747fa50c4..d39fa1f603 100644 --- a/conf/machine/ixp4xxle.conf +++ b/conf/machine/ixp4xxle.conf @@ -3,10 +3,8 @@ #@DESCRIPTION: Machine configuration for a generic ixp4xx board in little-endian mode TARGET_ARCH = "arm" -# PACKAGE_ARCH is set in tune-xscale.conf -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" -MACHINE_ARCH = "ixp4xxle" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" require conf/machine/include/ixp4xx.conf diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 966334a0d6..7e45825f69 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -2,20 +2,4 @@ #@NAME: Linksys NSLU2 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product -# Note that TARGET_ARCH gets set by the DISTRO for the "nslu2" machine. -# (Yes, this was a mistake, but it's legacy and can't be easily changed now.) -# The "nslu2" machine is deprecated - use "nslu2le" or "nslu2be" instead. - -require conf/machine/include/ixp4xx.conf - -# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -MACHINE_ARCH = "${@['ixp4xxbe', 'ixp4xxle'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" - -# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -PACKAGE_ARCH = "${@['armeb', 'arm'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" - -# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -PACKAGE_EXTRA_ARCHS = "${@['ixp4xxbe nslu2be', 'ixp4xxle nslu2le'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" - -# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -EXTRA_IMAGECMD_jffs2 += "${@['--big-endian', '--little-endian'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" +MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to nslu2le or nslu2be.')} diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 7cbdd80c1b..16d1ed8508 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -2,8 +2,15 @@ #@NAME: Linksys NSLU2 (big-endian) #@DESCRIPTION: Machine configuration for an NSLU2 in big-endian mode -require conf/machine/ixp4xxbe.conf +TARGET_ARCH = "armeb" + +PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe" MACHINE_ARCH = "ixp4xxbe" +IXP4XX_MACHINE_OVERRIDE = ":nslu2:ixp4xx" + +require conf/machine/include/ixp4xx.conf + +EXTRA_IMAGECMD_jffs2 += "--big-endian" -PACKAGE_EXTRA_ARCHS += "ixp4xxbe" +OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index cc8e8b8b98..1dd1ddaf2f 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -2,8 +2,15 @@ #@NAME: Linksys NSLU2 (little-endian) #@DESCRIPTION: Machine configuration for an NSLU2 in little-endian mode -require conf/machine/ixp4xxle.conf +TARGET_ARCH = "arm" + +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle" MACHINE_ARCH = "ixp4xxle" -PACKAGE_EXTRA_ARCHS += "ixp4xxle" +require conf/machine/include/ixp4xx.conf + +EXTRA_IMAGECMD_jffs2 += "--little-endian" + +OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc index cd95777227..3184be72b4 100644 --- a/packages/abiword/abiword-2.5.inc +++ b/packages/abiword/abiword-2.5.inc @@ -1,8 +1,7 @@ DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word" -SECTION = "gnome/office" HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" LICENSE = "GPLv2" - DEPENDS = "perl-native wv libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb index d488820620..0715026684 100644 --- a/packages/abiword/abiword-plugins_2.4.5.bb +++ b/packages/abiword/abiword-plugins_2.4.5.bb @@ -1,15 +1,14 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -LICENSE="GPLv2" - -DEPENDS = "libwpd librsvg goffice poppler" -PR="r1" +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"" +HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" +LICENSE = "GPLv2" +DEPENDS = "libwpd librsvg goffice poppler" +RDEPENDS='abiword' +PR = "r1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" S = "${WORKDIR}/abiword-${PV}/abiword-plugins" -RDEPENDS='abiword' inherit autotools diff --git a/packages/abiword/abiword-plugins_2.4.6.bb b/packages/abiword/abiword-plugins_2.4.6.bb index 28d076aaa4..21ac8ea909 100644 --- a/packages/abiword/abiword-plugins_2.4.6.bb +++ b/packages/abiword/abiword-plugins_2.4.6.bb @@ -1,15 +1,13 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -LICENSE="GPLv2" - -DEPENDS = "libwpd librsvg goffice poppler" -PR="r0" +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"" +HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" +LICENSE = "GPLv2" +DEPENDS = "libwpd librsvg goffice poppler" +RDEPENDS = "abiword" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" S = "${WORKDIR}/abiword-${PV}/abiword-plugins" -RDEPENDS='abiword' inherit autotools diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc index c8f3243b9c..8569845394 100644 --- a/packages/abiword/abiword.inc +++ b/packages/abiword/abiword.inc @@ -1,8 +1,7 @@ -DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word" -SECTION = "gnome/office" +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word" HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" LICENSE = "GPLv2" - DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.2.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.2.bb deleted file mode 100644 index aa7c7cd64c..0000000000 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.2.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "ARM Kernel Shim" -SECTION = "" -PRIORITY = "optional" -HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" -LICENSE = "GPL" -PR = "r1" - -COMPATIBLE_MACHINE = "(ixp4xx|nslu2)" - -SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \ - file://place-boot-section.patch;patch=1 \ - file://config-nslu2.h \ - file://config-nas100d.h \ - file://config-dsmg600.h \ - file://config-fsg3.h" - -S = ${WORKDIR}/arm-kernel-shim-${PV} - -EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" - -oe_runmake() { - mv ${S}/config.h ${S}/config.h.orig - # NSLU2 - cp ${WORKDIR}/config-nslu2.h ${S}/config.h - rm -f ${S}/main.o - oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 - make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed" - # NAS100d - cp ${WORKDIR}/config-nas100d.h ${S}/config.h - rm -f ${S}/main.o - oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d - make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed" - # DSMG-600 - cp ${WORKDIR}/config-dsmg600.h ${S}/config.h - rm -f ${S}/main.o - oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 - make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed" - # FSG-3 - cp ${WORKDIR}/config-fsg3.h ${S}/config.h - rm -f ${S}/main.o - oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 - make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed" - mv ${S}/config.h.orig ${S}/config.h -} - -do_populate_staging() { - install -d ${STAGING_LOADER_DIR} - cp ${S}/arm-kernel-shim-nslu2.bin ${STAGING_LOADER_DIR}/ - cp ${S}/arm-kernel-shim-nas100d.bin ${STAGING_LOADER_DIR}/ - cp ${S}/arm-kernel-shim-dsmg600.bin ${STAGING_LOADER_DIR}/ - cp ${S}/arm-kernel-shim-fsg3.bin ${STAGING_LOADER_DIR}/ -} diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb new file mode 100644 index 0000000000..a4f5f8f7e9 --- /dev/null +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb @@ -0,0 +1,75 @@ +DESCRIPTION = "ARM Kernel Shim" +SECTION = "" +PRIORITY = "optional" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +PR = "r2" + +COMPATIBLE_MACHINE = "(ixp4xx|nslu2)" + +SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \ + file://config-nslu2.h \ + file://config-nas100d.h \ + file://config-dsmg600.h \ + file://config-fsg3.h" + +S = ${WORKDIR}/arm-kernel-shim-${PV}/${PV} + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + mv ${S}/config.h ${S}/config.h.orig + # NSLU2 + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-nslu2.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-nslu2.h > ${S}/config.h + fi + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed" + # NAS100d + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-nas100d.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-nas100d.h > ${S}/config.h + fi + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed" + # DSMG-600 + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-dsmg600.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-dsmg600.h > ${S}/config.h + fi + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed" + # FSG-3 + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-fsg3.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-fsg3.h > ${S}/config.h + fi + rm -f ${S}/main.o + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed" + mv ${S}/config.h.orig ${S}/config.h +} + +do_populate_staging() { + install -d ${STAGING_LOADER_DIR} + cp ${S}/arm-kernel-shim-nslu2.bin ${STAGING_LOADER_DIR}/ + cp ${S}/arm-kernel-shim-nas100d.bin ${STAGING_LOADER_DIR}/ + cp ${S}/arm-kernel-shim-dsmg600.bin ${STAGING_LOADER_DIR}/ + cp ${S}/arm-kernel-shim-fsg3.bin ${STAGING_LOADER_DIR}/ +} diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h index cd331159e0..56b4035408 100644 --- a/packages/arm-kernel-shim/files/config-dsmg600.h +++ b/packages/arm-kernel-shim/files/config-dsmg600.h @@ -27,4 +27,9 @@ #define MACH_TYPE 964 +/* Uncomment one of these if you need to switch the CPU into a + specific mode. */ +//#define FORCE_LITTLEENDIAN +//#define FORCE_BIGENDIAN + #endif /* __CONFIG_H__ */ diff --git a/packages/arm-kernel-shim/files/config-fsg3.h b/packages/arm-kernel-shim/files/config-fsg3.h index e2cdf8abd4..08684d708e 100644 --- a/packages/arm-kernel-shim/files/config-fsg3.h +++ b/packages/arm-kernel-shim/files/config-fsg3.h @@ -27,4 +27,9 @@ #define MACH_TYPE 1091 +/* Uncomment one of these if you need to switch the CPU into a + specific mode. */ +//#define FORCE_LITTLEENDIAN +//#define FORCE_BIGENDIAN + #endif /* __CONFIG_H__ */ diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h index 4389644cf0..846161d016 100644 --- a/packages/arm-kernel-shim/files/config-nas100d.h +++ b/packages/arm-kernel-shim/files/config-nas100d.h @@ -23,8 +23,13 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE\ - "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs rw noirqdebug console=ttyS0,115200n8" + "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" #define MACH_TYPE 865 +/* Uncomment one of these if you need to switch the CPU into a + specific mode. */ +//#define FORCE_LITTLEENDIAN +//#define FORCE_BIGENDIAN + #endif /* __CONFIG_H__ */ diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h index 2262b57668..d641523841 100644 --- a/packages/arm-kernel-shim/files/config-nslu2.h +++ b/packages/arm-kernel-shim/files/config-nslu2.h @@ -23,8 +23,13 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE\ - "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs rw noirqdebug console=ttyS0,115200n8" + "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" #define MACH_TYPE 597 +/* Uncomment one of these if you need to switch the CPU into a + specific mode. */ +//#define FORCE_LITTLEENDIAN +//#define FORCE_BIGENDIAN + #endif /* __CONFIG_H__ */ diff --git a/packages/arm-kernel-shim/files/disable-commandline.patch b/packages/arm-kernel-shim/files/disable-commandline.patch deleted file mode 100644 index d8c59f1a6b..0000000000 --- a/packages/arm-kernel-shim/files/disable-commandline.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- arm-kernel-shim/main.c~ 2006-07-21 11:12:07.000000000 +0930 -+++ arm-kernel-shim/main.c 2007-01-28 11:56:35.000000000 +1030 -@@ -47,7 +47,9 @@ - - #define NAKED __attribute__((naked)) - -+#if defined (COMMANDLINE) - const char __attribute__((section(".rodata"))) cmdline[] = COMMANDLINE; -+#endif - - void NAKED __attribute__((section(".boot"))) boot (u32 r0, u32 r1, u32 r2) - { -@@ -82,6 +84,7 @@ - pv += H_SIZE(pv)*4; - #endif - -+#if defined (COMMANDLINE) - /* Command line */ - H_SIZE(pv) = tag_size(tag_cmdline) + (sizeof (cmdline)+1+3)/4; - H_TAG(pv) = ATAG_CMDLINE; -@@ -91,6 +94,7 @@ - P_CMDLINE(pv)->cmdline[i] = cmdline[i]; - } - pv += H_SIZE(pv)*4; -+#endif - - /* End */ - H_SIZE(pv) = 0; diff --git a/packages/arm-kernel-shim/files/place-boot-section.patch b/packages/arm-kernel-shim/files/place-boot-section.patch deleted file mode 100644 index 6e6c9460a5..0000000000 --- a/packages/arm-kernel-shim/files/place-boot-section.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- arm-kernel-shim-1.2/Makefile~ 2007-02-06 16:44:31.000000000 +1030 -+++ arm-kernel-shim-1.2/Makefile 2007-02-06 16:56:12.000000000 +1030 -@@ -9,7 +9,8 @@ - OBJCOPY=$(TOOLS)objcopy - - CFLAGS:=-g -Os -nostartfiles -nostdlib --LDFLAGS:= -g -X -Map shim.map -Ttext 0 -+# LDFLAGS:= -g -X -Map shim.map -Ttext 0 -+LDFLAGS:= -g -X -Map shim.map -Ttext 0 --section-start .boot=1fb - - SRCS:= shim.lds main.c - OBJS:=$(SRCS:.c=.o) diff --git a/packages/blueprobe/blueprobe_svn.bb b/packages/blueprobe/blueprobe_svn.bb new file mode 100644 index 0000000000..5ef2dfcf8b --- /dev/null +++ b/packages/blueprobe/blueprobe_svn.bb @@ -0,0 +1,13 @@ +PV = "0.18+svn${SRCDATE}" +PR = "r0" + +inherit pkgconfig gpe autotools + +SRC_URI = "${GPE_SVN} \ + file://blueprobe-svn-Makefile.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +require blueprobe.inc + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/obsolete/nslu2/.mtn2git_empty b/packages/blueprobe/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/obsolete/nslu2/.mtn2git_empty +++ b/packages/blueprobe/files/.mtn2git_empty diff --git a/packages/blueprobe/files/blueprobe-svn-Makefile.patch b/packages/blueprobe/files/blueprobe-svn-Makefile.patch new file mode 100644 index 0000000000..b51b46561d --- /dev/null +++ b/packages/blueprobe/files/blueprobe-svn-Makefile.patch @@ -0,0 +1,250 @@ +diff -Naur blueprobe.orig/Makefile blueprobe/Makefile +--- blueprobe.orig/Makefile 2007-02-10 16:23:12.158675487 +0200 ++++ blueprobe/Makefile 2007-02-10 16:27:53.906731396 +0200 +@@ -1,7 +1,7 @@ + PREFIX = /usr/local + PACKAGE = blueprobe + DEBUG = no +-CVSBUILD = yes ++CVSBUILD = no + VERSION = 0.18 + + MEMBERS = blueprobe +@@ -17,7 +17,7 @@ + ifeq ($(CVSBUILD),yes) + BUILD = ../build + else +-BUILD = build ++BUILD = . + endif + + all: $(PACKAGE) +diff -Naur blueprobe.orig/Makefile.dpkg_ipkg blueprobe/Makefile.dpkg_ipkg +--- blueprobe.orig/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ blueprobe/Makefile.dpkg_ipkg 2007-02-10 16:28:13.211831530 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur blueprobe.orig/Makefile.translation blueprobe/Makefile.translation +--- blueprobe.orig/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ blueprobe/Makefile.translation 2007-02-10 16:28:17.996104169 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/bluesnarfer/bluesnarfer.bb b/packages/bluesnarfer/bluesnarfer.bb index 43d807f828..8ba346e526 100644 --- a/packages/bluesnarfer/bluesnarfer.bb +++ b/packages/bluesnarfer/bluesnarfer.bb @@ -1,4 +1,4 @@ -SECTION = "net/misc" +SECTION = "network/misc" DESCRIPTION = "Bluetooth cellphone information gatherer" PV = "0.1" SRC_URI = "http://www.remote-exploit.org/images/a/a0/Bluesnarfer.tar.gz" diff --git a/packages/bmon/bmon_2.1.0.bb b/packages/bmon/bmon_2.1.0.bb index 32e956fb26..d6cd03f614 100644 --- a/packages/bmon/bmon_2.1.0.bb +++ b/packages/bmon/bmon_2.1.0.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Portable Bandwidth Monitor and rate estimator" HOMEPAGE = "http://people.suug.ch/~tgr/bmon/" -SECTION = "console/utilities" +SECTION = "console/utils" LICENSE = "MIT" # only works with libnl-0.5.0 DEPENDS = "libnl" -PR = "r0" SRC_URI = "http://people.suug.ch/~tgr/bmon/files/bmon-2.1.0.tar.gz \ file://no-strip.patch;patch=1" diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc index 37a9676257..ab17d96db4 100644 --- a/packages/busybox/busybox.inc +++ b/packages/busybox/busybox.inc @@ -42,8 +42,8 @@ INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" INITSCRIPT_NAME_${PN} = "syslog" CONFFILES_${PN} = "${sysconfdir}/syslog.conf" -# This disables the syslog startup links in openslug (see openslug-init) -INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ." +# This disables the syslog startup links in slugos (see slugos-init) +INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ." inherit cml1 update-rc.d diff --git a/packages/ccxstream/ccxstream_1.0.15.bb b/packages/ccxstream/ccxstream_1.0.15.bb index cc42d895ca..466a116ec2 100644 --- a/packages/ccxstream/ccxstream_1.0.15.bb +++ b/packages/ccxstream/ccxstream_1.0.15.bb @@ -1,6 +1,6 @@ DESCRIPTION = "XStream Server" DEPENDS = "readline" -LICENSE = "GPL-2" +LICENSE = "GPLv2" PR = "r2" SRC_URI = "http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/${P}.tar.gz \ diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb index 820700d56e..af90d5a20e 100644 --- a/packages/dcop/dcopidl-native_3.5.4.bb +++ b/packages/dcop/dcopidl-native_3.5.4.bb @@ -1,15 +1,13 @@ DESCRIPTION = "DCOP IDL parser" -SECTION = "kde/dev" +SECTION = "kde/devel" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc3-native" - SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl \ file://dcopidl-compile.patch;patch=1 " S = "${WORKDIR}/dcopidl" - inherit native qmake qt3e export OE_QMAKE_LINK="${CXX}" diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb index 29a4f71d3c..10969db923 100644 --- a/packages/dcop/dcopidl2cpp-native_3.5.4.bb +++ b/packages/dcop/dcopidl2cpp-native_3.5.4.bb @@ -1,16 +1,14 @@ DESCRIPTION = "DCOP IDL parser" -SECTION = "kde/dev" +SECTION = "kde/devel" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc3-native" - SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl2cpp " #\ # file://dcopidl-compile.patch;patch=1 " S = "${WORKDIR}/dcopidl2cpp" - inherit native qmake qt3e export OE_QMAKE_LINK="${CXX}" diff --git a/packages/detect-stylus/detect-stylus_svn.bb b/packages/detect-stylus/detect-stylus_svn.bb new file mode 100644 index 0000000000..7f4385473c --- /dev/null +++ b/packages/detect-stylus/detect-stylus_svn.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Touchscreen detection utility" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "virtual/libx11 xcursor-transparent-theme xrdb" +RDEPENDS = "xrdb" +PV = "0.13+svn${SRCDATE}" +PR = "r0" + +inherit gpe pkgconfig + +SRC_URI = "${GPE_SVN} \ + file://detect-stylus-svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +export CVSBUILD="no" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/obsolete/nslu2/nslu2-kernel/.mtn2git_empty b/packages/detect-stylus/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/obsolete/nslu2/nslu2-kernel/.mtn2git_empty +++ b/packages/detect-stylus/files/.mtn2git_empty diff --git a/packages/detect-stylus/files/detect-stylus-svn-build.patch b/packages/detect-stylus/files/detect-stylus-svn-build.patch new file mode 100644 index 0000000000..ea1d67af6b --- /dev/null +++ b/packages/detect-stylus/files/detect-stylus-svn-build.patch @@ -0,0 +1,229 @@ +diff -Naur detect-stylus.orig/build/Makefile.dpkg_ipkg detect-stylus/build/Makefile.dpkg_ipkg +--- detect-stylus.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ detect-stylus/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur detect-stylus.orig/build/Makefile.translation detect-stylus/build/Makefile.translation +--- detect-stylus.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ detect-stylus/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/directfb/fusionsound_0.9.26+cvs20070207.bb b/packages/directfb/fusionsound_0.9.26+cvs20070207.bb new file mode 100644 index 0000000000..fe04a195c1 --- /dev/null +++ b/packages/directfb/fusionsound_0.9.26+cvs20070207.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "FusionSound for DirectFB" +DEPENDS = "directfb" +SECTION = "libs" +LICENSE = "LGPL" + +# this is a CVS only release + +SRC_URI = "cvs://anonymous@cvs.directfb.org/cvs/directfb;method=pserver;module=FusionSound;date=${@bb.data.getVar('PV', d, 1)[9:]}" + +S = "${WORKDIR}/FusionSound" + +inherit autotools pkgconfig + +do_configure_append() { + find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' +} + +do_stage() { + autotools_stage_all +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +FILES_fusionsound-dbg_append = " ${libdir}/directfb-1.0-0/*/*/.debug/*.so \ + ${libdir}/directfb-1.0-0/*/.debug/*.so \ + " + +FILES_fusionsound-dev_append = " ${libdir}/directfb-1.0-0/interfaces/*/*.la \ + ${libdir}/directfb-1.0-0/snddrivers/*.la \ + " + +FILES_fusionsound_append = " ${libdir}/directfb-1.0-0/interfaces/*/*.so \ + ${libdir}/directfb-1.0-0/snddrivers/*.so \ + " + diff --git a/packages/directfb/lite_0.9.26+cvs20070207.bb b/packages/directfb/lite_0.9.26+cvs20070207.bb new file mode 100644 index 0000000000..2f43627829 --- /dev/null +++ b/packages/directfb/lite_0.9.26+cvs20070207.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "LiTE stands for Lightweight Toolkit Enabler. Its role is to \ + facilitate the functions of DirectFB so that a toolbox could \ + be written on top of DirectFB with less effort. As such LiTE \ + has abstractions for the underlying graphics and event systems." + +DEPENDS = "directfb" +SECTION = "libs" +LICENSE = "LGPL" + +# this is a CVS only release + +SRC_URI = "cvs://anonymous@cvs.directfb.org/cvs/directfb;method=pserver;module=lite;date=${@bb.data.getVar('PV', d, 1)[9:]}" + +S = "${WORKDIR}/lite" + +inherit autotools pkgconfig + +do_configure_append() { + find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' +} + +do_stage() { + autotools_stage_all +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +FILES_lite-dbg_append = " ${libdir}/directfb-1.0-0/*/*/.debug/*.so \ + ${libdir}/directfb-1.0-0/*/.debug/*.so \ + " +FILES_lite-dev_append = " ${libdir}/directfb-1.0-0/interfaces/*/*.la \ + " + +FILES_lite_append = " ${libdir}/directfb-1.0-0/interfaces/*/*.so \ + ${datadir}/LiTE/* \ + ${datadir}/fonts/truetype/* \ + " + diff --git a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb index 9e1fc13da6..4abdb6c7b0 100644 --- a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb +++ b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Framebuffer VNC server keyboard events module" -SECTION = "kernel/module" +SECTION = "kernel/modules" LICENSE = "GPL" PR = "r1" diff --git a/packages/freeze/freeze.bb b/packages/freeze/freeze.bb index 48a0ba63d2..fa11fecb97 100644 --- a/packages/freeze/freeze.bb +++ b/packages/freeze/freeze.bb @@ -13,7 +13,7 @@ # as appropriate, directory is the sub-directory of 'packages'. # DESCRIPTION = "Freeze the bitbake files in the build" -SECTION = "console/networking" +SECTION = "console/network" PRIORITY = "optional" LICENSE = "MIT" PR = "r1" diff --git a/packages/freeze/unfreeze.bb b/packages/freeze/unfreeze.bb index ff280dee9c..f2232c304f 100644 --- a/packages/freeze/unfreeze.bb +++ b/packages/freeze/unfreeze.bb @@ -2,7 +2,7 @@ # configuration fails empty (they just contain a comment). # DESCRIPTION = "Unfreeze the bitbake files in the build" -SECTION = "console/networking" +SECTION = "console/network" PRIORITY = "optional" LICENSE = "MIT" PR = "r1" diff --git a/packages/ghettotooth/ghettotooth.bb b/packages/ghettotooth/ghettotooth.bb index 413d81a819..426a657848 100644 --- a/packages/ghettotooth/ghettotooth.bb +++ b/packages/ghettotooth/ghettotooth.bb @@ -1,4 +1,4 @@ -SECTION = "net/misc" +SECTION = "network/misc" DESCRIPTION = "Bluetooth scanner" LICENSE = "GPL" RDEPENDS = "perl" diff --git a/packages/gpe-appmgr/files/svn-build.patch b/packages/gpe-appmgr/files/svn-build.patch new file mode 100644 index 0000000000..ea1d67af6b --- /dev/null +++ b/packages/gpe-appmgr/files/svn-build.patch @@ -0,0 +1,229 @@ +diff -Naur detect-stylus.orig/build/Makefile.dpkg_ipkg detect-stylus/build/Makefile.dpkg_ipkg +--- detect-stylus.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ detect-stylus/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur detect-stylus.orig/build/Makefile.translation detect-stylus/build/Makefile.translation +--- detect-stylus.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ detect-stylus/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-appmgr/gpe-appmgr_svn.bb b/packages/gpe-appmgr/gpe-appmgr_svn.bb new file mode 100644 index 0000000000..25492b1bc6 --- /dev/null +++ b/packages/gpe-appmgr/gpe-appmgr_svn.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "GPE application launcher" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "libgpewidget libgpelaunch cairo libxsettings-client" +PV = "2.8+svn${SRCDATE}" +PR = "r0" + +inherit gpe + +SRC_URI = "${GPE_SVN} \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +export CVSBUILD="no" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/gpe-autostarter/gpe-autostarter_svn.bb b/packages/gpe-autostarter/gpe-autostarter_svn.bb new file mode 100644 index 0000000000..2742952e0f --- /dev/null +++ b/packages/gpe-autostarter/gpe-autostarter_svn.bb @@ -0,0 +1,15 @@ +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "glib-2.0 dbus-glib hotplug-dbus virtual/libx11" +RDEPENDS = "hotplug-dbus" + +inherit gpe + +SRC_URI = "${GPE_SVN} \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +export CVSBUILD="no" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/gpe-autostarter/svn-build.patch b/packages/gpe-autostarter/svn-build.patch new file mode 100644 index 0000000000..ea1d67af6b --- /dev/null +++ b/packages/gpe-autostarter/svn-build.patch @@ -0,0 +1,229 @@ +diff -Naur detect-stylus.orig/build/Makefile.dpkg_ipkg detect-stylus/build/Makefile.dpkg_ipkg +--- detect-stylus.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ detect-stylus/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur detect-stylus.orig/build/Makefile.translation detect-stylus/build/Makefile.translation +--- detect-stylus.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ detect-stylus/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb index 369ea5153d..67c16862e8 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb @@ -1,18 +1,13 @@ -require gpe-mini-browser.inc - -DEFAULT_PREFERENCE = "-1" - DEPENDS = "sqlite gettext gtk+ glib-2.0 osb-nrcit libgpewidget" RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" - -PV = "0.19+svn${SRCDATE}" +PV = "0.20+svn${SRCDATE}" PR = "r0" -SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra;module=${PN}" +inherit autotools -S = "${WORKDIR}/gpe-mini-browser" +SRC_URI = "${GPE_EXTRA_SVN}" -inherit autotools +S = "${WORKDIR}/gpe-mini-browser" do_install() { install -d ${D}/usr/share/applications @@ -39,7 +34,6 @@ pkg_postinst_${PN}-doc () { fi fi } - pkg_postrm_${PN}-doc () { #!/bin/sh if [ -e /etc/gpe/gpe-help.conf ]; then @@ -54,3 +48,6 @@ pkg_postrm_${PN}-doc () { fi } +require gpe-mini-browser.inc + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb index 3720512150..bef090e22a 100644 --- a/packages/gpephone/linphone_1.5.0.bb +++ b/packages/gpephone/linphone_1.5.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SIP-based IP phone" HOMEPAGE = "http://www.linphone.org/?lang=us" -LICENSE = "GPL-2" +LICENSE = "GPLv2" DEPENDS = "libosip2 speex libogg alsa-lib readline" PR = "r0" diff --git a/packages/gperiodic/gperiodic_1.3.3.bb b/packages/gperiodic/gperiodic_1.3.3.bb index 3202fc2a48..427f31565b 100644 --- a/packages/gperiodic/gperiodic_1.3.3.bb +++ b/packages/gperiodic/gperiodic_1.3.3.bb @@ -4,7 +4,7 @@ and view detailed information on each of the elements. \ 118 elements are currently listed." LICENSE = "GPL" HOMEPAGE = "http://gperiodic.seul.org" -SECTION = "x11/apps" +SECTION = "x11/applications" DEPENDS = "gtk+-1.2" SRC_URI = "http://gperiodic.seul.org/downloads/gperiodic-${PV}.tar.gz" diff --git a/packages/granule/granule.inc b/packages/granule/granule.inc index 7f211b3de1..4fa2db9b04 100644 --- a/packages/granule/granule.inc +++ b/packages/granule/granule.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Generic memory training with flash cards. Automatic scheduling algorithm." AUTHOR = "Vladislav Grinchenko <vlg@users.sourceforge.net>" HOMEPAGE = "http://granule.sf.net" -SECTION = "x11/apps" +SECTION = "x11/applications" PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa" diff --git a/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb b/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb index 8c5efa8622..3c4eb9a530 100644 --- a/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb +++ b/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb @@ -5,7 +5,7 @@ DESCRIPTION="GTK2 ssh askpass utility" HOMEPAGE="http://www.cgabriel.org/sw/gtk2-ssh-askpass/" LICENSE = "GPL" -SECTION = "net-misc" +SECTION = "network/misc" SRC_URI="http://src.gentoo.pl/distfiles/gtk2-ssh-askpass-${PV}.tar.gz \ file://makefile.patch;patch=1" diff --git a/packages/id3lib/id3lib_3.8.3.bb b/packages/id3lib/id3lib_3.8.3.bb index d63106230a..76134bc6fd 100644 --- a/packages/id3lib/id3lib_3.8.3.bb +++ b/packages/id3lib/id3lib_3.8.3.bb @@ -1,19 +1,15 @@ DESCRIPTION = "Library for interacting with ID3 tags." -SECTION = "libs" +SECTION = "libs/multimedia" PRIORITY = "optional" DEPENDS = "zlib" -DESCRIPTION = "Library for interacting with ID3 tags." LICENSE = "GPL" +PR = "r1" inherit autotools SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz" S = "${WORKDIR}/id3lib-${PV}" -do_configure() { - oe_runconf -} - do_stage() { oe_libinstall -a -so -C src libid3 ${STAGING_LIBDIR} install -m 0644 include/id3.h ${STAGING_INCDIR} diff --git a/packages/images/openprotium-image.bb b/packages/images/openprotium-image.bb index faec2664ca..472000f4f0 100644 --- a/packages/images/openprotium-image.bb +++ b/packages/images/openprotium-image.bb @@ -4,8 +4,6 @@ LICENSE = "MIT" PR = "r0" DEPENDS = "${MACHINE_TASK_PROVIDER}" -# SLUGOS_IMAGENAME defines the name of the image to be build, if it -# is not set this package will be skipped! EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x10000 -D ${SLUGOS_DEVICE_TABLE}" IMAGE_LINGUAS = "" diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 5d7fed7cb5..ce591f7e4e 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -6,16 +6,13 @@ DESCRIPTION = "Generic SlugOS image" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r44" +PR = "r45" COMPATIBLE_MACHINE = "nslu2" -# SLUGOS_IMAGENAME defines the name of the image to be build, if it -# is not set this package will be skipped! -IMAGE_BASENAME = "${SLUGOS_IMAGENAME}" -IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}" +IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}" IMAGE_FSTYPES = "jffs2" -EXTRA_IMAGECMD_jffs2 = "--pad --${SLUGOS_IMAGESEX} --eraseblock=0x20000 -D ${SLUGOS_DEVICE_TABLE}" +EXTRA_IMAGECMD_jffs2 += " -D ${SLUGOS_DEVICE_TABLE}" IMAGE_LINGUAS = "" # Setting USE_DEVFS prevents *any* entries being created initially @@ -34,86 +31,29 @@ SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/zImage*;" IMAGE_PREPROCESS_COMMAND += "install -c -m 644 ${SLUGOS_DEVICE_TABLE} ${IMAGE_ROOTFS}/etc/device_table;" -# Building a full image. If required do a post-process command which builds -# the full flash image using slugimage. At present this only works for NSLU2 images. -PACK_IMAGE = "" -IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}" -PACK_IMAGE_DEPENDS = "" -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. ROOTFS_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. -IMAGE_TOOLS = "" -EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}" - -# CONFIG: -# SLUGOS_EXTRA_RDEPENDS: set in conf, things to add to the image -# SLUGOS_SUPPORT: set here, see below, added to the image. -# SLUGOS_KERNEL: set here, kernel modules added to the image -# -# Do not override the last two unless you really know what you -# are doing - there is more information below. - -# diff, cpio and find are required for reflash and turnup ram. -# Removing these probably leaves the system bootable, but standard -# openslug and ucslugc stuff won't work, so only take these out in -# very non-standard turnkey slugos builds. -# -# udev is the default way of handling devices, there is no guarantee -# that the static device table is completely correct (it is just -# known to be sufficient for boot.) -SLUGOS_SUPPORT ?= "diffutils cpio findutils udev" - -SLUGOS_KERNEL ?= "" +SLUGOS_EXTRA_INSTALL ?= "" -SLUGOS_EXTRA_RDEPENDS ?= "" - -RDEPENDS = "kernel ixp4xx-npe \ - base-files base-passwd netbase \ - busybox initscripts-slugos slugos-init \ - update-modules sysvinit tinylogin \ - module-init-tools modutils-initscripts \ - ipkg-collateral ipkg ipkg-link \ - portmap \ - dropbear \ - beep \ - e2fsprogs-blkid \ - util-linux-mount \ - util-linux-umount \ - util-linux-swaponoff \ - util-linux-losetup \ - ${SLUGOS_SUPPORT} \ - ${SLUGOS_KERNEL} \ - ${SLUGOS_EXTRA_RDEPENDS}" +DEPENDS = "task-slugos" +RDEPENDS = "task-slugos ${SLUGOS_EXTRA_INSTALL}" PACKAGE_INSTALL = "${RDEPENDS}" inherit image -python () { - # Don't build slugos images unless the configuration is set up - # for an image build! - if bb.data.getVar("SLUGOS_IMAGENAME", d, 1) == '' or bb.data.getVar("SLUGOS_IMAGESEX", d, 1) == '': - raise bb.parse.SkipPackage("absent or broken SlugOS configuration") -} - -#-------------------------------------------------------------------------------- -# NSLU2 specific -# #NOTE: you do not actually need the boot loader in normal use because it is # *not* overwritten by a standard upslug upgrade, so you can make an image with # just non-LinkSys software which can be flashed into the NSLU2. Because # LinkSys have made "EraseAll" available, however, (this does overwrite RedBoot) # it is a bad idea to produce flash images without a valid RedBoot - that allows # an innocent user upgrade attempt to instantly brick the NSLU2. -PACK_IMAGE += "${@['', 'slugos_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}" -PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}" +IMAGE_POSTPROCESS_COMMAND += "slugos_pack_image;" +EXTRA_IMAGEDEPENDS += "slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native" NSLU2_SLUGIMAGE_ARGS ?= "" slugos_pack_image() { @@ -168,6 +108,3 @@ slugos_pack_image() { -C ${DEPLOY_DIR_IMAGE} firmupgrade rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade } - -# upslug2 (in tmp/work/upslug2-native-*) is the program to write the NSLU2 flash -IMAGE_TOOLS_nslu2 = "upslug2-native" diff --git a/packages/images/slugos-imagename.bb b/packages/images/slugos-imagename.bb deleted file mode 100644 index 61629d44af..0000000000 --- a/packages/images/slugos-imagename.bb +++ /dev/null @@ -1,29 +0,0 @@ -# This is an inglorious hack to provide a package to match -# ${SLUGOS_IMAGENAME}-image -LICENSE = "MIT" -PN = "${SLUGOS_IMAGENAME}-image" -PV = "0" -PR = "r0" -DEPENDS = "slugos-image" -PACKAGES = "" -INHIBIT_DEFAULT_DEPS = "1" - -SLUGOS_IMAGENAME ?= "slugos" -COMPATIBLE_MACHINE = "nslu2" - -do_fetch() { -} -do_unpack() { -} -do_patch() { -} -do_configure() { -} -do_compile() { -} -do_install() { -} -do_stage() { -} -do_build() { -} diff --git a/packages/ipsec-tools/ipsec-tools_0.6.6.bb b/packages/ipsec-tools/ipsec-tools_0.6.6.bb index 0e2a82e370..9b0676aece 100644 --- a/packages/ipsec-tools/ipsec-tools_0.6.6.bb +++ b/packages/ipsec-tools/ipsec-tools_0.6.6.bb @@ -1,10 +1,9 @@ DESCRIPTION = "IPsec-Tools is a port of KAME's IPsec utilities to the \ Linux-2.6 IPsec implementation." HOMEPAGE = "http://ipsec-tools.sourceforge.net/" -SECTION = "console/net" +SECTION = "console/network" LICENSE = "BSD" DEPENDS = "virtual/kernel openssl readline flex" -PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${PV}.tar.bz2 \ file://racoon-search-missing.patch;patch=1" diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/.mtn2git_empty b/packages/kakasi/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/.mtn2git_empty +++ b/packages/kakasi/.mtn2git_empty diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/.mtn2git_empty b/packages/kakasi/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/.mtn2git_empty +++ b/packages/kakasi/files/.mtn2git_empty diff --git a/packages/kakasi/files/makefile.patch b/packages/kakasi/files/makefile.patch new file mode 100644 index 0000000000..4373a498c1 --- /dev/null +++ b/packages/kakasi/files/makefile.patch @@ -0,0 +1,11 @@ +--- kakasi-2.3.4/Makefile.am.old 2006-04-23 18:11:57.000000000 +0200 ++++ kakasi-2.3.4/Makefile.am 2006-04-23 18:12:07.000000000 +0200 +@@ -17,7 +17,7 @@ + + kanwadict: + if test -f kakasidict; then \ +- ITAIJIDICT="itaijidict" src/mkkanwa$(EXEEXT) $@ kakasidict; \ ++ ITAIJIDICT="itaijidict" mkkanwa$(EXEEXT) $@ kakasidict; \ + fi + + dist-hook: diff --git a/packages/kakasi/kakasi-native_2.3.4.bb b/packages/kakasi/kakasi-native_2.3.4.bb new file mode 100644 index 0000000000..86a4c81b44 --- /dev/null +++ b/packages/kakasi/kakasi-native_2.3.4.bb @@ -0,0 +1,11 @@ +require kakasi.inc + +inherit native + +S = "${WORKDIR}/kakasi-${PV}" + +do_stage() { + install src/mkkanwa ${STAGING_BINDIR} +} + + diff --git a/packages/kakasi/kakasi.inc b/packages/kakasi/kakasi.inc new file mode 100644 index 0000000000..b931a84958 --- /dev/null +++ b/packages/kakasi/kakasi.inc @@ -0,0 +1,9 @@ +DESCRIPTION = "Kanji Kana Simple Inverter" +HOMEPAGE = "http://kakasi.namazu.org/" +LICENSE = "GPL" + +SRC_URI = "http://kakasi.namazu.org/stable/kakasi-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = " --enable-shared" diff --git a/packages/kakasi/kakasi_2.3.4.bb b/packages/kakasi/kakasi_2.3.4.bb new file mode 100644 index 0000000000..aabfd20368 --- /dev/null +++ b/packages/kakasi/kakasi_2.3.4.bb @@ -0,0 +1,14 @@ +require kakasi.inc + +SECTION = "utils" +DEPENDS = "kakasi-native" + +SRC_URI += "file://makefile.patch;patch=1" + +do_stage () { + install -m 0644 lib/*.h ${STAGING_INCDIR} + install lib/.libs/libkakasi.so* ${STAGING_LIBDIR} +} + + + diff --git a/packages/libaal/libaal_1.0.4.bb b/packages/libaal/libaal_1.0.4.bb index 0acfccc48d..af847f50c6 100644 --- a/packages/libaal/libaal_1.0.4.bb +++ b/packages/libaal/libaal_1.0.4.bb @@ -5,7 +5,7 @@ PR = "r1" DESCRIPTION = "Library for user-level code accessing Reiser4 filesystems" HOMEPAGE = "http://www.namesys.com" SECTION = "base" -LICENSE = "GPL-2" +LICENSE = "GPLv2" SRC_URI = "ftp://ftp.namesys.com/pub/reiser4progs/old-versions/${P}.tar.gz" diff --git a/packages/libgpelaunch/libgpelaunch_svn.bb b/packages/libgpelaunch/libgpelaunch_svn.bb new file mode 100644 index 0000000000..c7c3c8e83e --- /dev/null +++ b/packages/libgpelaunch/libgpelaunch_svn.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "GPE program launcher library" +SECTION = "libs" +LICENSE = "LGPL" +DEPENDS = "gtk+ startup-notification" +PV = "0.14+svn${SRCDATE}" +PR = "r0" + +inherit autotools pkgconfig + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +do_stage() { + autotools_stage_all +} + +FILES_${PN}-dbg += "${libexecdir}/libgpelaunch/.debug" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/libgpepimc/libgpepimc_svn.bb b/packages/libgpepimc/libgpepimc_svn.bb new file mode 100644 index 0000000000..b195837ed3 --- /dev/null +++ b/packages/libgpepimc/libgpepimc_svn.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Common code for GPE PIMs" +SECTION = "gpe/libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "libgpewidget gtk+ sqlite" +PROVIDES = "libgepepimc" +RPROVIDES = "libgepepimc" +PV = "0.8+svn${SRCDATE}" +PR = "r0" + +inherit pkgconfig autotools + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +do_stage () { + oe_libinstall -so libgpepimc ${STAGING_LIBDIR} + mkdir -p ${STAGING_INCDIR}/gpe + for h in ${headers}; do + install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h + done +} + +headers = "pim-categories.h pim-categories-ui.h" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/libgpeplugin/libgpeplugin_svn.bb b/packages/libgpeplugin/libgpeplugin_svn.bb new file mode 100644 index 0000000000..91eca5abc1 --- /dev/null +++ b/packages/libgpeplugin/libgpeplugin_svn.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Plugin system for GPE applications" +AUTHOR = "Luce DeCicco <ldecicco@gmail.com>" +DEPENDS = "gtk+ libgpewidget" +PV = "0.0+svn${SRCDATE}" +PR = "r0" + +inherit autotools pkgconfig + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +do_stage() { + autotools_stage_all +} + +#put examples in a seperate package +PACKAGES += "${PN}-examples" + +FILES_${PN}-examples = "${bindir}/* ${libexecdir}/*" +FILES_${PN} = "${libdir}/*.so.*" diff --git a/packages/libgpevtype/libgpevtype_svn.bb b/packages/libgpevtype/libgpevtype_svn.bb index 235a1312db..5c7ca33fbb 100644 --- a/packages/libgpevtype/libgpevtype_svn.bb +++ b/packages/libgpevtype/libgpevtype_svn.bb @@ -1,12 +1,8 @@ -LICENSE = "LGPL" -DESCRIPTION = "Data interchange library for GPE" -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libmimedir" - -DEFAULT_PREFERENCE = "-1" - -S = "${WORKDIR}/${PN}" +DESCRIPTION = "Data interchange library for GPE" +SECTION = "gpe/libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "libmimedir libeventdb" PV = "0.17+svn${SRCDATE}" PR = "r0" @@ -14,17 +10,16 @@ inherit pkgconfig gpe autotools SRC_URI = "${GPE_SVN}" - -headers = "tag-db.h vcard.h vevent.h vtodo.h" - +S = "${WORKDIR}/${PN}" do_stage () { - oe_libinstall -so libgpevtype ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/gpe - for h in ${headers}; do - install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/${h} - done + oe_libinstall -so libgpevtype ${STAGING_LIBDIR} + mkdir -p ${STAGING_INCDIR}/gpe + for h in ${headers}; do + install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/${h} + done } +headers = "tag-db.h vcard.h vevent.h vtodo.h" +DEFAULT_PREFERENCE = "-1" diff --git a/packages/libgtkinput/libgtkinput_svn.bb b/packages/libgtkinput/libgtkinput_svn.bb new file mode 100644 index 0000000000..b8fcc8c26e --- /dev/null +++ b/packages/libgtkinput/libgtkinput_svn.bb @@ -0,0 +1,18 @@ +LICENSE = "LGPL" +PV = "0.3+svn${SRCDATE}" + +inherit gpe autotools + +SRC_URI = "${GPE_SVN} \ + file://gtkinput.sh" + +S = "${WORKDIR}/${PN}" + +do_install_append() { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/gtkinput.sh ${D}/${sysconfdir}/X11/Xsession.d/46gtkinput +} + +FILES_${PN} += "${libdir}" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/libgtkstylus/libgtkstylus_svn.bb b/packages/libgtkstylus/libgtkstylus_svn.bb new file mode 100644 index 0000000000..33122345a7 --- /dev/null +++ b/packages/libgtkstylus/libgtkstylus_svn.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "GTK plugin for stylus based systems" +SECTION = "libs" +LICENSE = "LGPL" +DEPENDS = "gtk+" +PV = "0.3+svn${SRCDATE}" +PR = "r5" + +inherit autotools + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +do_install_append() { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${S}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus +} + +FILES_${PN} = "/etc ${libdir}/gtk-2.0/*/modules/*.so*" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/libidl/libidl_0.8.2.bb b/packages/libidl/libidl_0.8.2.bb index b8c5ec6966..85114d6524 100644 --- a/packages/libidl/libidl_0.8.2.bb +++ b/packages/libidl/libidl_0.8.2.bb @@ -1,5 +1,5 @@ +SECTION = "x11/gnome/libs" LICENSE = "LGPL" -SECTION = "libs" SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2" S = "${WORKDIR}/libIDL-${PV}" diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb index 2ca114be2c..7a5a0d454e 100644 --- a/packages/libidl/libidl_0.8.3.bb +++ b/packages/libidl/libidl_0.8.3.bb @@ -1,6 +1,6 @@ -LICENSE = "LGPL" DESCRIPTION = "Library for parsing CORBA IDL files" -SECTION = "gnome/libs" +SECTION = "x11/gnome/libs" +LICENSE = "LGPL" DEPENDS = "glib-2.0" PR = "r2" diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb index 916bfb6e5f..ccc93e291a 100644 --- a/packages/libidl/libidl_0.8.6.bb +++ b/packages/libidl/libidl_0.8.6.bb @@ -1,6 +1,6 @@ -LICENSE = "LGPL" DESCRIPTION = "Library for parsing CORBA IDL files" -SECTION = "gnome/libs" +SECTION = "x11/gnome/libs" +LICENSE = "LGPL" DEPENDS = "glib-2.0 libidl-native" PR = "r2" diff --git a/packages/libschedule/libschedule_svn.bb b/packages/libschedule/libschedule_svn.bb new file mode 100644 index 0000000000..1095c2de32 --- /dev/null +++ b/packages/libschedule/libschedule_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "RTC alarm handling library for GPE" +SECTION = "gpe/libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "glib-2.0 sqlite libgpewidget" +PV = "0.16+svn${SRCDATE}" +PR = "r0" + +inherit autotools pkgconfig gpe + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +do_stage () { + autotools_stage_all +} + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/libtododb/libtododb_svn.bb b/packages/libtododb/libtododb_svn.bb new file mode 100644 index 0000000000..a0263f27ac --- /dev/null +++ b/packages/libtododb/libtododb_svn.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Database access for GPE to-do list" +SECTION = "gpe/libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "libgpewidget libgpepimc sqlite" +PV = "0.10+svn${SRCDATE}" +PR = "r0" + +inherit pkgconfig gpe autotools + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +do_install () { + gpe_do_install +# oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel +} +do_stage () { + oe_libinstall -so libtododb ${STAGING_LIBDIR} + mkdir -p ${STAGING_INCDIR}/gpe + for h in ${headers}; do + install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h + done +} + +headers = "todo-db.h" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/libxsettings-client/libxsettings-client_svn.bb b/packages/libxsettings-client/libxsettings-client_svn.bb new file mode 100644 index 0000000000..111c692603 --- /dev/null +++ b/packages/libxsettings-client/libxsettings-client_svn.bb @@ -0,0 +1,26 @@ +SECTION = "gpe/libs" +PRIORITY = "optional" +LICENSE = "BSD-X" +DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc" +PV = "0.17+svn${SRCDATE}" +# libxt is required to stop configure breaking builds by +# including system paths to find it if it isn't present. +PR = "r0" + +inherit autotools pkgconfig gpe + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +do_stage () { + oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} + mkdir -p ${STAGING_INCDIR} + for h in ${headers}; do + install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h + done +} + +headers = "xsettings-client.h xsettings-common.h" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/.mtn2git_empty b/packages/libxsettings/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/.mtn2git_empty +++ b/packages/libxsettings/files/.mtn2git_empty diff --git a/packages/libxsettings/files/Makefile.dpkg_ipkg b/packages/libxsettings/files/Makefile.dpkg_ipkg new file mode 100644 index 0000000000..76c532154f --- /dev/null +++ b/packages/libxsettings/files/Makefile.dpkg_ipkg @@ -0,0 +1,114 @@ +## Please read the README in this directory to see how to use this +## Makefile snippet + +# Let's use whatever clean target the specific app provides + +CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` + +# URL to source tarball +SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz + +# can change this to e.g. /var/tmp/deb +DEB_PATH = ../deb + +ifeq ($(CVSBUILD),yes) +LIBGPEWIDGET_PC = libgpewidget-uninstalled +PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget +else +LIBGPEWIDGET_PC = libgpewidget +endif + +ifeq ($(IN_LIBGPEWIDGET),) +GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) +GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) +endif + +GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) +GTKLIBS = $(shell pkg-config --libs gtk+-2.0) + +STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" +STANDARD_CFLAGS = -MD -Wall + +ifeq ($(DEBUG),yes) +CFLAGS += -O2 -g +LDFLAGS = -g +else +CFLAGS += -Os -fomit-frame-pointer +endif + +dist: check-source clean dist-prep + rm -rf ../$(PACKAGE)-$(VERSION) + mkdir ../$(PACKAGE)-$(VERSION) + ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) + ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) + ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) + rm -rf ../$(PACKAGE)-$(VERSION) + $(MAKE) printinfo + +dist-upload: dist + scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ + +dist-prep: +ipkg-prep: +install-mo: +# empty, can be filled in Makefile.translation + +install: install-program install-mo + +clean-dist: + rm -rf familiar/dist familiar/dist.list + +clean: clean-dist + +check-source: + @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi + +ipkg: check-source ipkg-prep clean + rm -rf familiar/dist + mkdir -p familiar/dist/CONTROL + sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control + if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi + if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi + if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi + if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi + if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi + $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program + rm -rf familiar/dist.list + ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list + if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi + md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch + rm -rf familiar/dist familiar/dist.list + $(MAKE) printinfo + +dpkg: dist + mkdir -p $(DEB_PATH) + ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) + mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian + for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done + +CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) +printinfo: + @printf '-------------------------------------------------------------------------------\n' + @printf "If this becomes a package release, please add a CVS tag.\n" + @printf "You can use 'make tag' for that, it will execute\n" + @printf " cvs tag %s\n" $(CVSTAG) + @printf "Please upload a tarball (created with 'make dist') to\n" + @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" + @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" + @printf "You can use 'make dist-upload' to do that.\n" + @printf "You are currently known as USER %s.\n" $(USER) + @printf '-------------------------------------------------------------------------------\n' + +tag: check-source + cvs tag $(CVSTAG) + +retag: check-source + cvs tag -F $(CVSTAG) + +source: tag dist-upload + +%.pc: %.pc.in + sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ + +.c.o:; + $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ diff --git a/packages/libxsettings/files/Makefile.translation b/packages/libxsettings/files/Makefile.translation new file mode 100644 index 0000000000..1ca7d648fd --- /dev/null +++ b/packages/libxsettings/files/Makefile.translation @@ -0,0 +1,107 @@ +.SUFFIXES: .mo .po .pot .po8 + +CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` + +# use ipkg-build or ipkg-deb-build +IPKG_BUILD := ipkg-build + +TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint + +ifeq ($(DIR_PO),) +DIR_PO := po +endif + +ifeq ($(BINPACKAGE),) +BINPACKAGE := $(PACKAGE) +endif + +mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) +po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) + +ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) +desktop-files += $(PACKAGE).desktop +endif + +ifneq ($(EXTRA_DESKTOPS),) +desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) +endif + +all-mo: $(mo-files) + +all-desktop: $(desktop-files) + +install-mo: all-mo + if [ "$(ENABLE_NLS)" != "no" ]; then \ + if [ "x$(LINGUAS)" != "x" ]; then \ + for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ + fi; \ + fi; + +.po8.mo:; + if [ "$(ENABLE_NLS)" != "no" ]; then \ + msgfmt -o $@ $<; \ + fi; + +.po.po8:; + CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ + +update-po: $(po-files) extract-po + +dist-prep: update-po freshen-po +# empty + +ifeq ($(CVSBUILD),yes) +ipkg-prep: freshen-po +# empty +endif + +extract-po: + mkdir -p $(DIR_PO) + ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) + if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi + +clean: clean-po clean-dist-translation + +clean-po: + rm -rf $(DIR_PO)/*.mo + for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done + +%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) + intltool-merge -u -d $(DIR_PO) $< $@ + +freshen-po: + rm -rf tmp-po + mkdir tmp-po + cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done + for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done + rm -rf tmp-po + +# ------------------------------------------------------------------------ + +MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) + +ifndef BUILD +BUILD = ../build +endif + +transdist := familiar/dist-translation +templates := $(BUILD)/familiar +ipkglist := translation-ipkgs.txt + +clean-dist-translation: + rm -rf $(transdist) $(ipkglist) + +real-translation-package: all-mo + rm -rf $(transdist) $(ipkglist) + for LINGUA in $(LINGUAS); do \ + i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ + mkdir -p $(transdist)/$$i/CONTROL; \ + mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ + install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ + sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ + install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ + $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ + done + +translation-ipkg: + make PREFIX=/usr real-translation-package diff --git a/packages/libxsettings/files/libxsettings-svn-makefile-fix.patch b/packages/libxsettings/files/libxsettings-svn-makefile-fix.patch new file mode 100644 index 0000000000..52d15a6e14 --- /dev/null +++ b/packages/libxsettings/files/libxsettings-svn-makefile-fix.patch @@ -0,0 +1,20 @@ +--- libxsettings/Makefile.orig 2007-02-10 00:45:33.452674544 +0200 ++++ libxsettings/Makefile 2007-02-10 00:52:09.003215686 +0200 +@@ -1,7 +1,7 @@ + PREFIX = /usr/local + PACKAGE = libxsettings + DEBUG = no +-CVSBUILD = yes ++CVSBUILD = no + VERSION = 0.11 + + .SUFFIXES: .os +@@ -20,7 +20,7 @@ + ifeq ($(CVSBUILD),yes) + BUILD = ../build + else +-BUILD = build ++BUILD = .. + endif + + .c.os:; diff --git a/packages/libxsettings/libxsettings_svn.bb b/packages/libxsettings/libxsettings_svn.bb new file mode 100644 index 0000000000..dd1e7fcadf --- /dev/null +++ b/packages/libxsettings/libxsettings_svn.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Common code for XSETTINGS" +SECTION = "gpe/libs" +PRIORITY = "optional" +LICENSE = "BSD-X" +DEPENDS = "virtual/libx11" +PV = "0.11+svn${SRCDATE}" +PR = "r0" + +inherit gpe + +SRC_URI = "${GPE_SVN} \ + file://libxsettings-svn-makefile-fix.patch;patch=1 \ + file://Makefile.dpkg_ipkg \ + file://Makefile.translation" + +S = "${WORKDIR}/${PN}" + +do_install () { + gpe_do_install + oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel +} +do_stage () { + oe_libinstall -so libXsettings ${STAGING_LIBDIR} + mkdir -p ${STAGING_INCDIR}/gpe + for h in ${headers}; do + install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h + done +} + +headers = "xsettings-common.h" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/lighttpd/conf/etc/lighttpd.conf b/packages/lighttpd/conf/etc/lighttpd.conf index 1536083e10..5642e3175f 100644 --- a/packages/lighttpd/conf/etc/lighttpd.conf +++ b/packages/lighttpd/conf/etc/lighttpd.conf @@ -13,12 +13,12 @@ # - saves memory server.modules = ( # "mod_rewrite", - "mod_redirect", +# "mod_redirect", # "mod_alias", "mod_access", # "mod_cml", # "mod_trigger_b4_dl", - "mod_auth", +# "mod_auth", # "mod_status", # "mod_setenv", # "mod_fastcgi", @@ -33,7 +33,7 @@ server.modules = ( # "mod_expire", # "mod_secdownload", # "mod_rrdtool", - "mod_webdav", +# "mod_webdav", "mod_accesslog" ) ## a static document-root, for virtual-hosting take look at the @@ -131,12 +131,6 @@ $HTTP["url"] =~ "\.pdf$" { server.range-requests = "disable" } -$HTTP["url"] =~ "^/dav($|/)" { - webdav.activate = "enable" - webdav.is-readonly = "disable" - webdav.sqlite-db-name = "/www/var/lighttpd.webdav_lock.db" -} - ## # which extensions should not be handle via static-file transfer # @@ -267,8 +261,6 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) #url.rewrite = ( "^/$" => "/server-status" ) #url.redirect = ( "^/wishlist/(.+)" => "http://www.123.org/$1" ) -url.redirect = ( "^/DAV($|/)" => "http://cmx270/dav" ) - #### both rewrite/redirect support back reference to regex conditional using %n #$HTTP["host"] =~ "^www\.(.*)" { # url.redirect = ( "^/(.*)" => "http://%1/$1" ) diff --git a/packages/lighttpd/lighttpd_1.4.13.bb b/packages/lighttpd/lighttpd_1.4.13.bb index d56132e47d..9cb3d26425 100644 --- a/packages/lighttpd/lighttpd_1.4.13.bb +++ b/packages/lighttpd/lighttpd_1.4.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Web server" SECTION = "net" DEPENDS = "sqlite3 libpcre libxml2" LICENSE = "BSD" -PR = "r3" +PR = "r4" SRC_URI = "http://www.lighttpd.net/download/lighttpd-1.4.13.tar.gz \ file://${PV}/configure.in.patch;patch=1;pnum=2 \ diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb index 43b8daa131..563f21440e 100644 --- a/packages/linphone/linphone_1.6.0.bb +++ b/packages/linphone/linphone_1.6.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SIP-based IP phone (console edition)" HOMEPAGE = "http://www.linphone.org/?lang=us" SECTION = "x11/utils" -LICENSE = "GPL-2" +LICENSE = "GPLv2" DEPENDS = "intltool libosip2 speex libogg alsa-lib readline" DEPENDS_${PN} = "liblinphone" diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 3a80703420..d848427921 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -26,6 +26,8 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Intel IXP4xx device" LICENSE = "GPL" +DEPENDS = "arm-kernel-shim 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 @@ -298,12 +300,8 @@ pkg_postrm_kernel-image-fsg3 () { update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } -#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" +BYTESWAP_armeb = "cp$" +BYTESWAP_arm = "xp $,4" # We need the alternatives to happen in the kernel-image packages, not in # the kernel package, because only the images know the name of the kernel. @@ -312,22 +310,23 @@ pkg_postinst_kernel () { pkg_postrm_kernel () { } -# copy_image <dest> <cmdline> <machine-id> +# copy_image <dest> <machine> # 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 +# machine: machine shim to prepend, empty for none copy_image() { - local setmach + local shim - setmach="" - test -n "$2" && setmach="wb $2 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;" + shim="/dev/null" + test -n "$2" && shim="${STAGING_LOADER_DIR}/arm-kernel-shim-$2.bin" - rm -f "$1".new - devio '<<${KERNEL_OUTPUT}' >"$1".new "$setmach"'${FIXUP}' || { + rm -f "$1".new "$1".shimmed + cat $shim ${KERNEL_OUTPUT} > "$1".shimmed + devio '<<'"$1"'.shimmed' >"$1".new '${BYTESWAP}' || { echo 'ERROR: ${KERNEL_OUTPUT}: failed to copy zImage' >&2 return 1 } + rm -f "$1".shimmed mv "$1".new "$1" } @@ -342,10 +341,10 @@ do_install_append() { install_image '${MACHINE_ARCH}' # Add the machine specific images, with appropriate suffixes - install_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}' - install_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}' - install_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}' - install_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}' + install_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2' + install_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d' + install_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600' + install_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3' } do_deploy[dirs] = "${S}" @@ -359,10 +358,10 @@ do_deploy() { deploy_image '${MACHINE_ARCH}' # And the machine specific images - deploy_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}' - deploy_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}' - deploy_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}' - deploy_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}' + deploy_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2' + deploy_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d' + deploy_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600' + deploy_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3' } addtask deploy before do_build after do_compile diff --git a/packages/linux/ixp4xx-kernel/2.6.19/defconfig b/packages/linux/ixp4xx-kernel/2.6.19/defconfig index 00750f843a..56eaea7a27 100644 --- a/packages/linux/ixp4xx-kernel/2.6.19/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.19/defconfig @@ -189,7 +189,8 @@ CONFIG_PCI=y CONFIG_PREEMPT=y # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y diff --git a/packages/linux/ixp4xx-kernel/2.6.19/series b/packages/linux/ixp4xx-kernel/2.6.19/series index ec0e7a81c5..e7ef3083dd 100644 --- a/packages/linux/ixp4xx-kernel/2.6.19/series +++ b/packages/linux/ixp4xx-kernel/2.6.19/series @@ -39,8 +39,6 @@ squashfs/squashfs-Makefile.patch 86-nas100d-rtc-fixup.patch 87-dsmg600-rtc-fixup.patch 88-dsmg600-dflt-cmdline.patch -88-nas100d-dflt-cmdline.patch -88-nslu2-dflt-cmdline.patch 95-pata-ixp4xx.patch 96-fsg3-support.patch 97-avila-setup-pata.patch diff --git a/packages/linux/ixp4xx-kernel/2.6.20/defconfig b/packages/linux/ixp4xx-kernel/2.6.20/defconfig index a7cdacc960..93380dd3b9 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.20/defconfig @@ -196,7 +196,8 @@ CONFIG_PCI=y CONFIG_PREEMPT=y # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series index 71c17940fc..7100d2f806 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/series +++ b/packages/linux/ixp4xx-kernel/2.6.20/series @@ -9,10 +9,10 @@ squashfs/squashfs-force-O2.patch squashfs/squashfs-lzma.patch squashfs/squashfs-Kconfig.patch squashfs/squashfs-Makefile.patch +00-fix-redboot-bad-code.patch 07-remove-avila-ixdp425-setup.patch 08-avila-loft-setup.patch 09-avila-setup-pata.patch -11-mtdpart-redboot-config-byteswap.patch 30-ixp4xx-npe-driver-0.3.1.patch 37-ixp4xx-net-driver-improve-mac-handling.patch 39-ixp4xx-net-driver-mtd-load-fw.patch @@ -36,8 +36,6 @@ squashfs/squashfs-Makefile.patch 86-nas100d-rtc-fixup.patch 87-dsmg600-rtc-fixup.patch 88-dsmg600-dflt-cmdline.patch -88-nas100d-dflt-cmdline.patch -88-nslu2-dflt-cmdline.patch 96-fsg3-support.patch 98-sata_via-pata-support-upstream.patch 99-avila-mtd-microcode.patch diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb index f10af6c050..eba9d6a404 100644 --- a/packages/linux/ixp4xx-kernel_2.6.19.bb +++ b/packages/linux/ixp4xx-kernel_2.6.19.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "683" +IXP4XX_KERNEL_SVN_REV = "693" # # The directory containing the patches to be applied is # specified below @@ -23,16 +23,3 @@ require ixp4xx-kernel-svnpatch.inc SRC_URI += "file://defconfig" SRC_URI += "file://series" - -# Remove the specific cmdline hacking patches if we are not building for nslu2. -addtask remove_cmdline_hacks before do_patch after do_unpack -do_remove_cmdline_hacks() { - -# if [ "${MACHINE}" != "nslu2" ] ; then - sed -e '/88-nas100d-dflt-cmdline.patch/d' \ - -e '/88-nslu2-dflt-cmdline.patch/d' \ - '${WORKDIR}/series' > '${WORKDIR}/series.new' - mv '${WORKDIR}/series.new' '${WORKDIR}/series' -# fi - -} diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb index 2d057799ac..2e768b133b 100644 --- a/packages/linux/ixp4xx-kernel_2.6.20.bb +++ b/packages/linux/ixp4xx-kernel_2.6.20.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "683" +IXP4XX_KERNEL_SVN_REV = "693" # # The directory containing the patches to be applied is # specified below @@ -23,16 +23,3 @@ require ixp4xx-kernel-svnpatch.inc SRC_URI += "file://defconfig" SRC_URI += "file://series" - -# Remove the specific cmdline hacking patches if we are not building for nslu2. -addtask remove_cmdline_hacks before do_patch after do_unpack -do_remove_cmdline_hacks() { - - if [ "${MACHINE}" != "nslu2" ] ; then - sed -e '/88-nas100d-dflt-cmdline.patch/d' \ - -e '/88-nslu2-dflt-cmdline.patch/d' \ - '${WORKDIR}/series' > '${WORKDIR}/series.new' - mv '${WORKDIR}/series.new' '${WORKDIR}/series' - fi - -} diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc index 4f38799a8d..6e4483f6f3 100644 --- a/packages/madwifi/madwifi-ng_r.inc +++ b/packages/madwifi/madwifi-ng_r.inc @@ -22,8 +22,7 @@ inherit module-base EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" -EXTRA_OEMAKE_prepend_ixp4xxle = "TARGET=xscale-le-elf " -EXTRA_OEMAKE_prepend_ixp4xxbe = "TARGET=xscale-be-elf " +EXTRA_OEMAKE_prepend_ixp4xx = "TARGET=xscale-${SITEINFO_ENDIANESS}-elf " do_compile() { oe_runmake all diff --git a/packages/mediatomb/mediatomb_svn.bb b/packages/mediatomb/mediatomb_svn.bb index 4d8b4f2c4d..0283eb6ae7 100644 --- a/packages/mediatomb/mediatomb_svn.bb +++ b/packages/mediatomb/mediatomb_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://mediatomb.org/" LICENSE = "GPLv2" DEPENDS = "sqlite3 libexif js zlib file id3lib" PV = "0.8+0.9pre1+svn${SRCDATE}-sqlite" -PR = "r1" +PR = "r2" SRC_URI = "svn://mediatomb.svn.sourceforge.net/svnroot/mediatomb/trunk;proto=https;module=mediatomb" @@ -16,7 +16,7 @@ EXTRA_OECONF = "--disable-mysql \ --enable-sqlite3 \ --enable-libjs \ --enable-libmagic \ - --enable-taglib \ + --enable-id3lib \ --enable-libexif \ --disable-largefile \ --with-sqlite3-h=${STAGING_INCDIR} \ @@ -29,4 +29,5 @@ EXTRA_OECONF = "--disable-mysql \ --with-zlib-libs=${STAGING_LIBDIR} \ --with-js-h=${STAGING_INCDIR}/js \ --with-js-libs=${STAGING_LIBDIR} \ - --with-taglib-cfg=${STAGING_BINDIR_CROSS}/taglib-config" + --with-id3lib-h=${STAGING_INCDIR} \ + --with-id3lib-libs=${STAGING_LIBDIR}" diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index d8e8ee96bb..3b4023ba45 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -11,7 +11,6 @@ INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" ALLOW_EMPTY = "1" PACKAGES = "${PN}" -PROVIDES += "${SLUGOS_IMAGENAME}-native" # Run-time only (RDEPENDS) stuff - no package explicitly provides # these targets. diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 01a79a8e75..064adaf03e 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,9 +5,8 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r17" +PR = "r18" CONFLICTS = "db3" -PROVIDES += "${SLUGOS_IMAGENAME}-packages" COMPATIBLE_MACHINE = "nslu2" EXCLUDE_FROM_WORLD = "1" @@ -106,6 +105,7 @@ SLUGOS_PACKAGES = "\ make \ masqmail \ mdadm \ + mediatomb \ memtester \ mgetty \ miau \ diff --git a/packages/mrxvt/mrxvt_0.4.1.bb b/packages/mrxvt/mrxvt_0.4.1.bb index 153d226f97..8991295902 100644 --- a/packages/mrxvt/mrxvt_0.4.1.bb +++ b/packages/mrxvt/mrxvt_0.4.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "MRXVT is a lightweight and powerful X terminal emulator based on HOMEPAGE = "http://materm.sourceforge.net" AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>" LICENSE = "GPL" -SECTION = "x11/apps" +SECTION = "x11/applications" DEPENDS = "virtual/libx11 libxext libxpm jpeg libpng" PR = "r0" diff --git a/packages/musicpd/glurp_0.11.3.bb b/packages/musicpd/glurp_0.11.3.bb index 4d9449c904..59cea4f8c9 100644 --- a/packages/musicpd/glurp_0.11.3.bb +++ b/packages/musicpd/glurp_0.11.3.bb @@ -1,9 +1,8 @@ DESCRIPTION = "glurp - frontend for mpd" HOMEPAGE = "http://www.musicpd.org/glurp.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "gtk+ libglade" -PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/glurp/glurp-${PV}.tar.gz" diff --git a/packages/musicpd/gmpc_0.11.2.bb b/packages/musicpd/gmpc_0.11.2.bb index 9468a07249..6ed2ada569 100644 --- a/packages/musicpd/gmpc_0.11.2.bb +++ b/packages/musicpd/gmpc_0.11.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GTK+ Frontend for mpd" HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "gtk+ libglade gnome-vfs" PR = "r1" diff --git a/packages/musicpd/gmpc_0.13.0.bb b/packages/musicpd/gmpc_0.13.0.bb index 3d9c668527..f8c99efb36 100644 --- a/packages/musicpd/gmpc_0.13.0.bb +++ b/packages/musicpd/gmpc_0.13.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GTK+ Frontend for mpd" HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "libmpd gtk+ libglade gnome-vfs" PR = "r0" diff --git a/packages/musicpd/gmpc_svn.bb b/packages/musicpd/gmpc_svn.bb index 9c03faa395..fbaea3e5f2 100644 --- a/packages/musicpd/gmpc_svn.bb +++ b/packages/musicpd/gmpc_svn.bb @@ -1,11 +1,10 @@ DESCRIPTION = "GTK+ Frontend for mpd" HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "libmpd gtk+ libglade gnome-vfs gob2" SRCDATE = "20070120" PV = "0.13.0+svn${SRCDATE}" -PR = "r0" SRC_URI = "svn://svn.musicpd.org/gmpc;module=trunk;proto=https" S = "${WORKDIR}/trunk" diff --git a/packages/musicpd/libmpd_svn.bb b/packages/musicpd/libmpd_svn.bb index eea7b952a3..4c78eb15f4 100644 --- a/packages/musicpd/libmpd_svn.bb +++ b/packages/musicpd/libmpd_svn.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Music Player Daemon (mpd) library" HOMEPAGE = "http://www.musicpd.org" +SECTION = "libs/multimedia" LICENSE = "GPLv2" -SECTION = "lib/multimedia" SRCDATE = "20070120" PV = "0.0.0+svn${SRCDATE}" -PR = "r0" SRC_URI = "svn://svn.musicpd.org/libmpd;module=trunk;proto=https" S = "${WORKDIR}/trunk" diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb index 8806653357..8d3eaa183a 100644 --- a/packages/musicpd/mpc_0.11.2.bb +++ b/packages/musicpd/mpc_0.11.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client" HOMEPAGE = "http://www.musicpd.org/mpc.shtml" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz" diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.0.bb index 6d47f9418f..ccd6926fcd 100644 --- a/packages/musicpd/mpc_0.12.0.bb +++ b/packages/musicpd/mpc_0.12.0.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client" HOMEPAGE = "http://www.musicpd.org/mpc.shtml" -LICENSE = "GPLv2" SECTION = "console/multimedia" -PR = "r0" +LICENSE = "GPLv2" SRC_URI = "http://www.musicpd.org/uploads/files/mpc-${PV}.tar.bz2" EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \ diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb index 1ba1fabd16..939ecec836 100644 --- a/packages/musicpd/mpd-alsa_0.11.5.bb +++ b/packages/musicpd/mpd-alsa_0.11.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa support" HOMEPAGE = "http://www.musicpd.org" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv" RDEPENDS = "libao-alsa" PR = "r3" diff --git a/packages/musicpd/mpd_0.11.2.bb b/packages/musicpd/mpd_0.11.2.bb index 493f677a50..9d3c5f90b0 100644 --- a/packages/musicpd/mpd_0.11.2.bb +++ b/packages/musicpd/mpd_0.11.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile" PR = "r2" diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb index d501d0e478..7a1d17ef5d 100644 --- a/packages/musicpd/mpd_0.11.5.bb +++ b/packages/musicpd/mpd_0.11.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2" PR = "r8" diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb index 3478bc76fa..5a338aa7d2 100644 --- a/packages/musicpd/mpd_svn.bb +++ b/packages/musicpd/mpd_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio" SRCDATE = "20070120" PV = "0.12.1+svn${SRCDATE}" diff --git a/packages/musicpd/ncmpc_0.11.1.bb b/packages/musicpd/ncmpc_0.11.1.bb index c687f9ea02..32195ccb9d 100644 --- a/packages/musicpd/ncmpc_0.11.1.bb +++ b/packages/musicpd/ncmpc_0.11.1.bb @@ -1,9 +1,8 @@ DESCRIPTION = "Ncurses based Music Player Daemon (mpd) Client" HOMEPAGE = "http://www.musicpd.org/ncmpc.shtml" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "ncurses glib-2.0" -PR = "r0" SRC_URI = "http://mercury.chem.pitt.edu/~shank/ncmpc-${PV}.tar.gz" diff --git a/packages/musicpd/py-libmpdclient_0.10.0.bb b/packages/musicpd/py-libmpdclient_0.10.0.bb index 675567eede..92423f0c88 100644 --- a/packages/musicpd/py-libmpdclient_0.10.0.bb +++ b/packages/musicpd/py-libmpdclient_0.10.0.bb @@ -1,9 +1,8 @@ DESCRIPTION = "Python library for Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org/py-libmpdclient.shtml" +SECTION = "libs/multimedia" LICENSE = "GPLv2" -SECTION = "lib/multimedia" DEPENDS = "libmpd python" -PR = "r0" SRC_URI = "http://mercury.chem.pitt.edu/~shank/py-libmpdclient-${PV}.tar.gz" diff --git a/packages/nasm/nasm_0.98.38.bb b/packages/nasm/nasm_0.98.38.bb index 3b9bf36e17..86e7f2b935 100644 --- a/packages/nasm/nasm_0.98.38.bb +++ b/packages/nasm/nasm_0.98.38.bb @@ -1,8 +1,7 @@ -SECTION = "devel" DESCRIPTION = "General-purpose x86 assembler" -COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)' +SECTION = "devel" LICENSE = "GPL" -SECTION = "dev-lang" +COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)' SRC_URI = "${SOURCEFORGE_MIRROR}/nasm/nasm-${PV}.tar.bz2" diff --git a/packages/netcat/netcat_0.7.1.bb b/packages/netcat/netcat_0.7.1.bb index a6361f0731..c7ceccddf2 100644 --- a/packages/netcat/netcat_0.7.1.bb +++ b/packages/netcat/netcat_0.7.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GNU Netcat" HOMEPAGE = "http://netcat.sourceforge.net" +SECTION = "console/network" LICENSE = "GPLv2" -SECTION = "console/networking" PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2" diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb index e14230aadc..737d9544d0 100644 --- a/packages/networkmanager/networkmanager_0.6.4.bb +++ b/packages/networkmanager/networkmanager_0.6.4.bb @@ -1,5 +1,5 @@ DESCRIPTION = "GNOME NetworkManager port" -SECTION = "net/misc" +SECTION = "network/misc" LICENSE = "GPL" HOMEPAGE = "http://www.gnome.org" PRIORITY = "optional" diff --git a/packages/nis/nis-all.bb b/packages/nis/nis-all.bb index a0af47b0cb..181a06cd2e 100644 --- a/packages/nis/nis-all.bb +++ b/packages/nis/nis-all.bb @@ -1,12 +1,12 @@ # This meta package is a convenience to build all of the # NIS packages. # -PR = "r0" + DESCRIPTION="NIS services" HOMEPAGE="http://www.linux-nis.org/nis/" -SECTION = "console/networking" +SECTION = "console/network" PRIORITY = "optional" -LICENSE = "GPL-2" +LICENSE = "GPLv2" INHIBIT_DEFAULT_DEPS = "1" diff --git a/packages/nis/nis.inc b/packages/nis/nis.inc index 45232881cb..90f7ff50a0 100644 --- a/packages/nis/nis.inc +++ b/packages/nis/nis.inc @@ -5,9 +5,9 @@ # the rpcsvc functionality is not present in uclibc DESCRIPTION ?= "NIS Server and Tools" HOMEPAGE ?= "http://www.linux-nis.org/nis/" -SECTION ?= "console/networking" +SECTION ?= "console/network" PRIORITY ?= "optional" -LICENSE ?= "GPL-2" +LICENSE ?= "GPLv2" # Override these *after* the include file if necessary! SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/net/NIS/${P}.tar.bz2" diff --git a/packages/nonworking/icecast/icecast_2.2.0.bb b/packages/nonworking/icecast/icecast_2.2.0.bb index c4738cb46f..c0f500ac4a 100644 --- a/packages/nonworking/icecast/icecast_2.2.0.bb +++ b/packages/nonworking/icecast/icecast_2.2.0.bb @@ -1,5 +1,5 @@ PR = "r4" -LICENSE = "GPL-2" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libxslt" diff --git a/packages/obsolete/nslu2/nslu2-kernel.inc b/packages/obsolete/nslu2/nslu2-kernel.inc deleted file mode 100644 index 6b866100ca..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel.inc +++ /dev/null @@ -1,256 +0,0 @@ -# Standard definitions for any NSLU2 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: -# -# N2K_PATCHES - full list of patches to apply, to add files -# generate a patch against /dev/null -# N2K_SUFFIX - the suffix to add after 'zImage-' in the -# deploy/images directory, should identify the image config -# -# DEFAULT_PREFERENCE is set automagically in this file as -# follows: -# -# 10 For *released* kernels -# 8 For mm or ac patched versions of released kernels -# 6 For rc patched kernels (release candidates) -# 4 For mm or ac patched rc (release candidate) kernels -# 2 For pre or bk versions -# 0 For mm or ac patched pre or bk versions -# -# -------------------------------------------------------------- -# -# Within this file bitbake variables local to the file are -# named N2K_FOO -# -SECTION = "kernel" -DESCRIPTION = "Linux kernel for the Linksys NSLU2 device" -LICENSE = "GPL" - -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): -# -# nslu2-kernel/files -# nslu2-kernel/X.Y -# nslu2-kernel/X.Y.Z -# nslu2-kernel/X.Y.Z-patch -# nslu2-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 nslu2-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}/nslu2-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("${KERNELORG_MIRROR}/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("${KERNELORG_MIRROR}/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("${KERNELORG_MIRROR}/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("${KERNELORG_MIRROR}/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("nslu2-kernel: patch %s not recognized in %s" % (patch, '-'.join(pv))) - filepath[0:0] = [ filedir % pname ] - base = pname - - base = '.'.join(kernel) - patch_uri[0] = "${KERNELORG_MIRROR}/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("N2K_SRCMAJ", major, d) - # bb.note("N2K_SRCMAJ := %s" % major) - bb.data.setVar("N2K_SRCVER", base, d) - # bb.note("N2K_SRCVER := %s" % base) - bb.data.setVar("N2K_SRCURI", ' '.join(patch_uri), d) - # bb.note("N2K_SRCURI := %s" % ' '.join(patch_uri)) - bb.data.setVar("N2K_FILESPATH", ':'.join(filepath), d) - # bb.note("N2K_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 = "${FILE_DIRNAME}/${P}:${N2K_FILESPATH}" - -# 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-${N2K_SRCVER}" - -# N2K_PATCHES is the list of patches. -N2K_PATCHES ?= "" - -# Image suffix - actually set in conf/machine/nslu2.conf as it is also -# used by anything which needs to know the name of the generated image. -# Should be overridden in the distro if patches or defconfig are changed. -N2K_SUFFIX ?= "nslu2${SITEINFO_ENDIANESS}" - -SRC_URI = "${N2K_SRCURI}" -SRC_URI += "${N2K_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_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc" -# Add distro specific debug (or non-debug) options to this -CMDLINE_DEBUG ?= "" -CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_KERNEL_OPTIONS} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}" - -# 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'" - -addtask unpacklocal before do_patch after do_unpack - -# NOTE: in MM kernel builds the config options (oldconfig, menuconfig -# and so on) do not allow an option to be overridden, so the following -# removes the options which must be changed. -do_configure_prepend() { - rm -f ${S}/.config - echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' - if test '${SITEINFO_ENDIANESS}' = 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 -} - -# This function adds the required prefix to the image to deal with two -# problems: -# -# 1) The machine type set by RedBoot is wrong - the type for an ixdp425, not an NSLU2 -# e3a01c02 e3811055 -# 2) For LE kernels it is necessary to prefix change-to-le code to the kernel image: -# ee110f10 e3c00080 ee010f10 -# and to byte swap the (LE) image to match the BE flash layout -# -# The argument to the function is the destination directory -redboot_fixup_armeb() { - rm -f "$1".new - devio '<<arch/${ARCH}/boot/${KERNEL_IMAGETYPE}' >"$1".new \ - 'wb 0xe3a01c02,4' \ - 'wb 0xe3811055,4' \ - 'cp$' - mv "$1".new "$1" -} - -redboot_fixup_arm() { - rm -f "$1".new - devio '<<arch/${ARCH}/boot/${KERNEL_IMAGETYPE}' >"$1".new \ - 'wb 0xe3a01c02,4' \ - 'wb 0xe3811055,4' \ - 'wb 0xee110f10,4' \ - 'wb 0xe3c00080,4' \ - 'wb 0xee010f10,4' \ - 'xp $,4' || { - echo 'ERROR: arch/${ARCH}/boot/${KERNEL_IMAGETYPE}: failed to byteswap zImage' >&2 - return 1 - } - mv "$1".new "$1" -} - -do_install_append() { - redboot_fixup '${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE}' -} - -do_deploy[dirs] = "${S}" -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - redboot_fixup '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${N2K_SUFFIX}' -} - -addtask deploy before do_build after do_compile - -COMPATIBLE_MACHINE = "nslu2" diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/bootramdisk.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/bootramdisk.patch deleted file mode 100644 index c03a0d9cda..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/bootramdisk.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- linux-2.6.11/arch/arm/kernel/setup.c.orig Mon Mar 7 09:41:40 2005 -+++ linux-2.6.11/arch/arm/kernel/setup.c Mon Mar 7 09:42:15 2005 -@@ -431,8 +431,10 @@ - rd_prompt = prompt; - rd_doload = doload; - -+#if 0 /* rd_size is not exported by 2.6.11-mm1 */ - if (rd_sz) - rd_size = rd_sz; -+#endif - #endif - } - diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/defconfig b/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/defconfig deleted file mode 100644 index 7ca968ac66..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/defconfig +++ /dev/null @@ -1,1204 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-mm4 -# Sat May 7 11:48:09 2005 -# -CONFIG_ARM=y -CONFIG_MMU=y -CONFIG_UID16=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_IOMAP=y - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y -CONFIG_BROKEN_ON_SMP=y - -# -# General setup -# -CONFIG_LOCALVERSION="" -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_EMBEDDED=y -# CONFIG_KALLSYMS is not set -# CONFIG_BASE_FULL is not set -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=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 - -# -# 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_IMX is not set -# CONFIG_ARCH_H720X is not set -CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y - -# -# Intel IXP4xx Implementation Options -# - -# -# IXP4xx Platforms -# -# 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_NSLU2=y -# CONFIG_ARCH_PRPMC1100 is not set -# CONFIG_MACH_GTWX5715 is not set - -# -# IXP4xx Options -# -CONFIG_IXP4XX_INDIRECT_PCI=y -CONFIG_DMABOUNCE=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 -CONFIG_CPU_MINICACHE=y - -# -# Processor Features -# -CONFIG_ARM_THUMB=y -# CONFIG_ARM_THUMB_INTERWORK is not set -# CONFIG_ARCH_XSCALE is not set -CONFIG_CPU_BIG_ENDIAN=y -CONFIG_XSCALE_PMU=y - -# -# General setup -# -CONFIG_PCI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -# CONFIG_XIP_KERNEL is not set -# CONFIG_PCI_LEGACY_PROC is not set -# CONFIG_PCI_NAMES is not set - -# -# PCCARD (PCMCIA/CardBus) support -# -# CONFIG_PCCARD is not set - -# -# At least one math emulation must be selected -# -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_FASTFPE is not set -CONFIG_BINFMT_ELF=y -# CONFIG_BINFMT_AOUT is not set -# CONFIG_BINFMT_MISC is not set - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set -# CONFIG_PM is not set -# CONFIG_PREEMPT is not set -# CONFIG_ARTHUR is not set -CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc console=ttyS0,115200n8" -CONFIG_ALIGNMENT_TRAP=y - -# -# Parallel port support -# -# CONFIG_PARPORT 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=y -# 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 - -# -# 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 is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_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_EDB7312 is not set -# CONFIG_MTD_PCI 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 - -# -# Plug and Play support -# - -# -# Block devices -# -# CONFIG_BLK_DEV_FD is not set -# 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_INITRAMFS_SOURCE="" -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -CONFIG_IOSCHED_DEADLINE=y -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_ATA_OVER_ETH is not set - -# -# Multi-device support (RAID and LVM) -# -# CONFIG_MD is not set - -# -# Networking support -# -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=m -CONFIG_PACKET_MMAP=y -# CONFIG_NETLINK_DEV is not set -CONFIG_UNIX=y -# CONFIG_NET_KEY is not set -CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_ADVANCED_ROUTER is not set -# 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_IP_TCPDIAG=m -# CONFIG_IP_TCPDIAG_IPV6 is not set -# CONFIG_IPV6 is not set -# CONFIG_NETFILTER is not set -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_SCTP is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set -# CONFIG_DECNET is not set -CONFIG_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 is not set - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -# CONFIG_KGDBOE is not set -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_RX is not set -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y -# 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 is not set -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIVHCI is not set -# CONFIG_IEEE80211 is not set -CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set - -# -# ARCnet devices -# -# CONFIG_ARCNET is not set - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_SMC91X 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_SKGE is not set -# CONFIG_SK98LIN is not set -# CONFIG_VIA_VELOCITY is not set -# CONFIG_TIGON3 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_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 is not set -# CONFIG_SLIP is not set -# CONFIG_NET_FC is not set -# CONFIG_SHAPER is not set -CONFIG_NETCONSOLE=m - -# -# ATA/ATAPI/MFM/RLL support -# -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_SCSI=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CHR_DEV_OSST is not set -# CONFIG_BLK_DEV_SR is not set -# CONFIG_CHR_DEV_SG is not set -# CONFIG_CHR_DEV_SCH is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -# CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_ISCSI_IF 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 - -# -# SCSI low-level drivers -# -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_3W_9XXX is not set -# CONFIG_SCSI_ARCMSR 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=y -# 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_DC395x is not set -# CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set - -# -# Fusion MPT device support -# -# CONFIG_FUSION is not set - -# -# IEEE 1394 (FireWire) support -# -# CONFIG_IEEE1394 is not set - -# -# I2O device support -# -# CONFIG_I2O is not set - -# -# ISDN subsystem -# -# CONFIG_ISDN is not set - -# -# Input device support -# -# CONFIG_INPUT 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_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=m -# 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 - -# -# 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_IOP3XX is not set -# CONFIG_I2C_ISA is not set -CONFIG_I2C_IXP4XX=y -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_PIIX4 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 - -# -# Hardware Sensors Chip support -# -CONFIG_I2C_SENSOR=y -# 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_ASB100 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_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_SIS5595 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_VIA686A is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set - -# -# Other I2C Chip support -# -CONFIG_SENSORS_EEPROM=y -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_RTC8564 is not set -CONFIG_SENSORS_X1205=y -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# Multimedia devices -# -# CONFIG_VIDEO_DEV is not set - -# -# Digital Video Broadcasting Devices -# -# CONFIG_DVB is not set - -# -# File systems -# -CONFIG_EXT2_FS=m -# CONFIG_EXT2_FS_XATTR is not set -CONFIG_EXT3_FS=m -CONFIG_EXT3_FS_XATTR=y -# CONFIG_EXT3_FS_POSIX_ACL is not set -# CONFIG_EXT3_FS_SECURITY is not set -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=m -CONFIG_REISER4_FS=m -# CONFIG_REISER4_DEBUG is not set -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_REISERFS_FS_XATTR is not set -# CONFIG_JFS_FS is not set - -# -# XFS support -# -# 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 - -# -# Caches -# -# CONFIG_FSCACHE is not set -# 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_DEVFS_FS is not set -# CONFIG_DEVPTS_FS_XATTR is not set -CONFIG_TMPFS=y -# CONFIG_TMPFS_XATTR is not set -# 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_NAND is not set -# CONFIG_JFFS2_FS_NOR_ECC 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_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_V4 is not set -# CONFIG_NFS_DIRECTIO is not set -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V4 is not set -CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_SUNRPC=m -# CONFIG_RPCSEC_GSS_KRB5 is not set -# 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 is not set -# CONFIG_CIFS_EXPERIMENTAL is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set -CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_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 - -# -# Graphics support -# -# CONFIG_FB is not set - -# -# Sound -# -# CONFIG_SOUND is not set - -# -# Misc devices -# - -# -# 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 is not set -# CONFIG_USB_EHCI_ROOT_HUB_TT 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 is not set -# CONFIG_USB_SL811_HCD is not set - -# -# USB Device Class drivers -# - -# -# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem -# -# CONFIG_USB_ACM is not set -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_RW_DETECT is not set -# CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_FREECOM 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 - -# -# USB Input Devices -# -# CONFIG_USB_HID is not set - -# -# USB HID Boot Protocol drivers -# - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - -# -# USB Multimedia devices -# -# CONFIG_USB_DABUSB is not set - -# -# Video4Linux support is needed for USB Multimedia device support -# - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m - -# -# USB Host-to-Host Cables -# -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_GENESYS=y -CONFIG_USB_NET1080=y -CONFIG_USB_PL2301=y -CONFIG_USB_KC2190=y - -# -# Intelligent USB Devices/Gadgets -# -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_ZAURUS=y -CONFIG_USB_CDCETHER=y - -# -# USB Network Adapters -# -CONFIG_USB_AX8817X=y -# 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_BELKIN=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -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_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_TEST is not set - -# -# USB ATM/DSL drivers -# - -# -# USB Gadget Support -# -# CONFIG_USB_GADGET is not set - -# -# MMC/SD Card support -# -# CONFIG_MMC 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=m -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_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/reiser4.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/reiser4.patch deleted file mode 100644 index b752ddac98..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/reiser4.patch +++ /dev/null @@ -1,617 +0,0 @@ ---- linux-2.6.11/.pc/reiser4/fs/reiser4/plugin/disk_format/disk_format40.c 2005-03-27 21:36:10.656270448 -0800 -+++ linux-2.6.11/fs/reiser4/plugin/disk_format/disk_format40.c 2005-03-27 23:39:18.967076480 -0800 -@@ -467,19 +467,15 @@ - return 0; - } - --#define FORMAT40_ROOT_LOCALITY 41 --#define FORMAT40_ROOT_OBJECTID 42 -+#define FORMAT40_ROOT_LOCALITY 41ull -+#define FORMAT40_ROOT_OBJECTID 42ull - - /* plugin->u.format.root_dir_key */ - reiser4_internal const reiser4_key * - root_dir_key_format40(const struct super_block *super UNUSED_ARG) - { - static const reiser4_key FORMAT40_ROOT_DIR_KEY = { -- .el = {{(FORMAT40_ROOT_LOCALITY << 4) | KEY_SD_MINOR}, --#if REISER4_LARGE_KEY -- {0ull}, --#endif -- {FORMAT40_ROOT_OBJECTID}, {0ull}} -+ .el = { KEY_INIT(KEY_SD_MINOR,FORMAT40_ROOT_LOCALITY,0ull,0,FORMAT40_ROOT_OBJECTID,0ull) } - }; - - return &FORMAT40_ROOT_DIR_KEY; ---- linux-2.6.11/.pc/reiser4/fs/reiser4/plugin/disk_format/disk_format40.h 2005-03-27 21:24:00.618253096 -0800 -+++ linux-2.6.11/fs/reiser4/plugin/disk_format/disk_format40.h 2005-03-27 21:24:02.747929336 -0800 -@@ -49,7 +49,7 @@ - /* 70 */ d16 formatting_policy; - /* 72 */ d64 flags; - /* 72 */ char not_used[432]; --} format40_disk_super_block; -+} PACKED64 format40_disk_super_block; - - /* format 40 specific part of reiser4_super_info_data */ - typedef struct format40_super_info { ---- linux-2.6.11/.pc/reiser4/fs/reiser4/plugin/file/invert.c 2005-03-27 21:24:00.625252032 -0800 -+++ linux-2.6.11/fs/reiser4/plugin/file/invert.c 2005-03-27 21:24:02.747929336 -0800 -@@ -240,14 +240,14 @@ - typedef struct flow_header { - d32 fl_magic; - d16 fl_nr; /* number of subfiles in the flow */ --}; -+} PACKED32; - - typedef struct subfile_header { - d32 sh_magic; /* subfile magic */ - d16 sh_type; /* type of subfile: light-weight, ordinary, invert */ - d16 sh_arg_len; /* lenght of lookup argument (filename, key) */ - d32 sh_body_len; /* lenght of subfile body */ --}; -+} PACKED32; - - /* functions to get/set fields of flow header */ - ---- linux-2.6.11/.pc/reiser4/fs/reiser4/plugin/item/static_stat.c 2005-03-27 21:24:00.648248536 -0800 -+++ linux-2.6.11/fs/reiser4/plugin/item/static_stat.c 2005-03-27 21:34:27.331978128 -0800 -@@ -19,6 +19,38 @@ - - /* see static_stat.h for explanation */ - -+/* compile time verify of the data structure sizes and alignments */ -+static inline void -+r4static_stat_verify(void) -+{ -+ /* All these structures are PACKED, so the __alignof__ should -+ * be 1. The sizes need to be correct as they map to disk -+ * structures. -+ */ -+ cassert(sizeof (reiser4_stat_data_base) == 2); -+ /* cassert(sizeof (reiser4_light_weight_stat) == 16); -+ * 14 bytes, comments in code do not take into account PACKED! -+ */ -+ cassert(sizeof (reiser4_light_weight_stat) == 14); -+ cassert(sizeof (reiser4_unix_stat) == 28); -+ cassert(sizeof (reiser4_symlink_stat) == 0); -+ cassert(sizeof (reiser4_plugin_slot) == 4); -+ cassert(sizeof (reiser4_plugin_stat) == 2); -+ cassert(sizeof (reiser4_flags_stat) == 4); -+ /* cassert(sizeof (reiser4_capabilities_stat) == 16); -+ * comments in the file look wrong - capabilities are 2 x d32 -+ * not 2 x d64 in the declaration. -+ */ -+ cassert(sizeof (reiser4_capabilities_stat) == 8); -+ cassert(sizeof (reiser4_cluster_stat) == 1); -+ cassert(sizeof (reiser4_crypto_stat) == 2); -+ /* cassert(sizeof (reiser4_large_times_stat) == 24); -+ * should be 12 bytes - 3 x d32, probably a bug in the def in -+ * the header file (meant to be 3 x d64?) -+ */ -+ cassert(sizeof (reiser4_large_times_stat) == 12); -+} -+ - /* helper function used while we are dumping/loading inode/plugin state - to/from the stat-data. */ - ---- linux-2.6.11/.pc/reiser4/fs/reiser4/plugin/item/acl.h 2005-03-27 21:24:00.629251424 -0800 -+++ linux-2.6.11/fs/reiser4/plugin/item/acl.h 2005-03-27 21:24:02.749929032 -0800 -@@ -26,7 +26,7 @@ - obj_key_id id; - /* file name. Null terminated string. */ - d8 name[0]; --} directory_entry_format; -+} PACKEDt(obj_key_id) directory_entry_format; - - void print_de(const char *prefix, coord_t * coord); - int extract_key_de(const coord_t * coord, reiser4_key * key); ---- linux-2.6.11/.pc/reiser4/fs/reiser4/plugin/item/cde.h 2005-03-27 21:24:00.632250968 -0800 -+++ linux-2.6.11/fs/reiser4/plugin/item/cde.h 2005-03-27 21:24:02.750928880 -0800 -@@ -15,12 +15,12 @@ - typedef struct cde_unit_header { - de_id hash; - d16 offset; --} cde_unit_header; -+} PACKEDt2(de_id,d16) cde_unit_header; - - typedef struct cde_item_format { - d16 num_of_entries; - cde_unit_header entry[0]; --} cde_item_format; -+} PACKEDt2(d16,cde_unit_header) cde_item_format; - - typedef struct cde_entry { - const struct inode *dir; ---- linux-2.6.11/.pc/reiser4/fs/reiser4/plugin/item/extent.h 2005-03-27 21:32:13.758284416 -0800 -+++ linux-2.6.11/fs/reiser4/plugin/item/extent.h 2005-03-27 21:32:30.786695704 -0800 -@@ -7,7 +7,7 @@ - typedef struct { - reiser4_dblock_nr start; - reiser4_dblock_nr width; --} reiser4_extent; -+} PACKED64 reiser4_extent; - - typedef struct extent_stat { - int unallocated_units; ---- linux-2.6.11/.pc/reiser4/fs/reiser4/plugin/item/internal.h 2005-03-27 21:33:08.971890672 -0800 -+++ linux-2.6.11/fs/reiser4/plugin/item/internal.h 2005-03-27 22:15:43.290575208 -0800 -@@ -13,7 +13,7 @@ - typedef struct internal_item_layout { - /* 0 */ reiser4_dblock_nr pointer; - /* 4 */ --} internal_item_layout; -+} PACKED64 internal_item_layout; - - struct cut_list; - ---- linux-2.6.11/.pc/reiser4/fs/reiser4/plugin/item/sde.h 2005-03-27 21:24:00.646248840 -0800 -+++ linux-2.6.11/fs/reiser4/plugin/item/sde.h 2005-03-27 21:24:02.750928880 -0800 -@@ -26,7 +26,7 @@ - obj_key_id id; - /* file name. Null terminated string. */ - d8 name[0]; --} directory_entry_format; -+} PACKEDt(obj_key_id) directory_entry_format; - - void print_de(const char *prefix, coord_t * coord); - int extract_key_de(const coord_t * coord, reiser4_key * key); ---- linux-2.6.11/.pc/reiser4/fs/reiser4/plugin/node/node40.c 2005-03-27 21:24:00.654247624 -0800 -+++ linux-2.6.11/fs/reiser4/plugin/node/node40.c 2005-03-27 21:35:08.677692624 -0800 -@@ -32,6 +32,22 @@ - magic (32) - flush_time (32) - */ -+/* compile time verify of the data structure sizes and alignments */ -+static inline void -+r4node40_stat_verify(void) -+{ -+ /* The alignment of these structures is intended to be '1', but -+ * it doesn't matter so long as the size is right. -+ */ -+ cassert(sizeof (common_node_header) == 2); -+ cassert(sizeof (node40_header) == 28); -+#if REISER4_LARGE_KEY -+ cassert(sizeof (item_header40) == 38); -+#else -+ cassert(sizeof (item_header40) == 30); -+#endif -+} -+ - /* NIKITA-FIXME-HANS: I told you guys not less than 10 times to not call it r4fs. Change to "ReIs". */ - /* magic number that is stored in ->magic field of node header */ - static const __u32 REISER4_NODE_MAGIC = 0x52344653; /* (*(__u32 *)"R4FS"); */ ---- linux-2.6.11/.pc/reiser4/fs/reiser4/plugin/node/node.h 2005-03-27 21:24:00.656247320 -0800 -+++ linux-2.6.11/fs/reiser4/plugin/node/node.h 2005-03-27 21:24:02.753928424 -0800 -@@ -250,7 +250,7 @@ - /* identifier of node plugin. Must be located at the very beginning - of a node. */ - d16 plugin_id; --} common_node_header; -+} PACKED16 common_node_header; - - /* __REISER4_NODE_H__ */ - #endif ---- linux-2.6.11/.pc/reiser4/fs/reiser4/debug.c 2005-03-27 21:24:00.563261456 -0800 -+++ linux-2.6.11/fs/reiser4/debug.c 2005-03-27 23:27:58.569512632 -0800 -@@ -75,6 +75,72 @@ - va_list args; - - /* -+ * this is here to make sure that we don't compile code which we -+ * know a-priori will panic, or fail without panicing, since this -+ * compiles first if you find a duplicate case label error then -+ * you need to rewrite this code to match your compiler. -+ */ -+ cassert(sizeof (d8) == 1); -+ cassert(__alignof__ (d8) == 1); -+ { -+ struct { -+ __u8 pad; -+ d8 data; -+ } PACKED8 test; -+ cassert(sizeof test == 2); -+ cassert(sizeof test.data == 1); -+ cassert(__alignof__ test.data == 1); -+ cassert(__alignof__ test == 1); -+ } -+ cassert(sizeof (d16) == 2); -+ cassert(__alignof__ (d16) == 2); -+ { -+ struct { -+ __u8 pad; -+ d16 data; -+ } PACKED16 test; -+ cassert(sizeof test == 4); -+ cassert(sizeof test.data == 2); -+#if !__arm__ -+ cassert(__alignof__ test.data == 2); -+#endif -+ cassert(__alignof__ test == 2); -+#if !__arm__ -+ cassert(test.data.datum - &test.pad == 2); -+#endif -+ } -+ cassert(sizeof (d32) == 4); -+ cassert(__alignof__ (d32) == 4); -+ { -+ struct { -+ __u8 pad; -+ d32 data; -+ } PACKED32 test; -+ cassert(sizeof test == 8); -+ cassert(sizeof test.data == 4); -+ cassert(__alignof__ test.data == 4); -+ cassert(__alignof__ test == 4); -+ cassert(test.data.datum - &test.pad == 4); -+ } -+ cassert(sizeof (d64) == 8); -+ cassert(__alignof__ (d64) == 8); -+ { -+ struct { -+ __u8 pad; -+ d64 data; -+ } PACKED64 test; -+ cassert(sizeof test == 16); -+ cassert(sizeof test.data == 8); -+ cassert(__alignof__ test.data == 8); -+ cassert(__alignof__ test == 8); -+ cassert(test.data.datum - &test.pad == 8); -+ } -+ -+ /* This is just a test of a struct with a single d64 element. */ -+ cassert(sizeof (reiser4_dblock_nr) == 8); -+ cassert(__alignof__(reiser4_dblock_nr) == 8); -+ -+ /* - * check for recursive panic. - */ - if (in_panic == 0) { ---- linux-2.6.11/.pc/reiser4/fs/reiser4/flush_queue.c 2005-03-27 21:24:00.577259328 -0800 -+++ linux-2.6.11/fs/reiser4/flush_queue.c 2005-03-27 21:24:02.755928120 -0800 -@@ -447,7 +447,7 @@ - - /* If all write requests registered in this "fq" are done we up - * the semaphore. */ -- if (atomic_sub_and_test(bio->bi_vcnt, &fq->nr_submitted)) -+ if (atomic_sub_return(bio->bi_vcnt, &fq->nr_submitted) == 0) - up(&fq->io_sem); - } - ---- linux-2.6.11/.pc/reiser4/fs/reiser4/key.c 2005-03-27 22:42:43.481268784 -0800 -+++ linux-2.6.11/fs/reiser4/key.c 2005-03-27 23:42:53.958392832 -0800 -@@ -13,10 +13,10 @@ - independent of key scheme. */ - static const reiser4_key MINIMAL_KEY = { - .el = { -- {0ull}, -- ON_LARGE_KEY({0ull},) -- {0ull}, -- {0ull} -+ {{0,0,0,0,0,0,0,0}}, -+ ON_LARGE_KEY({{0,0,0,0,0,0,0,0}},) -+ {{0,0,0,0,0,0,0,0}}, -+ {{0,0,0,0,0,0,0,0}} - } - }; - -@@ -24,10 +24,10 @@ - independent of key scheme. */ - static const reiser4_key MAXIMAL_KEY = { - .el = { -- {~0ull}, -- ON_LARGE_KEY({~0ull},) -- {~0ull}, -- {~0ull} -+ {{0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}}, -+ ON_LARGE_KEY({{0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}},) -+ {{0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}}, -+ {{0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}} - } - }; - ---- linux-2.6.11/.pc/reiser4/fs/reiser4/safe_link.c 2005-03-27 21:24:00.677244128 -0800 -+++ linux-2.6.11/fs/reiser4/safe_link.c 2005-03-27 21:24:02.756927968 -0800 -@@ -61,7 +61,7 @@ - reiser4_key sdkey; /* key of stat-data for the file safe-link is - * for */ - d64 size; /* size to which file should be truncated */ --} safelink_t; -+} PACKEDt2(reiser4_key, d64) safelink_t; - - /* - * locality where safe-link items are stored. Next to the objectid of root ---- linux-2.6.11/.pc/reiser4/fs/reiser4/status_flags.c 2005-03-27 21:24:00.682243368 -0800 -+++ linux-2.6.11/fs/reiser4/status_flags.c 2005-03-27 21:24:02.756927968 -0800 -@@ -153,6 +153,7 @@ - &statuspage->stacktrace[no]) - - GETFRAME(0); -+#ifndef __arm__ - GETFRAME(1); - GETFRAME(2); - GETFRAME(3); -@@ -162,6 +163,7 @@ - GETFRAME(7); - GETFRAME(8); - GETFRAME(9); -+#endif - - #undef GETFRAME - #endif ---- linux-2.6.11/.pc/reiser4/fs/reiser4/dformat.h 2005-03-27 21:24:00.564261304 -0800 -+++ linux-2.6.11/fs/reiser4/dformat.h 2005-03-27 23:29:03.223683704 -0800 -@@ -28,43 +28,84 @@ - - /* code on-disk data-types as structs with a single field - to rely on compiler type-checking. Like include/asm-i386/page.h */ -+/* This code did not work on the arm with gcc 3.4.3 because the -+ * arm has a minimum structure size of 4 - packed is necessary to -+ * allow these types to be smaller than 4 - and because this version -+ * of gcc 'loses' the alignment if the structure contains just one -+ * element of alignment 8 (or probably any value greater than 4). -+ * To fix this and to make the code much more portable all the basic -+ * types are now just done as arrays of bytes - __u8. -+ * -+ * This is highly tricky, however the check code in debug.c should -+ * fire a compile time assert if it goes wrong. -+ */ -+#if __arm__ -+#define PACKED8 __attribute__ ((packed,aligned(1))) -+/* Warning: the presence of the packed attribute here means that any -+ * d16 in a structure so marked will lose its alignment. That doesn't -+ * seem to matter because there don't seem to be any d16's with odd -+ * structure offsets, but it might. -+ */ -+#define PACKED16 __attribute__ ((packed,aligned(2))) -+#define PACKED32 __attribute__ ((aligned(4))) -+#define PACKED64 __attribute__ ((aligned(8))) -+#else -+#define PACKED8 __attribute__ ((aligned(1))) -+#define PACKED16 __attribute__ ((aligned(2))) -+#define PACKED32 __attribute__ ((aligned(4))) -+#define PACKED64 __attribute__ ((aligned(8))) -+#endif - typedef struct d8 { -- __u8 datum; --} d8 __attribute__ ((aligned(1))); -+ __u8 datum[1]; -+} PACKED8 d8; - typedef struct d16 { -- __u16 datum; --} d16 __attribute__ ((aligned(2))); -+ __u8 datum[2]; -+} PACKED16 d16; - typedef struct d32 { -- __u32 datum; --} d32 __attribute__ ((aligned(4))); -+ __u8 datum[4]; -+} PACKED32 d32; - typedef struct d64 { -- __u64 datum; --} d64 __attribute__ ((aligned(8))); -+ __u8 datum[8]; -+} PACKED64 d64; - -+#define PACKEDt(t) __attribute__ ((packed,aligned(__alignof__ (t)) )) -+#define PACKEDt2(t1,t2) __attribute__ ((packed,aligned(\ -+ __alignof__ (t1) < __alignof__ (t2) ? __alignof__ (t2) : __alignof__ (t1) ))) - #define PACKED __attribute__((packed)) - - static inline __u8 - d8tocpu(const d8 * ondisk /* on-disk value to convert */ ) - { -- return ondisk->datum; -+ return ondisk->datum[0]; - } - - static inline __u16 - d16tocpu(const d16 * ondisk /* on-disk value to convert */ ) - { -- return __le16_to_cpu(get_unaligned(&ondisk->datum)); -+ return ondisk->datum[0] + (ondisk->datum[1] << 8); - } - - static inline __u32 - d32tocpu(const d32 * ondisk /* on-disk value to convert */ ) - { -- return __le32_to_cpu(get_unaligned(&ondisk->datum)); -+ return ondisk->datum[0] + -+ (ondisk->datum[1] << 8) + -+ (ondisk->datum[2] << 16) + -+ (ondisk->datum[3] << 24); - } - - static inline __u64 - d64tocpu(const d64 * ondisk /* on-disk value to convert */ ) - { -- return __le64_to_cpu(get_unaligned(&ondisk->datum)); -+ __u32 low = ondisk->datum[0] + -+ (ondisk->datum[1] << 8) + -+ (ondisk->datum[2] << 16) + -+ (ondisk->datum[3] << 24); -+ __u64 high = ondisk->datum[4] + -+ (ondisk->datum[5] << 8) + -+ (ondisk->datum[6] << 16) + -+ (ondisk->datum[7] << 24); -+ return low + (high << 32); - } - - static inline d8 * -@@ -72,7 +113,7 @@ - d8 * ondisk /* result */ ) - { - assert("nikita-1264", oncpu < 0x100); -- put_unaligned(oncpu, &ondisk->datum); -+ ondisk->datum[0] = oncpu; - return ondisk; - } - -@@ -81,7 +122,8 @@ - d16 * ondisk /* result */ ) - { - assert("nikita-1265", oncpu < 0x10000); -- put_unaligned(__cpu_to_le16(oncpu), &ondisk->datum); -+ ondisk->datum[0] = oncpu; -+ ondisk->datum[1] = oncpu >> 8; - return ondisk; - } - -@@ -89,15 +131,27 @@ - cputod32(__u32 oncpu /* CPU value to convert */ , - d32 * ondisk /* result */ ) - { -- put_unaligned(__cpu_to_le32(oncpu), &ondisk->datum); -+ ondisk->datum[0] = oncpu; oncpu >>= 8; -+ ondisk->datum[1] = oncpu; oncpu >>= 8; -+ ondisk->datum[2] = oncpu; oncpu >>= 8; -+ ondisk->datum[3] = oncpu; - return ondisk; - } - - static inline d64 * --cputod64(__u64 oncpu /* CPU value to convert */ , -+cputod64(__u64 oncpuIn /* CPU value to convert */ , - d64 * ondisk /* result */ ) - { -- put_unaligned(__cpu_to_le64(oncpu), &ondisk->datum); -+ __u32 oncpu = oncpuIn; -+ ondisk->datum[0] = oncpu; oncpu >>= 8; -+ ondisk->datum[1] = oncpu; oncpu >>= 8; -+ ondisk->datum[2] = oncpu; oncpu >>= 8; -+ ondisk->datum[3] = oncpu; -+ oncpu = oncpuIn >> 32; -+ ondisk->datum[4] = oncpu; oncpu >>= 8; -+ ondisk->datum[5] = oncpu; oncpu >>= 8; -+ ondisk->datum[6] = oncpu; oncpu >>= 8; -+ ondisk->datum[7] = oncpu; - return ondisk; - } - -@@ -111,7 +165,7 @@ - /* data-type for block number on disk, disk format */ - union reiser4_dblock_nr { - d64 blk; --}; -+} PACKED64; - - static inline reiser4_block_nr - dblock_to_cpu(const reiser4_dblock_nr * dblock) -@@ -148,7 +202,7 @@ - char uuid[16]; /* unique id */ - char label[16]; /* filesystem label */ - d64 diskmap; /* location of the diskmap. 0 if not present */ --} reiser4_master_sb; -+} PACKED64 reiser4_master_sb; - - /* __FS_REISER4_DFORMAT_H__ */ - #endif ---- linux-2.6.11/.pc/reiser4/fs/reiser4/kassign.h 2005-03-27 21:24:00.588257656 -0800 -+++ linux-2.6.11/fs/reiser4/kassign.h 2005-03-27 21:24:02.757927816 -0800 -@@ -46,7 +46,7 @@ - d8 locality[sizeof (__u64)]; - ON_LARGE_KEY(d8 ordering[sizeof (__u64)];) - d8 objectid[sizeof (__u64)]; --} obj_key_id; -+} PACKED8 obj_key_id; - - /* Information sufficient to uniquely identify directory entry within - compressed directory item. -@@ -57,7 +57,7 @@ - ON_LARGE_KEY(d8 ordering[sizeof (__u64)];) - d8 objectid[sizeof (__u64)]; - d8 offset[sizeof (__u64)]; --} de_id; -+} PACKED8 de_id; - - extern int inode_onwire_size(const struct inode *obj); - extern char *build_inode_onwire(const struct inode *obj, char *area); ---- linux-2.6.11/.pc/reiser4/fs/reiser4/key.h 2005-03-27 21:24:00.591257200 -0800 -+++ linux-2.6.11/fs/reiser4/key.h 2005-03-27 23:41:07.744539792 -0800 -@@ -106,7 +106,7 @@ - union reiser4_key { - d64 el[KEY_LAST_INDEX]; - int pad; --}; -+} PACKED64; - - /* bitmasks showing where within reiser4_key particular key is - stored. */ -@@ -138,6 +138,20 @@ - KEY_ORDERING_SHIFT = 0, - } reiser4_key_field_shift; - -+/* initialise a key, this is a compile time constant initialiser expressed as -+ * three or four (as appropriate) 8 byte initialisers, there are braces around -+ * each 8 byte quantity but not around the whole initializer. -+ */ -+#define KEY_INIT(type,loc,order,band,oid,off)\ -+{{ (0xf&(type))+(0xf0&((loc) << 4)), 0xff&((loc) >> 4), 0xff&((loc) >> 12), 0xff&((loc) >> 20),\ -+ 0xff&((loc) >> 28), 0xff&((loc) >> 36), 0xff&((loc) >> 44), 0xff&((loc) >> 52) }},\ -+ON_LARGE_KEY({{ 0xff&(order), 0xff&((order)>>8), 0xff&((order)>>16), 0xff&((order)>>24),\ -+ 0xff&((order)>>32), 0xff&((order)>>40), 0xff&((order)>>48), 0xff&((order)>>56) }},)\ -+{{ 0xff&(oid), 0xff&((oid)>>8), 0xff&((oid)>>16), 0xff&((oid)>>24),\ -+ 0xff&((oid)>>32), 0xff&((oid)>>40), 0xff&((oid)>>48), (0xf&((oid)>>56))+(0xf0&((band)<<4))}},\ -+{{ 0xff&(off), 0xff&((off)>>8), 0xff&((off)>>16), 0xff&((off)>>24),\ -+ 0xff&((off)>>32), 0xff&((off)>>40), 0xff&((off)>>48), 0xff&((off)>>56) }} -+ - static inline __u64 - get_key_el(const reiser4_key * key, reiser4_key_field_index off) - { ---- linux-2.6.11/.pc/reiser4/fs/reiser4/status_flags.h 2005-03-27 21:24:00.682243368 -0800 -+++ linux-2.6.11/fs/reiser4/status_flags.h 2005-03-27 21:24:02.758927664 -0800 -@@ -33,7 +33,7 @@ - last sector where io error happened if status is "io error encountered" */ - d64 stacktrace[10]; /* Last ten functional calls made (addresses)*/ - char texterror[REISER4_TEXTERROR_LEN]; /* Any error message if appropriate, otherwise filled with zeroes */ --}; -+} PACKED64; - - int reiser4_status_init(reiser4_block_nr block); - int reiser4_status_query(u64 *status, u64 *extended); ---- linux-2.6.11/.pc/reiser4/fs/reiser4/wander.h 2005-03-27 21:24:00.709239264 -0800 -+++ linux-2.6.11/fs/reiser4/wander.h 2005-03-27 22:14:59.663207576 -0800 -@@ -19,7 +19,7 @@ - struct journal_header { - /* last written transaction head location */ - d64 last_committed_tx; --}; -+} PACKED64; - - typedef struct journal_location { - reiser4_block_nr footer; -@@ -46,7 +46,7 @@ - super block */ - d64 nr_files; - d64 next_oid; --}; -+} PACKED64; - - /* Each wander record (except the first one) has unified format with wander - record header followed by an array of log entries */ -@@ -66,7 +66,7 @@ - - /* number of previous block in commit */ - d64 next_block; --}; -+} PACKED64; - - /* The first wander record (transaction head) of written transaction has the - special format */ -@@ -98,7 +98,7 @@ - separately from super block */ - d64 nr_files; - d64 next_oid; --}; -+} PACKED64; - - /* A transaction gets written to disk as a set of wander records (each wander - record size is fs block) */ -@@ -108,7 +108,7 @@ - struct wander_entry { - d64 original; /* block original location */ - d64 wandered; /* block wandered location */ --}; -+} PACKED64; - - /* REISER4 JOURNAL WRITER FUNCTIONS */ - diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/x1205-rtc.c-mm.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/x1205-rtc.c-mm.patch deleted file mode 100644 index 6ef6befd73..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.11-mm/x1205-rtc.c-mm.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- original/drivers/i2c/chips/x1205-rtc.c Sat Mar 5 23:41:12 2005 -+++ linux-2.6.11/drivers/i2c/chips/x1205-rtc.c Sat Mar 5 23:41:25 2005 -@@ -139,7 +139,6 @@ - }; - - static struct i2c_client x1205_i2c_client = { -- .id = I2C_DRIVERID_X1205, - .flags = 0, - .addr = X1205_I2C_BUS_ADDR, // chip address - NOTE: 7bit - .adapter = NULL, // the adapter we sit on assigned in attach -@@ -301,7 +300,6 @@ - int errno; - - x1205_i2c_client.adapter = adapter; -- x1205_i2c_client.id++; - - if ((x1205_get_datetime(&x1205_i2c_client, &tm, X1205_CCR_BASE)) != NOERR) //test for functional driver - return -EIO; diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/defconfig b/packages/obsolete/nslu2/nslu2-kernel/2.6.12/defconfig deleted file mode 100644 index 9397245b99..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/defconfig +++ /dev/null @@ -1,1226 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.12 -# Sat Jun 18 17:17:09 2005 -# -CONFIG_ARM=y -CONFIG_MMU=y -CONFIG_UID16=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_IOMAP=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_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_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_CC_OPTIMIZE_FOR_SIZE=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 - -# -# 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_IMX is not set -# CONFIG_ARCH_H720X is not set -CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y - -# -# Intel IXP4xx Implementation Options -# - -# -# IXP4xx Platforms -# -# 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_NSLU2=y -# CONFIG_ARCH_PRPMC1100 is not set -# 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_ARM_THUMB_INTERWORK is not set -# CONFIG_ARCH_XSCALE is not set -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 is not set -# CONFIG_PCI_NAMES is not set - -# -# PCCARD (PCMCIA/CardBus) support -# -# CONFIG_PCCARD is not set - -# -# Kernel Features -# -# CONFIG_SMP is not set -# CONFIG_PREEMPT is not set -# CONFIG_DISCONTIGMEM is not set -CONFIG_ALIGNMENT_TRAP=y - -# -# Boot options -# -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc 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_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 - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER 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=y -# 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 - -# -# 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 is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_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_EDB7312 is not set -# CONFIG_MTD_PCI 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 - -# -# 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_INITRAMFS_SOURCE="" -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -CONFIG_IOSCHED_DEADLINE=y -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_ATA_OVER_ETH is not set - -# -# ATA/ATAPI/MFM/RLL support -# -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_SCSI=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CHR_DEV_OSST is not set -# CONFIG_BLK_DEV_SR is not set -# CONFIG_CHR_DEV_SG is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -# CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set - -# -# SCSI Transport Attributes -# -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set - -# -# SCSI low-level drivers -# -# 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_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=y -# 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_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 is not set - -# -# Fusion MPT device support -# -# CONFIG_FUSION is not set - -# -# IEEE 1394 (FireWire) support -# -# CONFIG_IEEE1394 is not set - -# -# I2O device support -# -# CONFIG_I2O is not set - -# -# Networking support -# -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=m -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -# CONFIG_NET_KEY is not set -CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_ADVANCED_ROUTER is not set -# 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_IP_TCPDIAG=m -# CONFIG_IP_TCPDIAG_IPV6 is not set -# CONFIG_IPV6 is not set -# CONFIG_NETFILTER is not set -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_SCTP is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -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 is not set - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_RX is not set -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y -# 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 is not set -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIVHCI is not set -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 - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_SMC91X 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_SK98LIN is not set -# CONFIG_VIA_VELOCITY is not set -# CONFIG_TIGON3 is not set -# CONFIG_BNX2 is not set - -# -# Ethernet (10000 Mbit) -# -# 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_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_NET_WIRELESS=y - -# -# Wan interfaces -# -# CONFIG_WAN is not set -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set -# CONFIG_NET_FC is not set -# CONFIG_SHAPER is not set -CONFIG_NETCONSOLE=m - -# -# ISDN subsystem -# -# CONFIG_ISDN is not set - -# -# Input device support -# -# CONFIG_INPUT 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=m -# 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 - -# -# 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_ISA 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 - -# -# Hardware Sensors Chip support -# -CONFIG_I2C_SENSOR=y -# 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_ASB100 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_SMSC47B397 is not set -# CONFIG_SENSORS_SIS5595 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_VIA686A is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set - -# -# Other I2C Chip support -# -# CONFIG_SENSORS_DS1337 is not set -CONFIG_SENSORS_EEPROM=y -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_RTC8564 is not set -CONFIG_SENSORS_X1205=y -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# Misc devices -# - -# -# Multimedia devices -# -# CONFIG_VIDEO_DEV is not set - -# -# Digital Video Broadcasting Devices -# -# CONFIG_DVB is not set - -# -# Graphics support -# -# CONFIG_FB is not set - -# -# Sound -# -# CONFIG_SOUND 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 is not set -# CONFIG_USB_EHCI_ROOT_HUB_TT 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 is not set -# CONFIG_USB_SL811_HCD is not set - -# -# USB Device Class drivers -# - -# -# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem -# -# CONFIG_USB_ACM is not set -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_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 - -# -# USB Input Devices -# -# CONFIG_USB_HID is not set - -# -# USB HID Boot Protocol drivers -# - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - -# -# USB Multimedia devices -# -# CONFIG_USB_DABUSB is not set - -# -# Video4Linux support is needed for USB Multimedia device support -# - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m - -# -# USB Host-to-Host Cables -# -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_GENESYS=y -CONFIG_USB_NET1080=y -CONFIG_USB_PL2301=y -CONFIG_USB_KC2190=y - -# -# Intelligent USB Devices/Gadgets -# -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_ZAURUS=y -CONFIG_USB_CDCETHER=y - -# -# USB Network Adapters -# -CONFIG_USB_AX8817X=y -# 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_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_TEST is not set - -# -# USB ATM/DSL drivers -# - -# -# USB Gadget Support -# -# CONFIG_USB_GADGET is not set - -# -# MMC/SD Card support -# -# CONFIG_MMC 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_EXT3_FS=m -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=m -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 - -# -# XFS support -# -# CONFIG_XFS_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_QUOTA is not set -CONFIG_DNOTIFY=y -# CONFIG_AUTOFS_FS is not set -CONFIG_AUTOFS4_FS=m - -# -# 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_DEVFS_FS is not set -# CONFIG_DEVPTS_FS_XATTR is not set -CONFIG_TMPFS=y -# CONFIG_TMPFS_XATTR is not set -# CONFIG_HUGETLB_PAGE is not set -CONFIG_RAMFS=y - -# -# 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_NAND is not set -# CONFIG_JFFS2_FS_NOR_ECC 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_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_V4=y -CONFIG_NFS_DIRECTIO=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -CONFIG_NFSD_V4=y -CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -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 - -# -# 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=m -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_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/disk_led_blinking.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.12/disk_led_blinking.patch deleted file mode 100644 index 7487cf3ee8..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/disk_led_blinking.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- linux-2.6.12.2/drivers/usb/core/hub.c.bak 2005-09-19 20:29:14.000000000 +0000 -+++ linux-2.6.12.2/drivers/usb/core/hub.c 2005-09-19 20:30:44.000000000 +0000 -@@ -1026,6 +1026,19 @@ - - dev_info (&udev->dev, "USB disconnect, address %d\n", udev->devnum); - -+ // --- Forward-Ported Linksys Disk 1 & Disk 2 LED Control (Port done 16.Sept.05 by Philipp Kirchhofer) --- -+ // Copy & paste from nslu2-io.c -+ #define DISK1_OFF 0x00000008 //0b0000 0000 0000 1000 -+ #define DISK2_OFF 0x00000004 //0b0000 0000 0000 0100 -+ // Copy & Paste end -+ -+ if (*udev->devpath == 0x31) { -+ *IXP4XX_GPIO_GPOUTR |= DISK1_OFF; -+ } else if (*udev->devpath == 0x32) { -+ *IXP4XX_GPIO_GPOUTR |= DISK2_OFF; -+ } -+ // --- End LED Control --- -+ - /* Free up all the children before we remove this device */ - for (i = 0; i < USB_MAXCHILDREN; i++) { - if (udev->children[i]) -@@ -2175,6 +2188,19 @@ - udev->bus->controller->driver->name, - udev->devnum); - -+ // --- Start LED Control --- -+ // Copy & paste from nslu2-io.c -+ #define DISK1_ON 0xfffffff7 //0b1111 1111 1111 0111 -+ #define DISK2_ON 0xfffffffb //0b1111 1111 1111 1011 -+ // Copy & Paste end -+ -+ if (*udev->devpath == 0x31) { -+ *IXP4XX_GPIO_GPOUTR &= DISK1_ON; -+ } else if (*udev->devpath == 0x32) { -+ *IXP4XX_GPIO_GPOUTR &= DISK2_ON; -+ } -+ // --- End LED Control --- -+ - /* Set up TT records, if needed */ - if (hdev->tt) { - udev->tt = hdev->tt; ---- linux-2.6.12.2/drivers/usb/storage/transport.c.bak 2005-09-19 20:29:25.000000000 +0000 -+++ linux-2.6.12.2/drivers/usb/storage/transport.c 2005-09-19 20:29:55.000000000 +0000 -@@ -60,6 +60,60 @@ - #include "scsiglue.h" - #include "debug.h" - -+// --- Forward-Ported Linksys Disk 1 & Disk 2 LED Activity Blinking Part 1 (Port done 16.Sept.05 by Philipp Kirchhofer) --- -+// Copy & Paste from nslu2-io.c -+#define DISK1_ON 0xfffffff7 //0b1111 1111 1111 0111 -+#define DISK2_ON 0xfffffffb //0b1111 1111 1111 1011 -+ -+#define DISK1_OFF 0x00000008 //0b0000 0000 0000 1000 -+#define DISK2_OFF 0x00000004 //0b0000 0000 0000 0100 -+// Copy & Paste End -+ -+#define JIFFIES_BLINKING_TIME 6 -+#define ON_LED_INTERVAL 3 -+unsigned long turn_on_time; -+ -+static struct timer_list usb1_led_timer; /* ide led switch */ -+static struct timer_list usb2_led_timer; /* ide led switch */ -+ -+// Turns on Disk 1 LED -+static void turn_on_led_usb1(unsigned long ptr) { -+ *IXP4XX_GPIO_GPOUTR &= DISK1_ON; // 0xfff7 -+ return; -+} -+ -+// Turns on Disk 2 LED -+static void turn_on_led_usb2(unsigned long ptr) { -+ *IXP4XX_GPIO_GPOUTR &= DISK2_ON; // 0xfffb -+ return; -+} -+ -+// Turns on Disk 1 LED after ON_LED_INTERVAL jiffies -+static void usb_1_led_timer(void) { -+ usb1_led_timer.expires = jiffies + ON_LED_INTERVAL; -+ add_timer(&usb1_led_timer); -+ return; -+} -+ -+// Turns on Disk 2 LED after ON_LED_INTERVAL jiffies -+static void usb_2_led_timer(void) { -+ usb2_led_timer.expires = jiffies + ON_LED_INTERVAL; -+ add_timer(&usb2_led_timer); -+ return; -+} -+ -+// Initializes Timers -+unsigned long initialized_timers = 0; -+static void initializeTimers() { -+ if (initialized_timers != 1) { -+ init_timer(&usb1_led_timer); -+ usb1_led_timer.function = turn_on_led_usb1; -+ init_timer(&usb2_led_timer); -+ usb2_led_timer.function = turn_on_led_usb2; -+ initialized_timers = 1; -+ } -+} -+// --- End Disk LED Activity Blinking Part 1 --- - - /*********************************************************************** - * Data transfer routines -@@ -499,6 +553,21 @@ - - /* are we scatter-gathering? */ - if (use_sg) { -+ // --- Disk LED Activity Blinking Part 2 --- -+ initializeTimers(); -+ if ((jiffies - turn_on_time) >= JIFFIES_BLINKING_TIME) { -+ if (*us->pusb_dev->devpath == 0x31) { -+ del_timer_sync(&usb1_led_timer); -+ *IXP4XX_GPIO_GPOUTR |= DISK1_OFF; -+ usb_1_led_timer(); -+ } else if (*us->pusb_dev->devpath == 0x32) { -+ del_timer_sync(&usb2_led_timer); -+ *IXP4XX_GPIO_GPOUTR |= DISK2_OFF; -+ usb_2_led_timer(); -+ } -+ turn_on_time = jiffies; -+ } -+ // --- End Disk LED Activity Blinking Part 2 --- - /* use the usb core scatter-gather primitives */ - result = usb_stor_bulk_transfer_sglist(us, pipe, - (struct scatterlist *) buf, use_sg, diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/missing-exports.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.12/missing-exports.patch deleted file mode 100644 index 935dd29115..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/missing-exports.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- linux-2.6.12/drivers/char/random.c~ 2005-05-14 16:42:24.000000000 -0400 -+++ linux-2.6.12/drivers/char/random.c 2005-05-14 16:42:46.000000000 -0400 -@@ -646,6 +646,7 @@ extern void add_input_randomness(unsigne - add_timer_randomness(&input_timer_state, - (type << 4) ^ code ^ (code >> 4) ^ value); - } -+EXPORT_SYMBOL_GPL(add_input_randomness); - - void add_interrupt_randomness(int irq) - { ---- linux-2.6.12/lib/kobject_uevent.c~ 2005-05-14 16:45:13.000000000 -0400 -+++ linux-2.6.12/lib/kobject_uevent.c 2005-05-14 16:45:27.000000000 -0400 -@@ -178,6 +178,7 @@ static inline int send_uevent(const char - - #ifdef CONFIG_HOTPLUG - char hotplug_path[HOTPLUG_PATH_LEN] = "/sbin/hotplug"; -+EXPORT_SYMBOL_GPL(hotplug_path); - u64 hotplug_seqnum; - static DEFINE_SPINLOCK(sequence_lock); diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/nslu2-arch.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.12/nslu2-arch.patch deleted file mode 100644 index 6a41f02355..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/nslu2-arch.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- linux-2.6.11/arch/arm/boot/compressed/head.S 2005-06-17 17:51:27.245788998 -0700 -+++ linux-2.6.11/arch/arm/boot/compressed/head.S 2005-06-17 17:54:45.041806429 -0700 -@@ -37,6 +37,7 @@ - defined(CONFIG_ARCH_INTEGRATOR) || \ - defined(CONFIG_ARCH_PXA) || \ - defined(CONFIG_ARCH_IXP4XX) || \ -+ defined(CONFIG_ARCH_NSLU2) || \ - defined(CONFIG_ARCH_IXP2000) || \ - defined(CONFIG_ARCH_LH7A40X) || \ - defined(CONFIG_ARCH_OMAP) ---- linux-2.6.11/.pc/2.6.patch/arch/arm/boot/compressed/head-xscale.S 2005-03-01 23:37:52.000000000 -0800 -+++ linux-2.6.11/arch/arm/boot/compressed/head-xscale.S 2005-06-17 17:51:32.546985425 -0700 -@@ -47,3 +47,8 @@ - orr r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00) - #endif - -+#ifdef CONFIG_ARCH_NSLU2 -+ mov r7, #(MACH_TYPE_NSLU2 & 0xff) -+ orr r7, r7, #(MACH_TYPE_NSLU2 & 0xff00) -+#endif -+ ---- linux-2.6.11/.pc/2.6.patch/arch/arm/mach-ixp4xx/Kconfig 2005-06-17 17:51:27.365770810 -0700 -+++ linux-2.6.11/arch/arm/mach-ixp4xx/Kconfig 2005-06-17 17:51:32.560983303 -0700 -@@ -43,6 +43,12 @@ - IXDP465 Development Platform (Also known as BMP). - For more information on this platform, see <file:Documentation/arm/IXP4xx>. - -+config ARCH_NSLU2 -+ bool "NSLU2" -+ help -+ Say 'Y' here if you want your kernel to support Linksys's -+ NSLU2 NAS device. For more information on this platform, -+ see http://www.nslu2-linux.org - - # - # IXCDP1100 is the exact same HW as IXDP425, but with a different machine ---- linux-2.6.11/.pc/2.6.patch/arch/arm/mach-ixp4xx/Makefile 2005-06-17 17:51:27.365770810 -0700 -+++ linux-2.6.11/arch/arm/mach-ixp4xx/Makefile 2005-06-17 17:51:32.560983303 -0700 -@@ -8,4 +8,4 @@ - obj-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o coyote-setup.o - obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o coyote-setup.o - obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o -- -+obj-$(CONFIG_ARCH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-part.o nslu2-io.o ---- linux-2.6.11/.pc/2.6.patch/arch/arm/tools/mach-types 2005-06-17 17:51:27.423762020 -0700 -+++ linux-2.6.11/arch/arm/tools/mach-types 2005-06-17 17:51:32.564982697 -0700 -@@ -604,7 +604,7 @@ - roverp7 MACH_ROVERP7 ROVERP7 594 - pr818s MACH_PR818S PR818S 595 - trxpro MACH_TRXPRO TRXPRO 596 --nslu2 MACH_NSLU2 NSLU2 597 -+nslu2 ARCH_NSLU2 NSLU2 597 - e400 MACH_E400 E400 598 - trab MACH_TRAB TRAB 599 - cmc_pu2 MACH_CMC_PU2 CMC_PU2 600 ---- linux-2.6.11/.pc/2.6.patch/drivers/mtd/maps/ixp4xx.c 2005-03-01 23:37:30.000000000 -0800 -+++ linux-2.6.11/drivers/mtd/maps/ixp4xx.c 2005-06-17 17:51:32.566982394 -0700 -@@ -94,7 +94,11 @@ - struct resource *res; - }; - -+#ifdef CONFIG_ARCH_NSLU2 -+static const char *probes[] = { "cmdlinepart", "RedBoot", "NSLU2", NULL }; -+#else - static const char *probes[] = { "RedBoot", "cmdlinepart", NULL }; -+#endif - - static int ixp4xx_flash_remove(struct device *_dev) - { ---- linux-2.6.11/.pc/2.6.patch/include/asm-arm/arch-ixp4xx/hardware.h 2005-03-01 23:37:51.000000000 -0800 -+++ linux-2.6.11/include/asm-arm/arch-ixp4xx/hardware.h 2005-06-17 17:51:32.567982242 -0700 -@@ -44,5 +44,6 @@ - #include "ixdp425.h" - #include "coyote.h" - #include "prpmc1100.h" -+#include "nslu2.h" - - #endif /* _ASM_ARCH_HARDWARE_H */ ---- linux-2.6.11/.pc/2.6.patch/include/asm-arm/arch-ixp4xx/irqs.h 2005-03-01 23:38:12.000000000 -0800 -+++ linux-2.6.11/include/asm-arm/arch-ixp4xx/irqs.h 2005-06-17 17:51:32.568982091 -0700 -@@ -93,4 +93,11 @@ - #define IRQ_COYOTE_PCI_SLOT1 IRQ_IXP4XX_GPIO11 - #define IRQ_COYOTE_IDE IRQ_IXP4XX_GPIO5 - -+/* -+ * NSLU2 board IRQs -+ */ -+#define IRQ_NSLU2_PCI_INTA IRQ_IXP4XX_GPIO11 -+#define IRQ_NSLU2_PCI_INTB IRQ_IXP4XX_GPIO10 -+#define IRQ_NSLU2_PCI_INTC IRQ_IXP4XX_GPIO9 -+ - #endif diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/nslu2-setup.c b/packages/obsolete/nslu2/nslu2-kernel/2.6.12/nslu2-setup.c deleted file mode 100644 index fcb8566784..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/nslu2-setup.c +++ /dev/null @@ -1,146 +0,0 @@ -/* - * arch/arm/mach-ixp4xx/nslu2-setup.c - * - * NSLU2 board-setup - * - * based ixdp425-setup.c: - * Copyright (C) 2003-2004 MontaVista Software, Inc. - * - * Author: Mark Rakes <mrakes at mac.com> - * Maintainers: http://www.nslu2-linux.org/ - * - * Fixed missing init_time in MACHINE_START kas11 10/22/04 - * Changed to conform to new style __init ixdp425 kas11 10/22/04 - */ - -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/device.h> -#include <linux/serial.h> -#include <linux/tty.h> -#include <linux/serial_8250.h> - -#include <asm/types.h> -#include <asm/setup.h> -#include <asm/memory.h> -#include <asm/hardware.h> -#include <asm/mach-types.h> -#include <asm/irq.h> -#include <asm/mach/arch.h> -#include <asm/mach/flash.h> - -void __init nslu2_map_io(void) -{ - ixp4xx_map_io(); -} - -static struct flash_platform_data nslu2_flash_data = { - .map_name = "cfi_probe", - .width = 2, -}; - -static struct resource nslu2_flash_resource = { - .start = NSLU2_FLASH_BASE, - .end = NSLU2_FLASH_BASE + NSLU2_FLASH_SIZE, - .flags = IORESOURCE_MEM, -}; - -static struct platform_device nslu2_flash = { - .name = "IXP4XX-Flash", - .id = 0, - .dev = { - .platform_data = &nslu2_flash_data, - }, - .num_resources = 1, - .resource = &nslu2_flash_resource, -}; - -static struct ixp4xx_i2c_pins nslu2_i2c_gpio_pins = { - .sda_pin = NSLU2_SDA_PIN, - .scl_pin = NSLU2_SCL_PIN, -}; - -static struct platform_device nslu2_i2c_controller = { - .name = "IXP4XX-I2C", - .id = 0, - .dev = { - .platform_data = &nslu2_i2c_gpio_pins, - }, - .num_resources = 0 -}; - -static struct resource nslu2_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 nslu2_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 nslu2_uart = { - .name = "serial8250", - .id = 0, - .dev.platform_data = nslu2_uart_data, - .num_resources = 2, - .resource = nslu2_uart_resources -}; - -static struct platform_device *nslu2_devices[] __initdata = { - &nslu2_i2c_controller, - &nslu2_flash, - &nslu2_uart -}; - -static void n2_power_off(void) -{ - /* This causes the box to drop the power and go dead. */ -#define GPIO_PO_BM 0x0100 //b0000 0001 0000 0000 - *IXP4XX_GPIO_GPOER &= ~GPIO_PO_BM; // enable the pwr cntl gpio - *IXP4XX_GPIO_GPOUTR |= GPIO_PO_BM; // do the deed -} - -static void __init nslu2_init(void) -{ - ixp4xx_sys_init(); - - pm_power_off = n2_power_off; - platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); -} - -MACHINE_START(NSLU2, "Linksys NSLU2") - BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, - IXP4XX_PERIPHERAL_BASE_VIRT) - MAPIO(nslu2_map_io) - INITIRQ(ixp4xx_init_irq) //FIXME: all irq are off here - .timer = &ixp4xx_timer, - // INITTIME(ixp4xx_init_time) //this was missing in 2.6.7 code ...soft reboot needed? - BOOT_PARAMS(0x0100) - INIT_MACHINE(nslu2_init) -MACHINE_END - diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/x1205-rtc.c-id.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.12/x1205-rtc.c-id.patch deleted file mode 100644 index 6ef6befd73..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.12/x1205-rtc.c-id.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- original/drivers/i2c/chips/x1205-rtc.c Sat Mar 5 23:41:12 2005 -+++ linux-2.6.11/drivers/i2c/chips/x1205-rtc.c Sat Mar 5 23:41:25 2005 -@@ -139,7 +139,6 @@ - }; - - static struct i2c_client x1205_i2c_client = { -- .id = I2C_DRIVERID_X1205, - .flags = 0, - .addr = X1205_I2C_BUS_ADDR, // chip address - NOTE: 7bit - .adapter = NULL, // the adapter we sit on assigned in attach -@@ -301,7 +300,6 @@ - int errno; - - x1205_i2c_client.adapter = adapter; -- x1205_i2c_client.id++; - - if ((x1205_get_datetime(&x1205_i2c_client, &tm, X1205_CCR_BASE)) != NOERR) //test for functional driver - return -EIO; diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/00-memory-h-page-shift.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/00-memory-h-page-shift.patch deleted file mode 100644 index 999b69e851..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/00-memory-h-page-shift.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linux-2.6.14/include/asm-arm/arch-ixp4xx/memory.h.orig 2005-11-07 23:16:48.456117450 -0800 -+++ linux-2.6.14/include/asm-arm/arch-ixp4xx/memory.h 2005-11-07 23:16:58.160728123 -0800 -@@ -8,6 +8,7 @@ - #define __ASM_ARCH_MEMORY_H - - #include <asm/sizes.h> -+#include <asm/page.h> - - /* - * Physical DRAM offset. diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/30-i2c-x1205-mm1.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/30-i2c-x1205-mm1.patch deleted file mode 100644 index 67cbd4cdf4..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/30-i2c-x1205-mm1.patch +++ /dev/null @@ -1,1036 +0,0 @@ ---- linux-2.6.14/drivers/i2c/chips/Kconfig.orig 2005-11-07 22:30:30.413306237 -0800 -+++ linux-2.6.14/drivers/i2c/chips/Kconfig 2005-11-07 22:41:15.785916976 -0800 -@@ -126,13 +126,13 @@ config SENSORS_MAX6875 - This driver can also be built as a module. If so, the module - will be called max6875. - --config RTC_X1205_I2C -- tristate "Xicor X1205 RTC chip" -- depends on I2C && EXPERIMENTAL -- help -- If you say yes here you get support for the Xicor X1205 RTC chip. -+config SENSORS_X1205 -+ tristate "Xicor X1205 RTC chip" -+ depends on I2C -+ help -+ If you say yes here you get support for the Xicor X1205 RTC chip. - -- This driver can also be built as a module. If so, the module -- will be called x1205. -+ This driver can also be built as a module. If so, the module -+ will be called x1205 - - endmenu ---- linux-2.6.14/drivers/i2c/chips/Makefile.orig 2005-11-07 22:30:30.417306489 -0800 -+++ linux-2.6.14/drivers/i2c/chips/Makefile 2005-11-07 22:41:59.616675071 -0800 -@@ -13,7 +13,7 @@ obj-$(CONFIG_SENSORS_PCF8591) += pcf8591 - obj-$(CONFIG_SENSORS_RTC8564) += rtc8564.o - obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o - obj-$(CONFIG_TPS65010) += tps65010.o --obj-$(CONFIG_RTC_X1205_I2C) += x1205.o -+obj-$(CONFIG_SENSORS_X1205) += x1205.o - - ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) - EXTRA_CFLAGS += -DDEBUG ---- linux-2.6.14/drivers/i2c/chips/x1205.c.orig 2005-11-07 22:30:30.421306741 -0800 -+++ linux-2.6.14/drivers/i2c/chips/x1205.c 2005-11-07 22:42:54.960157617 -0800 -@@ -1,14 +1,16 @@ - /* -- * x1205.c - An i2c driver for the Xicor X1205 RTC -+ * linux/drivers/i2c/chips/x1205.c -+ * -+ * x1205.c - An 12c driver for the Xicor 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 the other drivers in this same directory. -- * -+ * - * 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 -@@ -26,83 +28,36 @@ - - #include <linux/x1205.h> - --#define DRV_VERSION "0.9.9" -+#define EPOCH_1900 1900 -+#define EPOCH_1970 1970 -+ -+#define DRIVER_VERSION "0.9.6" -+#define DRIVER_NAME (x1205_driver.name) - --/* 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 }; -+/* Addresses to scan */ -+static unsigned short normal_i2c[] = { X1205_I2C_BUS_ADDR, 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 int x1205_command(struct i2c_client *client, unsigned int cmd, -- void *arg); -+static int x1205_validate_client(struct i2c_client *client); -+ -+static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm, -+ u8 reg_base); -+static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm, -+ int datetoo, u8 reg_base); -+static int x1205_validate_tm(struct rtc_time *tm); -+static int x1205_command(struct i2c_client *client, unsigned int cmd, void *arg); -+static int x1205_hctosys(struct i2c_client *client); -+ - - static struct i2c_driver x1205_driver = { - .owner = THIS_MODULE, -@@ -110,6 +65,7 @@ static struct i2c_driver x1205_driver = - .flags = I2C_DF_NOTIFY, - .attach_adapter = &x1205_attach, - .detach_client = &x1205_detach, -+/* .command = &x1205_command,*/ - }; - - struct x1205_data { -@@ -118,8 +74,9 @@ struct x1205_data { - unsigned int epoch; - }; - --static const unsigned char days_in_mo[] = -- { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; -+ -+static const unsigned char days_in_mo[] = -+{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; - - static LIST_HEAD(x1205_clients); - -@@ -127,6 +84,7 @@ static LIST_HEAD(x1205_clients); - * commands to a specific client. This function will send the command - * to the first client. - */ -+ - int x1205_do_command(unsigned int cmd, void *arg) - { - struct list_head *walk; -@@ -141,114 +99,98 @@ int x1205_do_command(unsigned int cmd, v - 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 x1205_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 x1205 hardware, we use -+ * 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. -+ * Epoch is inited as 2000. Time is set to UT - */ -+ - static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm, - u8 reg_base) - { -- unsigned char dt_addr[2] = { 0, reg_base }; -- static unsigned char sr_addr[2] = { 0, X1205_REG_SR }; -+ static unsigned char dt_addr[] = { 0, }; -+ static unsigned char sr_addr[] = { 0, }; - -- unsigned char buf[8], sr; -+ unsigned char buf[8], sr; - - struct i2c_msg msgs[] = { -- { client->addr, 0, 2, sr_addr }, /* setup read ptr */ -- { client->addr, I2C_M_RD, 1, &sr }, /* read status */ -- { client->addr, 0, 2, dt_addr }, /* setup read ptr */ -- { client->addr, I2C_M_RD, 8, buf }, /* read date */ -+ { client->addr, 0, 2, sr_addr }, /* random read */ -+ { client->addr, I2C_M_RD, 1, &sr }, -+ { client->addr, 0, 2, dt_addr }, /* random read */ -+ { client->addr, I2C_M_RD, 8, buf }, - }; - -- struct x1205_data *data = i2c_get_clientdata(client); -+ struct x1205_data *xdata = i2c_get_clientdata(client); - -- /* read status register */ -- if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { -- dev_err(&client->dev, "%s: read error\n", __FUNCTION__); -- return -EIO; -- } -+ dt_addr[1] = reg_base; -+ sr_addr[1] = X1205_REG_SR; - -- /* check for battery failure */ -- if (sr & X1205_SR_RTCF) { -- dev_warn(&client->dev, -- "Clock had a power failure, you must set the date.\n"); -- return -EINVAL; -- } -+ if ((i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs))) == -+ ARRAY_SIZE(msgs)) { -+ /* did we read the correct number of messages? */ -+ -+ /* check for battery failure */ -+ if (sr & X1205_SR_RTCF) -+ { -+ dev_info(&client->adapter->dev, -+ "%s: Clock had a power failure, you must set the date.\n", -+ DRIVER_NAME); - -- /* read date registers */ -- if ((i2c_transfer(client->adapter, &msgs[2], 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]); -- data->epoch = BCD2BIN(buf[CCR_Y2K]) * 100; -- tm->tm_year = BCD2BIN(buf[CCR_YEAR]) + data->epoch - 1900; -- tm->tm_wday = buf[CCR_WDAY]; -+ return -EINVAL; -+ } - -- 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); -+ 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]); -+ buf[CCR_HOUR] &= ~X1205_HR_MIL; -+ tm->tm_hour = BCD2BIN(buf[CCR_HOUR]); /* hr is 0-23 */ -+ tm->tm_mday = BCD2BIN(buf[CCR_MDAY]); -+ tm->tm_mon = BCD2BIN(buf[CCR_MONTH]); -+ xdata->epoch = BCD2BIN(buf[CCR_Y2K]) * 100; -+ tm->tm_year = BCD2BIN(buf[CCR_YEAR]) + xdata->epoch - EPOCH_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); - -+ } else { -+ dev_dbg(&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, err, xfer; - -- unsigned char buf[8]; -+ static unsigned char wel[3] = { 0, X1205_REG_SR, -+ X1205_SR_WEL }; - -- 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 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 }; -+ static unsigned char diswe[3] = { 0, X1205_REG_SR, 0 }; - -- struct x1205_data *data = i2c_get_clientdata(client); -+ static unsigned char data[3] = { 0, }; -+ static unsigned char buf[8]; -+ -+ struct x1205_data *xdata = i2c_get_clientdata(client); - -- /* check if all values in the tm struct are correct */ - if ((err = x1205_validate_tm(tm)) < 0) - return err; - -@@ -258,124 +200,52 @@ static int x1205_set_datetime(struct i2c - tm->tm_sec, tm->tm_min, tm->tm_hour, - tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); - -- buf[CCR_SEC] = BIN2BCD(tm->tm_sec); -- buf[CCR_MIN] = BIN2BCD(tm->tm_min); - -- /* set hour and 24hr bit */ -+ buf[CCR_SEC] = BIN2BCD(tm->tm_sec); -+ buf[CCR_MIN] = BIN2BCD(tm->tm_min); -+ -+ /* Set 24HR format */ - buf[CCR_HOUR] = BIN2BCD(tm->tm_hour) | X1205_HR_MIL; - -- /* should we also set the date? */ -- if (datetoo) { -- buf[CCR_MDAY] = BIN2BCD(tm->tm_mday); -+ if (datetoo == X1205_DATETOO) { -+ buf[CCR_MDAY] = BIN2BCD(tm->tm_mday); - - /* month, 0 - 11 */ -- buf[CCR_MONTH] = BIN2BCD(tm->tm_mon); -+ buf[CCR_MONTH] = BIN2BCD(tm->tm_mon); /* input is 0-11 */ - - /* year, since 1900 */ -- buf[CCR_YEAR] = BIN2BCD(tm->tm_year + 1900 - data->epoch); -- buf[CCR_WDAY] = tm->tm_wday & 0x07; -- buf[CCR_Y2K] = BIN2BCD(data->epoch / 100); -+ buf[CCR_YEAR] = BIN2BCD((tm->tm_year + EPOCH_1900 - xdata->epoch)); -+ buf[CCR_WDAY] = tm->tm_wday & 7; -+ buf[CCR_Y2K] = BIN2BCD(xdata->epoch / 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); -+ dev_dbg(&client->dev, "%s: wen - %x\n", __FUNCTION__, xfer); -+ if (xfer != 3) - return -EIO; -- } - - xfer = i2c_master_send(client, rwel, 3); -- if (xfer != 3) { -- dev_err(&client->dev, "%s: rwel - %d\n", __FUNCTION__, xfer); -+ dev_dbg(&client->dev, "%s: wenb - %x\n", __FUNCTION__, xfer); -+ if (xfer != 3) - 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]); -+ for (i = 0; i < 8; i++) { -+ data[1] = i + reg_base; -+ data[2] = buf[i]; -+ xfer = i2c_master_send(client, data, 3); -+ -+ dev_dbg(&client->dev, "%s: xfer %d addr, %02x, data %02x\n", -+ __FUNCTION__, -+ xfer, data[1], data[2]); -+ -+ if (xfer != 3) - 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_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); -+ dev_dbg(&client->dev, "%s: wdis - %x\n", __FUNCTION__, xfer); -+ if (xfer != 3) -+ return -EIO; - - return 0; - } -@@ -386,24 +256,28 @@ static int x1205_hctosys(struct i2c_clie - - struct rtc_time tm; - struct timespec tv; -+ - - err = x1205_command(client, X1205_CMD_GETDATETIME, &tm); - -- if (err) { -- dev_err(&client->dev, -- "Unable to set the system clock\n"); -+ if (err) -+ { -+ dev_info(&client->adapter->dev, -+ "%s: Unable to set the system clock\n", -+ DRIVER_NAME); -+ - 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. -+ /* 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 for x1205_sync_rtc that it be -+ * defined to store the truncated value. This is because otherwise it -+ * is necessary to read both xtime.tv_sec and xtime.tv_nsec in the -+ * sync function, and atomic reads of >32bits on ARM are 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; -@@ -413,15 +287,16 @@ static int x1205_hctosys(struct i2c_clie - * the month to be in the range 1-12 - */ - -- tv.tv_sec = mktime(tm.tm_year + 1900, tm.tm_mon + 1, -+ tv.tv_sec = mktime(tm.tm_year + EPOCH_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, -+ dev_info(&client->adapter->dev, -+ "%s: Setting the system clock to %d-%d-%d %d:%d:%d\n", -+ DRIVER_NAME, -+ tm.tm_year + EPOCH_1900, tm.tm_mon + 1, - tm.tm_mday, tm.tm_hour, tm.tm_min, - tm.tm_sec); - -@@ -432,7 +307,7 @@ struct x1205_limit - { - unsigned char reg; - unsigned char mask; -- unsigned char min; -+ unsigned char min; - unsigned char max; - }; - -@@ -443,16 +318,34 @@ static int x1205_validate_client(struct - /* 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 */ -+ -+ const unsigned char probe_zero_pattern[] = { -+ - X1205_REG_SR, 0x18, -+ X1205_REG_Y2K, 0xC6, -+ X1205_REG_DW, 0xF8, -+ X1205_REG_MO, 0xE0, -+ X1205_REG_DT, 0xC0, -+ X1205_REG_HR, 0x40, -+ X1205_REG_MN, 0x80, -+ X1205_REG_SC, 0x80, - X1205_REG_DTR, 0xF8, - X1205_REG_ATR, 0xC0, - X1205_REG_INT, 0x18, - X1205_REG_0, 0xFF, -+ X1205_REG_Y2K1, 0xC6, -+ X1205_REG_DWA1, 0x78, -+ X1205_REG_MOA1, 0x60, -+ X1205_REG_DTA1, 0x40, -+ X1205_REG_HRA1, 0x40, -+ X1205_REG_Y2K0, 0xC6, -+ X1205_REG_DWA0, 0x78, -+ X1205_REG_MOA0, 0x60, -+ X1205_REG_DTA0, 0x40, -+ X1205_REG_HRA0, 0x40, - }; - -- static const struct x1205_limit probe_limits_pattern[] = { -+ const struct x1205_limit probe_limits_pattern[] = { - /* register, mask, min, max */ - { X1205_REG_Y2K, 0xFF, 19, 20 }, - { X1205_REG_DW, 0xFF, 0, 6 }, -@@ -463,23 +356,41 @@ static int x1205_validate_client(struct - { X1205_REG_MN, 0xFF, 0, 59 }, - { X1205_REG_SC, 0xFF, 0, 59 }, - { X1205_REG_Y2K1, 0xFF, 19, 20 }, -+ { X1205_REG_DWA1, 0x7F, 0, 6 }, -+ { X1205_REG_MOA1, 0x7F, 0, 12 }, -+ { X1205_REG_DTA1, 0x7F, 0, 31 }, -+ { X1205_REG_HRA1, 0x7F, 0, 23 }, -+ { X1205_REG_MNA1, 0x7F, 0, 59 }, -+ { X1205_REG_SCA1, 0x7F, 0, 59 }, - { X1205_REG_Y2K0, 0xFF, 19, 20 }, -+ { X1205_REG_DWA0, 0x7F, 0, 6 }, -+ { X1205_REG_MOA0, 0x7F, 0, 12 }, -+ { X1205_REG_DTA0, 0x7F, 0, 31 }, -+ { X1205_REG_HRA0, 0x7F, 0, 23 }, -+ { X1205_REG_MNA0, 0x7F, 0, 59 }, -+ { X1205_REG_SCA0, 0x7F, 0, 59 }, - }; - - /* check that registers have bits a 0 where expected */ -- for (i = 0; i < ARRAY_SIZE(probe_zero_pattern); i += 2) { -+ -+ for (i = 0; i < ARRAY_SIZE(probe_zero_pattern); i += 2) -+ { - unsigned char buf; - -- unsigned char addr[2] = { 0, probe_zero_pattern[i] }; -+ static unsigned char addr[2]; - - struct i2c_msg msgs[2] = { -- { client->addr, 0, 2, addr }, -+ { client->addr, 0, 2, addr }, /* random read */ - { client->addr, I2C_M_RD, 1, &buf }, - }; - -+ addr[0] = 0x00; -+ addr[1] = probe_zero_pattern[i]; -+ - xfer = i2c_transfer(client->adapter, msgs, 2); -+ - if (xfer != 2) { -- dev_err(&client->adapter->dev, -+ dev_dbg(&client->adapter->dev, - "%s: could not read register %x\n", - __FUNCTION__, addr[1]); - -@@ -487,42 +398,47 @@ static int x1205_validate_client(struct - } - - if ((buf & probe_zero_pattern[i+1]) != 0) { -- dev_err(&client->adapter->dev, -- "%s: register=%02x, zero pattern=%d, value=%x\n", -+ dev_dbg(&client->adapter->dev, -+ "%s: register %x, zero pattern %d: %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; -+ /* check limits */ - -- unsigned char addr[2] = { 0, probe_limits_pattern[i].reg }; -+ for (i = 0; i < ARRAY_SIZE(probe_limits_pattern); i++) -+ { -+ unsigned char buf, val; -+ -+ static unsigned char addr[2]; - - struct i2c_msg msgs[2] = { -- { client->addr, 0, 2, addr }, -- { client->addr, I2C_M_RD, 1, ® }, -+ { client->addr, 0, 2, addr }, /* random read */ -+ { client->addr, I2C_M_RD, 1, &buf }, - }; - -+ addr[0] = 0x00; -+ addr[1] = probe_limits_pattern[i].reg; -+ - xfer = i2c_transfer(client->adapter, msgs, 2); - - if (xfer != 2) { -- dev_err(&client->adapter->dev, -+ dev_dbg(&client->adapter->dev, - "%s: could not read register %x\n", - __FUNCTION__, addr[1]); - - return -EIO; - } - -- value = BCD2BIN(reg & probe_limits_pattern[i].mask); -+ val = BCD2BIN(buf & probe_limits_pattern[i].mask); - -- if (value > probe_limits_pattern[i].max || -- value < probe_limits_pattern[i].min) { -+ if (val > probe_limits_pattern[i].max || -+ val < probe_limits_pattern[i].min) { - dev_dbg(&client->adapter->dev, -- "%s: register=%x, lim pattern=%d, value=%d\n", -- __FUNCTION__, addr[1], i, value); -+ "%s: register %x, lim pattern %d: %d\n", -+ __FUNCTION__, addr[1], i, val); - - return -ENODEV; - } -@@ -538,79 +454,66 @@ static int x1205_attach(struct i2c_adapt - return i2c_probe(adapter, &addr_data, x1205_probe); - } - --int x1205_direct_attach(int adapter_id, -- struct i2c_client_address_data *address_data) --{ -- int err; -- struct i2c_adapter *adapter = i2c_get_adapter(adapter_id); -- -- if (adapter) { -- err = i2c_probe(adapter, -- address_data, x1205_probe); -- -- i2c_put_adapter(adapter); -- -- return err; -- } -- -- return -ENODEV; --} -- - static int x1205_probe(struct i2c_adapter *adapter, int address, int kind) - { -- struct i2c_client *client; -- struct x1205_data *data; -+ struct i2c_client *new_client; -+ struct x1205_data *xdata; - - 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 x1205_data), GFP_KERNEL))) { -+ if (!(xdata = kmalloc(sizeof(struct x1205_data), GFP_KERNEL))) { - err = -ENOMEM; - goto exit; - } - -- /* Initialize our structures */ -- data->epoch = 2000; -+ /* Fill our data structure */ - -- client = &data->client; -- client->addr = address; -- client->driver = &x1205_driver; -- client->adapter = adapter; -+ memset(xdata, 0, sizeof(struct x1205_data)); - -- strlcpy(client->name, "x1205", I2C_NAME_SIZE); -+ xdata->epoch = 2000; -+ -+ -+ /* Prepare i2c_client structure */ -+ -+ new_client = &xdata->client; -+ i2c_set_clientdata(new_client, xdata); -+ new_client->addr = address; -+ new_client->adapter = adapter; -+ new_client->driver = &x1205_driver; -+ new_client->flags = 0; -+ -+ strlcpy(new_client->name, "x1205", I2C_NAME_SIZE); - -- i2c_set_clientdata(client, data); - - /* Verify the chip is really an X1205 */ -- if (kind < 0) { -- if (x1205_validate_client(client) < 0) { -+ -+ if (kind < 0) -+ { -+ if (x1205_validate_client(new_client) < 0) { - err = -ENODEV; - goto exit_kfree; - } - } - - /* Inform the i2c layer */ -- if ((err = i2c_attach_client(client))) -+ if ((err = i2c_attach_client(new_client))) - goto exit_kfree; - -- list_add(&data->list, &x1205_clients); -+ list_add(&xdata->list, &x1205_clients); - -- dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n"); -+ dev_info(&adapter->dev, "%s: Chip found, driver " DRIVER_VERSION "\n", -+ DRIVER_NAME); - -- /* If requested, set the system time */ -+ /* If requested, se the system time */ - if (hctosys) -- x1205_hctosys(client); -+ x1205_hctosys(new_client); - - return 0; - - exit_kfree: -- kfree(data); -+ kfree(xdata); - - exit: - return err; -@@ -620,23 +523,44 @@ static int x1205_detach(struct i2c_clien - { - int err; - struct x1205_data *data = i2c_get_clientdata(client); -- -+ - dev_dbg(&client->dev, "%s\n", __FUNCTION__); - - if ((err = i2c_detach_client(client))) - return err; - - list_del(&data->list); -- - kfree(data); -+ return 0; -+} -+ -+/* make sure the rtc_time values are in bounds */ -+static int x1205_validate_tm(struct rtc_time *tm) -+{ -+ tm->tm_year += 1900; -+ -+ if (tm->tm_year < EPOCH_1970) -+ 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) && -+ ((!(tm->tm_year % 4) && (tm->tm_year % 100) ) || !(tm->tm_year % 400))))) -+ return -EINVAL; -+ -+ if ((tm->tm_year -= EPOCH_1900) > 255) -+ return -EINVAL; -+ -+ if ((tm->tm_hour >= 24) || (tm->tm_min >= 60) || (tm->tm_sec >= 60)) -+ return -EINVAL; - - return 0; - } - --static int x1205_command(struct i2c_client *client, unsigned int cmd, -- void *param) -+static int x1205_command(struct i2c_client *client, unsigned int cmd, void *tm) - { -- if (param == NULL) -+ if (client == NULL || tm == NULL) - return -EINVAL; - - if (!capable(CAP_SYS_TIME)) -@@ -646,34 +570,26 @@ static int x1205_command(struct i2c_clie - - switch (cmd) { - case X1205_CMD_GETDATETIME: -- return x1205_get_datetime(client, param, X1205_CCR_BASE); -+ return x1205_get_datetime(client, tm, X1205_CCR_BASE); - - case X1205_CMD_SETTIME: -- return x1205_set_datetime(client, param, 0, -- X1205_CCR_BASE); -+ return x1205_set_datetime(client, tm, X1205_NODATE, X1205_CCR_BASE); - - case X1205_CMD_SETDATETIME: -- return x1205_set_datetime(client, param, 1, -- X1205_CCR_BASE); -+ return x1205_set_datetime(client, tm, X1205_DATETOO, X1205_CCR_BASE); - - case X1205_CMD_GETALARM: -- return x1205_get_datetime(client, param, X1205_ALM0_BASE); -+ return x1205_get_datetime(client, tm, X1205_ALM0_BASE); - - case X1205_CMD_SETALARM: -- return x1205_set_datetime(client, param, 1, -- X1205_ALM0_BASE); -- -- case X1205_CMD_GETDTRIM: -- return x1205_get_dtrim(client, param); -- -- case X1205_CMD_GETATRIM: -- return x1205_get_atrim(client, param); -+ return x1205_set_datetime(client, tm, X1205_DATETOO, X1205_ALM0_BASE); - - default: - return -EINVAL; - } - } - -+ - static int __init x1205_init(void) - { - return i2c_add_driver(&x1205_driver); -@@ -689,10 +605,8 @@ MODULE_AUTHOR( - "Alessandro Zummo <a.zummo@towertech.it>"); - MODULE_DESCRIPTION("Xicor X1205 RTC driver"); - MODULE_LICENSE("GPL"); --MODULE_VERSION(DRV_VERSION); - - EXPORT_SYMBOL_GPL(x1205_do_command); --EXPORT_SYMBOL_GPL(x1205_direct_attach); - - module_init(x1205_init); - module_exit(x1205_exit); ---- linux-2.6.14/include/linux/x1205.h.orig 2005-11-07 22:38:42.196252187 -0800 -+++ linux-2.6.14/include/linux/x1205.h 2005-11-07 22:42:54.960157617 -0800 -@@ -1,31 +1,67 @@ --/* -- * x1205.h - defines for drivers/i2c/chips/x1205.c -- * Copyright 2004 Karen Spearel -- * 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. -- */ -- --#ifndef __LINUX_X1205_H__ --#define __LINUX_X1205_H__ - - /* commands */ - --#define X1205_CMD_GETDATETIME 0 --#define X1205_CMD_SETTIME 1 --#define X1205_CMD_SETDATETIME 2 -+#define X1205_CMD_GETDATETIME 0 -+#define X1205_CMD_SETTIME 1 -+#define X1205_CMD_SETDATETIME 2 - #define X1205_CMD_GETALARM 3 - #define X1205_CMD_SETALARM 4 --#define X1205_CMD_GETDTRIM 5 --#define X1205_CMD_SETDTRIM 6 --#define X1205_CMD_GETATRIM 7 --#define X1205_CMD_SETATRIM 8 -+ -+/* flags */ -+ -+#define X1205_NODATE 0 -+#define X1205_DATETOO 1 -+ -+/* offsets into read buf - add 2 for write buf */ -+ -+#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_I2C_BUS_ADDR 0x6f /* hardwired into x1205 */ -+#define X1205_CCR_BASE 0x30 /* Base address of CCR */ -+#define X1205_ALM0_BASE 0x00 /* Base address of ALARM0 */ -+ -+#define X1205_SR_RTCF 0x01 -+#define X1205_SR_WEL 0x02 /* Write Enable Latch bit */ -+#define X1205_SR_RWEL 0x04 /* Register Write Enable Bit */ -+ -+#define X1205_HR_MIL 0x80 /* set in ccr.hour for 24 hr mode */ - - extern int x1205_do_command(unsigned int cmd, void *arg); --extern int x1205_direct_attach(int adapter_id, -- struct i2c_client_address_data *address_data); - --#endif /* __LINUX_X1205_H__ */ diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/80-nslu2-class-device-create.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/80-nslu2-class-device-create.patch deleted file mode 100644 index 116f95b2f7..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/80-nslu2-class-device-create.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- linux-2.6.14/arch/arm/mach-ixp4xx/nslu2-io.c.orig 2005-11-07 22:26:36.010556202 -0800 -+++ linux-2.6.14/arch/arm/mach-ixp4xx/nslu2-io.c 2005-11-07 22:27:15.921067613 -0800 -@@ -504,7 +504,7 @@ static int __init n2iom_init(void) - return -EBUSY; - } - else { -- class_device_create(n2lm_class, MKDEV(NSLU2LM_MAJOR, 0), NULL, "leds"); -+ class_device_create(n2lm_class, NULL, MKDEV(NSLU2LM_MAJOR, 0), NULL, "leds"); - } - #endif - -@@ -513,7 +513,7 @@ static int __init n2iom_init(void) - return -EBUSY; - } - else { -- class_device_create(n2lm_class, MKDEV(NSLU2BZ_MAJOR, 0), NULL, "buzzer"); -+ class_device_create(n2lm_class, NULL, MKDEV(NSLU2BZ_MAJOR, 0), NULL, "buzzer"); - } - - return 0; diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/defconfig b/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/defconfig deleted file mode 100644 index ecb422f0d7..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14-mm/defconfig +++ /dev/null @@ -1,1595 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.14 -# Mon Nov 7 22:59:39 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_SWAP_PREFETCH=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_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_CC_OPTIMIZE_FOR_SIZE=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_SLAB=y -# CONFIG_TINY_SHMEM is not set -CONFIG_BASE_SMALL=1 -# CONFIG_SLOB is not set - -# -# 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 - -# -# 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_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_MACH_NSLU2=y -# CONFIG_ARCH_PRPMC1100 is not set -# 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 is not set - -# -# 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_LEDS is not set -CONFIG_ALIGNMENT_TRAP=y - -# -# Boot options -# -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc x1205.hctosys=1 noirqdebug 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_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 -# 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 -# CONFIG_IP6_NF_TARGET_NFQUEUE 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 - -# -# 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 - -# -# 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_EDB7312 is not set -# 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 - -# -# 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_BLK_DEV_IO_TRACE is not set -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set - -# -# 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" -# CONFIG_ATA_OVER_ETH is not set - -# -# ATA/ATAPI/MFM/RLL support -# -# CONFIG_IDE 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=y -# 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 Transport Layers -# -# CONFIG_SAS_CLASS is not set - -# -# SCSI low-level drivers -# -# CONFIG_ISCSI_TCP is not set -# CONFIG_SCSI_ARCMSR 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=y -# 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_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_SKY2 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_ACX 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_KGDBOE is not set -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=m -# 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=y -# 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_SENSORS_X1205=y -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# 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_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 - -# -# 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 - -# -# Speakup console speech -# -# CONFIG_SPEAKUP 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 is not set -# 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_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 -# CONFIG_USB_LIBUSUAL 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_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_NOKIA_DKU2 is not set -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_GOTEMP 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 - -# -# 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=m -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=m -# CONFIG_REISER4_FS is not set -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_OCFS2_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 -# CONFIG_CONFIGFS_FS is not set - -# -# Miscellaneous filesystems -# -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_ASFS_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_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN 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/obsolete/nslu2/nslu2-kernel/2.6.14/.mtn2git_empty b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/.mtn2git_empty +++ /dev/null diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch deleted file mode 100644 index f3da2e093f..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/10-ixp4xx-copy-from.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- linux-2.6.14/drivers/mtd/maps/ixp4xx.c 2005-10-27 17:02:08.000000000 -0700 -+++ linux-2.6.14/drivers/mtd/maps/ixp4xx.c 2005-10-29 23:11:24.990820968 -0700 -@@ -38,10 +38,14 @@ - #define BYTE1(h) ((h) & 0xFF) - #endif - -+#define FLASHWORD(a) (*(__u16*)(a)) -+#define FLASHVAL(a) FLASHWORD(a) -+#define FLASHSET(a,v) do { FLASHWORD(a) = (v); } while (0) -+ - static map_word ixp4xx_read16(struct map_info *map, unsigned long ofs) - { - map_word val; -- val.x[0] = *(__u16 *) (map->map_priv_1 + ofs); -+ val.x[0] = FLASHVAL(map->map_priv_1 + ofs); - return val; - } - -@@ -53,19 +57,25 @@ static map_word ixp4xx_read16(struct map - static void ixp4xx_copy_from(struct map_info *map, void *to, - unsigned long from, ssize_t len) - { -- int i; -- u8 *dest = (u8 *) to; -- u16 *src = (u16 *) (map->map_priv_1 + from); -- u16 data; -- -- for (i = 0; i < (len / 2); i++) { -- data = src[i]; -- dest[i * 2] = BYTE0(data); -- dest[i * 2 + 1] = BYTE1(data); -+ u8 *dest, *src; -+ -+ if (len <= 0) -+ return; -+ -+ dest = (u8 *) to; -+ src = (u8 *) (map->map_priv_1 + from); -+ if (from & 1) -+ *dest++ = BYTE1(FLASHVAL(src-1)), ++src, --len; -+ -+ while (len >= 2) { -+ u16 data = FLASHVAL(src); src += 2; -+ *dest++ = BYTE0(data); -+ *dest++ = BYTE1(data); -+ len -= 2; - } - -- if (len & 1) -- dest[len - 1] = BYTE0(src[i]); -+ if (len > 0) -+ *dest++ = BYTE0(FLASHVAL(src)); - } - - /* -@@ -75,7 +85,7 @@ static void ixp4xx_copy_from(struct map_ - static void ixp4xx_probe_write16(struct map_info *map, map_word d, unsigned long adr) - { - if (!(adr & 1)) -- *(__u16 *) (map->map_priv_1 + adr) = d.x[0]; -+ FLASHSET(map->map_priv_1 + adr, d.x[0]); - } - - /* -@@ -83,7 +93,7 @@ static void ixp4xx_probe_write16(struct - */ - static void ixp4xx_write16(struct map_info *map, map_word d, unsigned long adr) - { -- *(__u16 *) (map->map_priv_1 + adr) = d.x[0]; -+ FLASHSET(map->map_priv_1 + adr, d.x[0]); - } - - struct ixp4xx_flash_info { diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/10-ixp4xx-le.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/10-ixp4xx-le.patch deleted file mode 100644 index 0b50e4e1a0..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/10-ixp4xx-le.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- linux-2.6.14/drivers/mtd/maps/ixp4xx.c 2005-10-27 17:02:08.000000000 -0700 -+++ linux-2.6.14/drivers/mtd/maps/ixp4xx.c 2005-10-29 23:11:24.990820968 -0700 -@@ -22,6 +22,7 @@ - #include <linux/string.h> - #include <linux/mtd/mtd.h> - #include <linux/mtd/map.h> -+#include <linux/mtd/cfi_endian.h> - #include <linux/mtd/partitions.h> - #include <linux/ioport.h> - #include <linux/device.h> -@@ -30,17 +31,40 @@ - - #include <linux/reboot.h> - -+/* On a little-endian IXP4XX system (tested on NSLU2) an LDRH or STRH -+ * will flip the second address bit - i.e. XOR the address with 10b. -+ * This causes the cfi commands (sent to the command address, 0xAA for -+ * 16 bit flash) to fail. This is fixed here by XOR'ing the address -+ * before use with 10b. The cost of this is that the flash layout ends -+ * up with pdp-endiannes (on an LE system), however this is not a problem -+ * as the access code consistently only accesses half words - so the -+ * endianness is not determinable on stuff which is written and read -+ * consistently in the little endian world. -+ * -+ * For flash data from the big-endian world, however, the results are -+ * weird - the pdp-endianness results in the data apparently being -+ * 2-byte swapped (as in dd conv=swab). To work round this the 16 -+ * bit values are written and read using cpu_to_cfi16 and cfi16_to_cpu, -+ * by default these are no-ops, but if the MTD driver is configed with -+ * CONFIG_MTD_CFI_BE_BYTE_SWAP the macros will byte swap the data, -+ * resulting in a consistently BE view of the flash on both BE (no -+ * op) and LE systems. This config setting also causes the command -+ * data from the CFI implementation to get swapped - as is required -+ * so that this code will *unswap* it and give the correct command -+ * data to the flash. -+ */ - #ifndef __ARMEB__ - #define BYTE0(h) ((h) & 0xFF) - #define BYTE1(h) (((h) >> 8) & 0xFF) -+#define FLASHWORD(a) (*(__u16*)((u32)(a) ^ 2)) - #else - #define BYTE0(h) (((h) >> 8) & 0xFF) - #define BYTE1(h) ((h) & 0xFF) -+#define FLASHWORD(a) (*(__u16*)(a)) - #endif - --#define FLASHWORD(a) (*(__u16*)(a)) --#define FLASHVAL(a) FLASHWORD(a) --#define FLASHSET(a,v) do { FLASHWORD(a) = (v); } while (0) -+#define FLASHVAL(a) cfi16_to_cpu(FLASHWORD(a)) -+#define FLASHSET(a,v) (FLASHWORD(a) = cpu_to_cfi16(v)) - - static map_word ixp4xx_read16(struct map_info *map, unsigned long ofs) - { diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/10-mtdpart-redboot-fis-byteswap.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/10-mtdpart-redboot-fis-byteswap.patch deleted file mode 100644 index 3fa0535abf..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/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/obsolete/nslu2/nslu2-kernel/2.6.14/15-ixp4xx-writesb-l-w.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/15-ixp4xx-writesb-l-w.patch deleted file mode 100644 index 6ac0807f1e..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/15-ixp4xx-writesb-l-w.patch +++ /dev/null @@ -1,31 +0,0 @@ -# The inline caller of these APIs were changed to have -# const vaddr parameters... ---- linux-2.6.13/include/asm-arm/arch-ixp4xx/io.h.orig 2005-09-24 17:06:19.968099976 -0700 -+++ linux-2.6.13/include/asm-arm/arch-ixp4xx/io.h 2005-09-24 17:06:52.542149731 -0700 -@@ -113,7 +113,7 @@ - } - - static inline void --__ixp4xx_writesb(u32 bus_addr, u8 *vaddr, int count) -+__ixp4xx_writesb(u32 bus_addr, const u8 *vaddr, int count) - { - while (count--) - writeb(*vaddr++, bus_addr); -@@ -136,7 +136,7 @@ - } - - static inline void --__ixp4xx_writesw(u32 bus_addr, u16 *vaddr, int count) -+__ixp4xx_writesw(u32 bus_addr, const u16 *vaddr, int count) - { - while (count--) - writew(*vaddr++, bus_addr); -@@ -154,7 +154,7 @@ - } - - static inline void --__ixp4xx_writesl(u32 bus_addr, u32 *vaddr, int count) -+__ixp4xx_writesl(u32 bus_addr, const u32 *vaddr, int count) - { - while (count--) - writel(*vaddr++, bus_addr); diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/18-ixp4xx-io-h-addr.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/18-ixp4xx-io-h-addr.patch deleted file mode 100644 index 5813bbb7ac..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/18-ixp4xx-io-h-addr.patch +++ /dev/null @@ -1,287 +0,0 @@ ---- linux-2.6.14/include/asm-arm/arch-ixp4xx/io.h 2005-10-29 23:33:21.757679882 -0700 -+++ linux-2.6.14/include/asm-arm/arch-ixp4xx/io.h 2005-10-29 23:47:02.581331058 -0700 -@@ -80,9 +80,9 @@ __ixp4xx_iounmap(void __iomem *addr) - #define __arch_ioremap(a, s, f, x) __ixp4xx_ioremap(a, s, f, x) - #define __arch_iounmap(a) __ixp4xx_iounmap(a) - --#define writeb(p, v) __ixp4xx_writeb(p, v) --#define writew(p, v) __ixp4xx_writew(p, v) --#define writel(p, v) __ixp4xx_writel(p, v) -+#define writeb(v, p) __ixp4xx_writeb(v, p) -+#define writew(v, p) __ixp4xx_writew(v, p) -+#define writel(v, p) __ixp4xx_writel(v, p) - - #define writesb(p, v, l) __ixp4xx_writesb(p, v, l) - #define writesw(p, v, l) __ixp4xx_writesw(p, v, l) -@@ -97,8 +97,9 @@ __ixp4xx_iounmap(void __iomem *addr) - #define readsl(p, v, l) __ixp4xx_readsl(p, v, l) - - static inline void --__ixp4xx_writeb(u8 value, u32 addr) -+__ixp4xx_writeb(u8 value, volatile void __iomem *p) - { -+ u32 addr = (u32)p; - u32 n, byte_enables, data; - - if (addr >= VMALLOC_START) { -@@ -113,15 +114,16 @@ __ixp4xx_writeb(u8 value, u32 addr) - } - - static inline void --__ixp4xx_writesb(u32 bus_addr, const u8 *vaddr, int count) -+__ixp4xx_writesb(volatile void __iomem *bus_addr, const u8 *vaddr, int count) - { - while (count--) - writeb(*vaddr++, bus_addr); - } - - static inline void --__ixp4xx_writew(u16 value, u32 addr) -+__ixp4xx_writew(u16 value, volatile void __iomem *p) - { -+ u32 addr = (u32)p; - u32 n, byte_enables, data; - - if (addr >= VMALLOC_START) { -@@ -136,15 +138,16 @@ __ixp4xx_writew(u16 value, u32 addr) - } - - static inline void --__ixp4xx_writesw(u32 bus_addr, const u16 *vaddr, int count) -+__ixp4xx_writesw(volatile void __iomem *bus_addr, const u16 *vaddr, int count) - { - while (count--) - writew(*vaddr++, bus_addr); - } - - static inline void --__ixp4xx_writel(u32 value, u32 addr) -+__ixp4xx_writel(u32 value, volatile void __iomem *p) - { -+ u32 addr = (u32)p; - if (addr >= VMALLOC_START) { - __raw_writel(value, addr); - return; -@@ -154,15 +157,16 @@ __ixp4xx_writel(u32 value, u32 addr) - } - - static inline void --__ixp4xx_writesl(u32 bus_addr, const u32 *vaddr, int count) -+__ixp4xx_writesl(volatile void __iomem *bus_addr, const u32 *vaddr, int count) - { - while (count--) - writel(*vaddr++, bus_addr); - } - - static inline unsigned char --__ixp4xx_readb(u32 addr) -+__ixp4xx_readb(const volatile void __iomem *p) - { -+ u32 addr = (u32)p; - u32 n, byte_enables, data; - - if (addr >= VMALLOC_START) -@@ -177,15 +181,16 @@ __ixp4xx_readb(u32 addr) - } - - static inline void --__ixp4xx_readsb(u32 bus_addr, u8 *vaddr, u32 count) -+__ixp4xx_readsb(const volatile void __iomem *bus_addr, u8 *vaddr, u32 count) - { - while (count--) - *vaddr++ = readb(bus_addr); - } - - static inline unsigned short --__ixp4xx_readw(u32 addr) -+__ixp4xx_readw(const volatile void __iomem *p) - { -+ u32 addr = (u32)p; - u32 n, byte_enables, data; - - if (addr >= VMALLOC_START) -@@ -200,15 +205,16 @@ __ixp4xx_readw(u32 addr) - } - - static inline void --__ixp4xx_readsw(u32 bus_addr, u16 *vaddr, u32 count) -+__ixp4xx_readsw(const volatile void __iomem *bus_addr, u16 *vaddr, u32 count) - { - while (count--) - *vaddr++ = readw(bus_addr); - } - - static inline unsigned long --__ixp4xx_readl(u32 addr) -+__ixp4xx_readl(const volatile void __iomem *p) - { -+ u32 addr = (u32)p; - u32 data; - - if (addr >= VMALLOC_START) -@@ -221,7 +227,7 @@ __ixp4xx_readl(u32 addr) - } - - static inline void --__ixp4xx_readsl(u32 bus_addr, u32 *vaddr, u32 count) -+__ixp4xx_readsl(const volatile void __iomem *bus_addr, u32 *vaddr, u32 count) - { - while (count--) - *vaddr++ = readl(bus_addr); -@@ -239,7 +245,7 @@ __ixp4xx_readsl(u32 bus_addr, u32 *vaddr - eth_copy_and_sum((s),__mem_pci(c),(l),(b)) - - static inline int --check_signature(unsigned long bus_addr, const unsigned char *signature, -+check_signature(const unsigned char __iomem *bus_addr, const unsigned char *signature, - int length) - { - int retval = 0; -@@ -389,7 +395,7 @@ __ixp4xx_insl(u32 io_addr, u32 *vaddr, u - #define __is_io_address(p) (((unsigned long)p >= PIO_OFFSET) && \ - ((unsigned long)p <= (PIO_MASK + PIO_OFFSET))) - static inline unsigned int --__ixp4xx_ioread8(void __iomem *addr) -+__ixp4xx_ioread8(const void __iomem *addr) - { - unsigned long port = (unsigned long __force)addr; - if (__is_io_address(port)) -@@ -398,12 +404,12 @@ __ixp4xx_ioread8(void __iomem *addr) - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - return (unsigned int)__raw_readb(port); - #else -- return (unsigned int)__ixp4xx_readb(port); -+ return (unsigned int)__ixp4xx_readb(addr); - #endif - } - - static inline void --__ixp4xx_ioread8_rep(void __iomem *addr, void *vaddr, u32 count) -+__ixp4xx_ioread8_rep(const void __iomem *addr, void *vaddr, u32 count) - { - unsigned long port = (unsigned long __force)addr; - if (__is_io_address(port)) -@@ -412,12 +418,12 @@ __ixp4xx_ioread8_rep(void __iomem *addr, - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - __raw_readsb(addr, vaddr, count); - #else -- __ixp4xx_readsb(port, vaddr, count); -+ __ixp4xx_readsb(addr, vaddr, count); - #endif - } - - static inline unsigned int --__ixp4xx_ioread16(void __iomem *addr) -+__ixp4xx_ioread16(const void __iomem *addr) - { - unsigned long port = (unsigned long __force)addr; - if (__is_io_address(port)) -@@ -426,12 +432,12 @@ __ixp4xx_ioread16(void __iomem *addr) - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - return le16_to_cpu(__raw_readw((u32)port)); - #else -- return (unsigned int)__ixp4xx_readw((u32)port); -+ return (unsigned int)__ixp4xx_readw(addr); - #endif - } - - static inline void --__ixp4xx_ioread16_rep(void __iomem *addr, void *vaddr, u32 count) -+__ixp4xx_ioread16_rep(const void __iomem *addr, void *vaddr, u32 count) - { - unsigned long port = (unsigned long __force)addr; - if (__is_io_address(port)) -@@ -440,12 +446,12 @@ __ixp4xx_ioread16_rep(void __iomem *addr - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - __raw_readsw(addr, vaddr, count); - #else -- __ixp4xx_readsw(port, vaddr, count); -+ __ixp4xx_readsw(addr, vaddr, count); - #endif - } - - static inline unsigned int --__ixp4xx_ioread32(void __iomem *addr) -+__ixp4xx_ioread32(const void __iomem *addr) - { - unsigned long port = (unsigned long __force)addr; - if (__is_io_address(port)) -@@ -454,13 +460,13 @@ __ixp4xx_ioread32(void __iomem *addr) - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - return le32_to_cpu(__raw_readl((u32)port)); - #else -- return (unsigned int)__ixp4xx_readl((u32)port); -+ return (unsigned int)__ixp4xx_readl(addr); - #endif - } - } - - static inline void --__ixp4xx_ioread32_rep(void __iomem *addr, void *vaddr, u32 count) -+__ixp4xx_ioread32_rep(const void __iomem *addr, void *vaddr, u32 count) - { - unsigned long port = (unsigned long __force)addr; - if (__is_io_address(port)) -@@ -469,7 +475,7 @@ __ixp4xx_ioread32_rep(void __iomem *addr - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - __raw_readsl(addr, vaddr, count); - #else -- __ixp4xx_readsl(port, vaddr, count); -+ __ixp4xx_readsl(addr, vaddr, count); - #endif - } - -@@ -483,7 +489,7 @@ __ixp4xx_iowrite8(u8 value, void __iomem - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - __raw_writeb(value, port); - #else -- __ixp4xx_writeb(value, port); -+ __ixp4xx_writeb(value, addr); - #endif - } - -@@ -497,7 +503,7 @@ __ixp4xx_iowrite8_rep(void __iomem *addr - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - __raw_writesb(addr, vaddr, count); - #else -- __ixp4xx_writesb(port, vaddr, count); -+ __ixp4xx_writesb(addr, vaddr, count); - #endif - } - -@@ -511,7 +517,7 @@ __ixp4xx_iowrite16(u16 value, void __iom - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - __raw_writew(cpu_to_le16(value), addr); - #else -- __ixp4xx_writew(value, port); -+ __ixp4xx_writew(value, addr); - #endif - } - -@@ -525,7 +531,7 @@ __ixp4xx_iowrite16_rep(void __iomem *add - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - __raw_writesw(addr, vaddr, count); - #else -- __ixp4xx_writesw(port, vaddr, count); -+ __ixp4xx_writesw(addr, vaddr, count); - #endif - } - -@@ -539,7 +545,7 @@ __ixp4xx_iowrite32(u32 value, void __iom - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - __raw_writel(cpu_to_le32(value), port); - #else -- __ixp4xx_writel(value, port); -+ __ixp4xx_writel(value, addr); - #endif - } - -@@ -553,7 +559,7 @@ __ixp4xx_iowrite32_rep(void __iomem *add - #ifndef CONFIG_IXP4XX_INDIRECT_PCI - __raw_writesl(addr, vaddr, count); - #else -- __ixp4xx_writesl(port, vaddr, count); -+ __ixp4xx_writesl(addr, vaddr, count); - #endif - } - diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/19-jffs2-force-be.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/19-jffs2-force-be.patch deleted file mode 100644 index 4406d17857..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/19-jffs2-force-be.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- linux-2.6.14.1/fs/jffs2/nodelist.h.orig 2005-11-09 23:12:29.641449728 -0800 -+++ linux-2.6.14.1/fs/jffs2/nodelist.h 2005-11-09 23:13:19.228570049 -0800 -@@ -44,7 +44,9 @@ - #define D2(x) - #endif - --#define JFFS2_NATIVE_ENDIAN -+#undef JFFS2_NATIVE_ENDIAN -+#define JFFS2_BIG_ENDIAN 1 -+#undef JFFS2_LITTLE_ENDIAN - - /* Note we handle mode bits conversion from JFFS2 (i.e. Linux) to/from - whatever OS we're actually running on here too. */ diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/20-timer.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/20-timer.patch deleted file mode 100644 index 3d4a03f616..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/20-timer.patch +++ /dev/null @@ -1,285 +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/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 -@@ -119,6 +119,11 @@ static void nslu2_power_off(void) - - static void __init nslu2_init(void) - { -+ /* The NSLU2 has a 33MHz crystal on board - 1.01% different -+ * from the typical value. -+ */ -+ ixp4xx_set_board_tick_rate(66000000); -+ - ixp4xx_sys_init(); - - pm_power_off = nslu2_power_off; ---- linux-2.6.15/drivers/input/misc/nslu2spkr.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/drivers/input/misc/nslu2spkr.c 1970-01-01 00:00:00.000000000 +0000 -@@ -51,7 +51,7 @@ static int nslu2_spkr_event(struct input - } - - if (value > 20 && value < 32767) -- count = (NSLU2_FREQ / (value*4)) - 1; -+ count = (ixp4xx_get_board_tick_rate() / (value*4)) - 1; - - spin_lock_irqsave(&beep_lock, flags); - ---- linux-2.6.15/include/asm-arm/arch-ixp4xx/nslu2.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/include/asm-arm/arch-ixp4xx/nslu2.h 1970-01-01 00:00:00.000000000 +0000 -@@ -38,11 +38,6 @@ - #define NSLU2_PCI_INTD_PIN 8 - - --/* NSLU2 Timer */ --#define NSLU2_FREQ 66000000 --#define NSLU2_CLOCK_TICK_RATE (((NSLU2_FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ) --#define NSLU2_CLOCK_TICKS_PER_USEC ((NSLU2_CLOCK_TICK_RATE + USEC_PER_SEC/2) / USEC_PER_SEC) -- - /* GPIO */ - - #define NSLU2_GPIO0 0 ---- 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/obsolete/nslu2/nslu2-kernel/2.6.14/28-spinlock-up.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/28-spinlock-up.patch deleted file mode 100644 index 3ae5178cff..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/28-spinlock-up.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- linux-2.6.14-rc5/include/linux/spinlock_up.h 2005-10-26 08:37:20.164248408 -0700 -+++ patched/include/linux/spinlock_up.h 2005-10-26 12:15:13.458898975 -0700 -@@ -47,6 +47,14 @@ static inline void __raw_spin_unlock(raw - lock->slock = 1; - } - -+#else /* DEBUG_SPINLOCK */ -+#define __raw_spin_is_locked(lock) ((void)(lock), 0) -+/* for sched.c and kernel_lock.c: */ -+# define __raw_spin_lock(lock) do { (void)(lock); } while (0) -+# define __raw_spin_unlock(lock) do { (void)(lock); } while (0) -+# define __raw_spin_trylock(lock) ({ (void)(lock); 1; }) -+#endif /* DEBUG_SPINLOCK */ -+ - /* - * Read-write spinlocks. No debug version. - */ -@@ -57,14 +65,6 @@ static inline void __raw_spin_unlock(raw - #define __raw_read_unlock(lock) do { (void)(lock); } while (0) - #define __raw_write_unlock(lock) do { (void)(lock); } while (0) - --#else /* DEBUG_SPINLOCK */ --#define __raw_spin_is_locked(lock) ((void)(lock), 0) --/* for sched.c and kernel_lock.c: */ --# define __raw_spin_lock(lock) do { (void)(lock); } while (0) --# define __raw_spin_unlock(lock) do { (void)(lock); } while (0) --# define __raw_spin_trylock(lock) ({ (void)(lock); 1; }) --#endif /* DEBUG_SPINLOCK */ -- - #define __raw_read_can_lock(lock) (((void)(lock), 1)) - #define __raw_write_can_lock(lock) (((void)(lock), 1)) - diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/29-ipv4-route-c-spinlock.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/29-ipv4-route-c-spinlock.patch deleted file mode 100644 index 93e070518c..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/29-ipv4-route-c-spinlock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.6.14-rc5/net/ipv4/route.c 2005-10-26 08:37:20.752285410 -0700 -+++ patched/net/ipv4/route.c 2005-10-26 12:17:00.761651111 -0700 -@@ -231,7 +231,7 @@ static spinlock_t *rt_hash_locks; - spin_lock_init(&rt_hash_locks[i]); \ - } - #else --# define rt_hash_lock_addr(slot) NULL -+# define rt_hash_lock_addr(slot) ((spinlock_t*)NULL) - # define rt_hash_lock_init() - #endif - diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/30-i2c-x1205.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/30-i2c-x1205.patch deleted file mode 100644 index 1e775ba8b8..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/30-i2c-x1205.patch +++ /dev/null @@ -1,714 +0,0 @@ -diff -urN linux-2.6.14-rc3/drivers/i2c/chips/Kconfig test9/drivers/i2c/chips/Kconfig ---- linux-2.6.14-rc3/drivers/i2c/chips/Kconfig 2005-10-01 13:46:50.000000000 +0200 -+++ test9/drivers/i2c/chips/Kconfig 2005-10-03 16:10:22.000000000 +0200 -@@ -126,4 +126,13 @@ - This driver can also be built as a module. If so, the module - will be called max6875. - -+config SENSORS_X1205 -+ tristate "Xicor X1205 RTC chip" -+ depends on I2C -+ help -+ If you say yes here you get support for the Xicor X1205 RTC chip. -+ -+ This driver can also be built as a module. If so, the module -+ will be called x1205 -+ - endmenu -diff -urN linux-2.6.14-rc3/drivers/i2c/chips/Makefile test9/drivers/i2c/chips/Makefile ---- linux-2.6.14-rc3/drivers/i2c/chips/Makefile 2005-09-17 12:42:33.000000000 +0200 -+++ test9/drivers/i2c/chips/Makefile 2005-10-01 15:30:06.000000000 +0200 -@@ -13,6 +13,7 @@ - obj-$(CONFIG_SENSORS_RTC8564) += rtc8564.o - obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o - obj-$(CONFIG_TPS65010) += tps65010.o -+obj-$(CONFIG_SENSORS_X1205) += x1205.o - - ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) - EXTRA_CFLAGS += -DDEBUG -diff -urN linux-2.6.14-rc3/drivers/i2c/chips/x1205.c test9/drivers/i2c/chips/x1205.c ---- linux-2.6.14-rc3/drivers/i2c/chips/x1205.c 1970-01-01 01:00:00.000000000 +0100 -+++ test9/drivers/i2c/chips/x1205.c 2005-10-03 16:02:57.000000000 +0200 -@@ -0,0 +1,612 @@ -+/* -+ * linux/drivers/i2c/chips/x1205.c -+ * -+ * x1205.c - An 12c driver for the Xicor 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 the other drivers in this same directory. -+ * -+ * 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/x1205.h> -+ -+#define EPOCH_1900 1900 -+#define EPOCH_1970 1970 -+ -+#define DRIVER_VERSION "0.9.6" -+#define DRIVER_NAME (x1205_driver.name) -+ -+ -+/* Addresses to scan */ -+static unsigned short normal_i2c[] = { X1205_I2C_BUS_ADDR, I2C_CLIENT_END }; -+ -+/* Insmod parameters */ -+I2C_CLIENT_INSMOD; -+I2C_CLIENT_MODULE_PARM(hctosys, -+ "Set the system time from the hardware clock upon initialization"); -+ -+/* 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 int x1205_validate_client(struct i2c_client *client); -+ -+static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm, -+ u8 reg_base); -+static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm, -+ int datetoo, u8 reg_base); -+static int x1205_validate_tm(struct rtc_time *tm); -+static int x1205_command(struct i2c_client *client, unsigned int cmd, void *arg); -+static int x1205_hctosys(struct i2c_client *client); -+ -+ -+static struct i2c_driver x1205_driver = { -+ .owner = THIS_MODULE, -+ .name = "x1205", -+ .flags = I2C_DF_NOTIFY, -+ .attach_adapter = &x1205_attach, -+ .detach_client = &x1205_detach, -+/* .command = &x1205_command,*/ -+}; -+ -+struct x1205_data { -+ struct i2c_client client; -+ struct list_head list; -+ unsigned int epoch; -+}; -+ -+ -+static const unsigned char days_in_mo[] = -+{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; -+ -+static LIST_HEAD(x1205_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 x1205_do_command(unsigned int cmd, void *arg) -+{ -+ struct list_head *walk; -+ struct list_head *tmp; -+ struct x1205_data *data; -+ -+ list_for_each_safe(walk, tmp, &x1205_clients) { -+ data = list_entry(walk, struct x1205_data, list); -+ return x1205_command(&data->client, cmd, arg); -+ } -+ -+ return -ENODEV; -+} -+ -+ -+/* -+ * 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 inited as 2000. Time is set to UT -+ */ -+ -+static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm, -+ u8 reg_base) -+{ -+ static unsigned char dt_addr[] = { 0, }; -+ static unsigned char sr_addr[] = { 0, }; -+ -+ unsigned char buf[8], sr; -+ -+ struct i2c_msg msgs[] = { -+ { client->addr, 0, 2, sr_addr }, /* random read */ -+ { client->addr, I2C_M_RD, 1, &sr }, -+ { client->addr, 0, 2, dt_addr }, /* random read */ -+ { client->addr, I2C_M_RD, 8, buf }, -+ }; -+ -+ struct x1205_data *xdata = i2c_get_clientdata(client); -+ -+ dt_addr[1] = reg_base; -+ sr_addr[1] = X1205_REG_SR; -+ -+ if ((i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs))) == -+ ARRAY_SIZE(msgs)) { -+ /* did we read the correct number of messages? */ -+ -+ /* check for battery failure */ -+ if (sr & X1205_SR_RTCF) -+ { -+ dev_info(&client->adapter->dev, -+ "%s: Clock had a power failure, you must set the date.\n", -+ DRIVER_NAME); -+ -+ return -EINVAL; -+ } -+ -+ 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]); -+ buf[CCR_HOUR] &= ~X1205_HR_MIL; -+ tm->tm_hour = BCD2BIN(buf[CCR_HOUR]); /* hr is 0-23 */ -+ tm->tm_mday = BCD2BIN(buf[CCR_MDAY]); -+ tm->tm_mon = BCD2BIN(buf[CCR_MONTH]); -+ xdata->epoch = BCD2BIN(buf[CCR_Y2K]) * 100; -+ tm->tm_year = BCD2BIN(buf[CCR_YEAR]) + xdata->epoch - EPOCH_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); -+ -+ } else { -+ dev_dbg(&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, err, xfer; -+ -+ static unsigned char wel[3] = { 0, X1205_REG_SR, -+ X1205_SR_WEL }; -+ -+ -+ static unsigned char rwel[3] = { 0, X1205_REG_SR, -+ X1205_SR_WEL | X1205_SR_RWEL }; -+ -+ static unsigned char diswe[3] = { 0, X1205_REG_SR, 0 }; -+ -+ static unsigned char data[3] = { 0, }; -+ static unsigned char buf[8]; -+ -+ struct x1205_data *xdata = i2c_get_clientdata(client); -+ -+ if ((err = x1205_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); -+ -+ -+ buf[CCR_SEC] = BIN2BCD(tm->tm_sec); -+ buf[CCR_MIN] = BIN2BCD(tm->tm_min); -+ -+ /* Set 24HR format */ -+ buf[CCR_HOUR] = BIN2BCD(tm->tm_hour) | X1205_HR_MIL; -+ -+ if (datetoo == X1205_DATETOO) { -+ buf[CCR_MDAY] = BIN2BCD(tm->tm_mday); -+ -+ /* month, 0 - 11 */ -+ buf[CCR_MONTH] = BIN2BCD(tm->tm_mon); /* input is 0-11 */ -+ -+ /* year, since 1900 */ -+ buf[CCR_YEAR] = BIN2BCD((tm->tm_year + EPOCH_1900 - xdata->epoch)); -+ buf[CCR_WDAY] = tm->tm_wday & 7; -+ buf[CCR_Y2K] = BIN2BCD(xdata->epoch / 100); -+ } -+ -+ xfer = i2c_master_send(client, wel, 3); -+ dev_dbg(&client->dev, "%s: wen - %x\n", __FUNCTION__, xfer); -+ if (xfer != 3) -+ return -EIO; -+ -+ xfer = i2c_master_send(client, rwel, 3); -+ dev_dbg(&client->dev, "%s: wenb - %x\n", __FUNCTION__, xfer); -+ if (xfer != 3) -+ return -EIO; -+ -+ for (i = 0; i < 8; i++) { -+ data[1] = i + reg_base; -+ data[2] = buf[i]; -+ xfer = i2c_master_send(client, data, 3); -+ -+ dev_dbg(&client->dev, "%s: xfer %d addr, %02x, data %02x\n", -+ __FUNCTION__, -+ xfer, data[1], data[2]); -+ -+ if (xfer != 3) -+ return -EIO; -+ }; -+ -+ xfer = i2c_master_send(client, diswe, 3); -+ dev_dbg(&client->dev, "%s: wdis - %x\n", __FUNCTION__, xfer); -+ if (xfer != 3) -+ return -EIO; -+ -+ return 0; -+} -+ -+static int x1205_hctosys(struct i2c_client *client) -+{ -+ int err; -+ -+ struct rtc_time tm; -+ struct timespec tv; -+ -+ -+ err = x1205_command(client, X1205_CMD_GETDATETIME, &tm); -+ -+ if (err) -+ { -+ dev_info(&client->adapter->dev, -+ "%s: Unable to set the system clock\n", -+ DRIVER_NAME); -+ -+ 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 for x1205_sync_rtc that it be -+ * defined to store the truncated value. This is because otherwise it -+ * is necessary to read both xtime.tv_sec and xtime.tv_nsec in the -+ * sync function, and atomic reads of >32bits on ARM are 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 + EPOCH_1900, tm.tm_mon + 1, -+ tm.tm_mday, tm.tm_hour, -+ tm.tm_min, tm.tm_sec); -+ -+ do_settimeofday(&tv); -+ -+ dev_info(&client->adapter->dev, -+ "%s: Setting the system clock to %d-%d-%d %d:%d:%d\n", -+ DRIVER_NAME, -+ tm.tm_year + EPOCH_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. -+ */ -+ -+ const unsigned char probe_zero_pattern[] = { -+ -+ X1205_REG_SR, 0x18, -+ X1205_REG_Y2K, 0xC6, -+ X1205_REG_DW, 0xF8, -+ X1205_REG_MO, 0xE0, -+ X1205_REG_DT, 0xC0, -+ X1205_REG_HR, 0x40, -+ X1205_REG_MN, 0x80, -+ X1205_REG_SC, 0x80, -+ X1205_REG_DTR, 0xF8, -+ X1205_REG_ATR, 0xC0, -+ X1205_REG_INT, 0x18, -+ X1205_REG_0, 0xFF, -+ X1205_REG_Y2K1, 0xC6, -+ X1205_REG_DWA1, 0x78, -+ X1205_REG_MOA1, 0x60, -+ X1205_REG_DTA1, 0x40, -+ X1205_REG_HRA1, 0x40, -+ X1205_REG_Y2K0, 0xC6, -+ X1205_REG_DWA0, 0x78, -+ X1205_REG_MOA0, 0x60, -+ X1205_REG_DTA0, 0x40, -+ X1205_REG_HRA0, 0x40, -+ }; -+ -+ 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_DWA1, 0x7F, 0, 6 }, -+ { X1205_REG_MOA1, 0x7F, 0, 12 }, -+ { X1205_REG_DTA1, 0x7F, 0, 31 }, -+ { X1205_REG_HRA1, 0x7F, 0, 23 }, -+ { X1205_REG_MNA1, 0x7F, 0, 59 }, -+ { X1205_REG_SCA1, 0x7F, 0, 59 }, -+ { X1205_REG_Y2K0, 0xFF, 19, 20 }, -+ { X1205_REG_DWA0, 0x7F, 0, 6 }, -+ { X1205_REG_MOA0, 0x7F, 0, 12 }, -+ { X1205_REG_DTA0, 0x7F, 0, 31 }, -+ { X1205_REG_HRA0, 0x7F, 0, 23 }, -+ { X1205_REG_MNA0, 0x7F, 0, 59 }, -+ { X1205_REG_SCA0, 0x7F, 0, 59 }, -+ }; -+ -+ /* check that registers have bits a 0 where expected */ -+ -+ for (i = 0; i < ARRAY_SIZE(probe_zero_pattern); i += 2) -+ { -+ unsigned char buf; -+ -+ static unsigned char addr[2]; -+ -+ struct i2c_msg msgs[2] = { -+ { client->addr, 0, 2, addr }, /* random read */ -+ { client->addr, I2C_M_RD, 1, &buf }, -+ }; -+ -+ addr[0] = 0x00; -+ addr[1] = probe_zero_pattern[i]; -+ -+ xfer = i2c_transfer(client->adapter, msgs, 2); -+ -+ if (xfer != 2) { -+ dev_dbg(&client->adapter->dev, -+ "%s: could not read register %x\n", -+ __FUNCTION__, addr[1]); -+ -+ return -EIO; -+ } -+ -+ if ((buf & probe_zero_pattern[i+1]) != 0) { -+ dev_dbg(&client->adapter->dev, -+ "%s: register %x, zero pattern %d: %x\n", -+ __FUNCTION__, addr[1], i, buf); -+ -+ return -ENODEV; -+ } -+ } -+ -+ /* check limits */ -+ -+ for (i = 0; i < ARRAY_SIZE(probe_limits_pattern); i++) -+ { -+ unsigned char buf, val; -+ -+ static unsigned char addr[2]; -+ -+ struct i2c_msg msgs[2] = { -+ { client->addr, 0, 2, addr }, /* random read */ -+ { client->addr, I2C_M_RD, 1, &buf }, -+ }; -+ -+ addr[0] = 0x00; -+ addr[1] = probe_limits_pattern[i].reg; -+ -+ xfer = i2c_transfer(client->adapter, msgs, 2); -+ -+ if (xfer != 2) { -+ dev_dbg(&client->adapter->dev, -+ "%s: could not read register %x\n", -+ __FUNCTION__, addr[1]); -+ -+ return -EIO; -+ } -+ -+ val = BCD2BIN(buf & probe_limits_pattern[i].mask); -+ -+ if (val > probe_limits_pattern[i].max || -+ val < probe_limits_pattern[i].min) { -+ dev_dbg(&client->adapter->dev, -+ "%s: register %x, lim pattern %d: %d\n", -+ __FUNCTION__, addr[1], i, val); -+ -+ return -ENODEV; -+ } -+ } -+ -+ return 0; -+} -+ -+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) -+{ -+ struct i2c_client *new_client; -+ struct x1205_data *xdata; -+ -+ int err = 0; -+ -+ dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); -+ -+ if (!(xdata = kmalloc(sizeof(struct x1205_data), GFP_KERNEL))) { -+ err = -ENOMEM; -+ goto exit; -+ } -+ -+ /* Fill our data structure */ -+ -+ memset(xdata, 0, sizeof(struct x1205_data)); -+ -+ xdata->epoch = 2000; -+ -+ -+ /* Prepare i2c_client structure */ -+ -+ new_client = &xdata->client; -+ i2c_set_clientdata(new_client, xdata); -+ new_client->addr = address; -+ new_client->adapter = adapter; -+ new_client->driver = &x1205_driver; -+ new_client->flags = 0; -+ -+ strlcpy(new_client->name, "x1205", I2C_NAME_SIZE); -+ -+ -+ /* Verify the chip is really an X1205 */ -+ -+ if (kind < 0) -+ { -+ if (x1205_validate_client(new_client) < 0) { -+ err = -ENODEV; -+ goto exit_kfree; -+ } -+ } -+ -+ /* Inform the i2c layer */ -+ if ((err = i2c_attach_client(new_client))) -+ goto exit_kfree; -+ -+ list_add(&xdata->list, &x1205_clients); -+ -+ dev_info(&adapter->dev, "%s: Chip found, driver " DRIVER_VERSION "\n", -+ DRIVER_NAME); -+ -+ /* If requested, se the system time */ -+ if (hctosys) -+ x1205_hctosys(new_client); -+ -+ return 0; -+ -+exit_kfree: -+ kfree(xdata); -+ -+exit: -+ return err; -+} -+ -+static int x1205_detach(struct i2c_client *client) -+{ -+ int err; -+ struct x1205_data *data = i2c_get_clientdata(client); -+ -+ dev_dbg(&client->dev, "%s\n", __FUNCTION__); -+ -+ if ((err = i2c_detach_client(client))) -+ return err; -+ -+ list_del(&data->list); -+ kfree(data); -+ return 0; -+} -+ -+/* make sure the rtc_time values are in bounds */ -+static int x1205_validate_tm(struct rtc_time *tm) -+{ -+ tm->tm_year += 1900; -+ -+ if (tm->tm_year < EPOCH_1970) -+ 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) && -+ ((!(tm->tm_year % 4) && (tm->tm_year % 100) ) || !(tm->tm_year % 400))))) -+ return -EINVAL; -+ -+ if ((tm->tm_year -= EPOCH_1900) > 255) -+ return -EINVAL; -+ -+ if ((tm->tm_hour >= 24) || (tm->tm_min >= 60) || (tm->tm_sec >= 60)) -+ return -EINVAL; -+ -+ return 0; -+} -+ -+static int x1205_command(struct i2c_client *client, unsigned int cmd, void *tm) -+{ -+ if (client == NULL || tm == NULL) -+ return -EINVAL; -+ -+ if (!capable(CAP_SYS_TIME)) -+ return -EACCES; -+ -+ dev_dbg(&client->dev, "%s: cmd=%d\n", __FUNCTION__, cmd); -+ -+ switch (cmd) { -+ case X1205_CMD_GETDATETIME: -+ return x1205_get_datetime(client, tm, X1205_CCR_BASE); -+ -+ case X1205_CMD_SETTIME: -+ return x1205_set_datetime(client, tm, X1205_NODATE, X1205_CCR_BASE); -+ -+ case X1205_CMD_SETDATETIME: -+ return x1205_set_datetime(client, tm, X1205_DATETOO, X1205_CCR_BASE); -+ -+ case X1205_CMD_GETALARM: -+ return x1205_get_datetime(client, tm, X1205_ALM0_BASE); -+ -+ case X1205_CMD_SETALARM: -+ return x1205_set_datetime(client, tm, X1205_DATETOO, X1205_ALM0_BASE); -+ -+ default: -+ return -EINVAL; -+ } -+} -+ -+ -+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 X1205 RTC driver"); -+MODULE_LICENSE("GPL"); -+ -+EXPORT_SYMBOL_GPL(x1205_do_command); -+ -+module_init(x1205_init); -+module_exit(x1205_exit); ---- linux-2.6.14-rc3/include/linux/x1205.h 1970-01-01 01:00:00.000000000 +0100 -+++ test9/include/linux/x1205.h 2005-10-03 15:38:21.000000000 +0200 -@@ -0,0 +1,67 @@ -+ -+/* commands */ -+ -+#define X1205_CMD_GETDATETIME 0 -+#define X1205_CMD_SETTIME 1 -+#define X1205_CMD_SETDATETIME 2 -+#define X1205_CMD_GETALARM 3 -+#define X1205_CMD_SETALARM 4 -+ -+/* flags */ -+ -+#define X1205_NODATE 0 -+#define X1205_DATETOO 1 -+ -+/* offsets into read buf - add 2 for write buf */ -+ -+#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_I2C_BUS_ADDR 0x6f /* hardwired into x1205 */ -+#define X1205_CCR_BASE 0x30 /* Base address of CCR */ -+#define X1205_ALM0_BASE 0x00 /* Base address of ALARM0 */ -+ -+#define X1205_SR_RTCF 0x01 -+#define X1205_SR_WEL 0x02 /* Write Enable Latch bit */ -+#define X1205_SR_RWEL 0x04 /* Register Write Enable Bit */ -+ -+#define X1205_HR_MIL 0x80 /* set in ccr.hour for 24 hr mode */ -+ -+extern int x1205_do_command(unsigned int cmd, void *arg); -+ diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/50-nslu2-arch.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/50-nslu2-arch.patch deleted file mode 100644 index 038c71c3b3..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/50-nslu2-arch.patch +++ /dev/null @@ -1,461 +0,0 @@ ---- linux-2.6.14/arch/arm/mach-ixp4xx/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.14/arch/arm/mach-ixp4xx/Kconfig 1970-01-01 00:00:00.000000000 +0000 -@@ -8,6 +8,16 @@ menu "Intel IXP4xx Implementation Option - - comment "IXP4xx Platforms" - -+# This entry is placed on top because otherwise it would have -+# been shown as a submenu. -+config MACH_NSLU2 -+ bool -+ prompt "NSLU2" if !(MACH_IXDP465 || MACH_IXDPG425 || ARCH_IXDP425 || ARCH_ADI_COYOTE || ARCH_AVILA || ARCH_IXCDP1100 || ARCH_PRPMC1100 || MACH_GTWX5715) -+ help -+ Say 'Y' here if you want your kernel to support Linksys's -+ NSLU2 NAS device. For more information on this platform, -+ see http://www.nslu2-linux.org -+ - config ARCH_AVILA - bool "Avila" - help ---- linux-2.6.14/arch/arm/mach-ixp4xx/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.14/arch/arm/mach-ixp4xx/Makefile 1970-01-01 00:00:00.000000000 +0000 -@@ -8,4 +8,5 @@ obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pc - obj-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o coyote-setup.o - 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 - ---- linux-2.6.14/arch/arm/mach-ixp4xx/nslu2-pci.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.14/arch/arm/mach-ixp4xx/nslu2-pci.c 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,77 @@ -+/* -+ * arch/arm/mach-ixp4xx/nslu2-pci.c -+ * -+ * NSLU2 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 nslu2_pci_preinit(void) -+{ -+ set_irq_type(IRQ_NSLU2_PCI_INTA, IRQT_LOW); -+ set_irq_type(IRQ_NSLU2_PCI_INTB, IRQT_LOW); -+ set_irq_type(IRQ_NSLU2_PCI_INTC, IRQT_LOW); -+ -+ gpio_line_isr_clear(NSLU2_PCI_INTA_PIN); -+ gpio_line_isr_clear(NSLU2_PCI_INTB_PIN); -+ gpio_line_isr_clear(NSLU2_PCI_INTC_PIN); -+ -+ /* INTD is not configured as GPIO is used -+ * for the power input button. -+ */ -+ -+ ixp4xx_pci_preinit(); -+} -+ -+static int __init nslu2_map_irq(struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ static int pci_irq_table[NSLU2_PCI_IRQ_LINES] = { -+ IRQ_NSLU2_PCI_INTA, -+ IRQ_NSLU2_PCI_INTB, -+ IRQ_NSLU2_PCI_INTC, -+ }; -+ -+ int irq = -1; -+ -+ if (slot >= 1 && slot <= NSLU2_PCI_MAX_DEV && -+ pin >= 1 && pin <= NSLU2_PCI_IRQ_LINES) { -+ irq = pci_irq_table[(slot + pin - 2) % NSLU2_PCI_IRQ_LINES]; -+ } -+ -+ return irq; -+} -+ -+struct hw_pci __initdata nslu2_pci = { -+ .nr_controllers = 1, -+ .preinit = nslu2_pci_preinit, -+ .swizzle = pci_std_swizzle, -+ .setup = ixp4xx_setup, -+ .scan = ixp4xx_scan_bus, -+ .map_irq = nslu2_map_irq, -+}; -+ -+int __init nslu2_pci_init(void) /* monkey see, monkey do */ -+{ -+ if (machine_is_nslu2()) -+ pci_common_init(&nslu2_pci); -+ -+ return 0; -+} -+ -+subsys_initcall(nslu2_pci_init); ---- linux-2.6.14/arch/arm/mach-ixp4xx/nslu2-power.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.14/arch/arm/mach-ixp4xx/nslu2-power.c 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,92 @@ -+/* -+ * arch/arm/mach-ixp4xx/nslu2-power.c -+ * -+ * NSLU2 Power/Reset driver -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * -+ * based on nslu2-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 nslu2_power_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 irqreturn_t nslu2_reset_handler(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ /* This is the paper-clip reset, it shuts the machine down directly. -+ */ -+ machine_power_off(); -+ -+ return IRQ_HANDLED; -+} -+ -+static int __init nslu2_power_init(void) -+{ -+ if (!(machine_is_nslu2())) -+ return 0; -+ -+ *IXP4XX_GPIO_GPISR = 0x20400000; /* read the 2 irqs to clr */ -+ -+ set_irq_type(NSLU2_RB_IRQ, IRQT_LOW); -+ set_irq_type(NSLU2_PB_IRQ, IRQT_HIGH); -+ -+ gpio_line_isr_clear(NSLU2_RB_GPIO); -+ gpio_line_isr_clear(NSLU2_PB_GPIO); -+ -+ if (request_irq(NSLU2_RB_IRQ, &nslu2_reset_handler, -+ SA_INTERRUPT, "NSLU2 reset button", NULL) < 0) { -+ -+ printk(KERN_DEBUG "Reset Button IRQ %d not available\n", -+ NSLU2_RB_IRQ); -+ -+ return -EIO; -+ } -+ -+ if (request_irq(NSLU2_PB_IRQ, &nslu2_power_handler, -+ SA_INTERRUPT, "NSLU2 power button", NULL) < 0) { -+ -+ printk(KERN_DEBUG "Power Button IRQ %d not available\n", -+ NSLU2_PB_IRQ); -+ -+ return -EIO; -+ } -+ -+ return 0; -+} -+ -+static void __exit nslu2_power_exit(void) -+{ -+ free_irq(NSLU2_RB_IRQ, NULL); -+ free_irq(NSLU2_PB_IRQ, NULL); -+} -+ -+module_init(nslu2_power_init); -+module_exit(nslu2_power_exit); -+ -+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -+MODULE_DESCRIPTION("NSLU2 Power/Reset driver"); -+MODULE_LICENSE("GPL"); ---- linux-2.6.14/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.14/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,134 @@ -+/* -+ * arch/arm/mach-ixp4xx/nslu2-setup.c -+ * -+ * NSLU2 board-setup -+ * -+ * based ixdp425-setup.c: -+ * Copyright (C) 2003-2004 MontaVista Software, Inc. -+ * -+ * Author: Mark Rakes <mrakes at mac.com> -+ * Maintainers: http://www.nslu2-linux.org/ -+ * -+ * Fixed missing init_time in MACHINE_START kas11 10/22/04 -+ * Changed to conform to new style __init ixdp425 kas11 10/22/04 -+ */ -+ -+#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 nslu2_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+}; -+ -+static struct resource nslu2_flash_resource = { -+ .start = NSLU2_FLASH_BASE, -+ .end = NSLU2_FLASH_BASE + NSLU2_FLASH_SIZE, -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device nslu2_flash = { -+ .name = "IXP4XX-Flash", -+ .id = 0, -+ .dev.platform_data = &nslu2_flash_data, -+ .num_resources = 1, -+ .resource = &nslu2_flash_resource, -+}; -+ -+static struct ixp4xx_i2c_pins nslu2_i2c_gpio_pins = { -+ .sda_pin = NSLU2_SDA_PIN, -+ .scl_pin = NSLU2_SCL_PIN, -+}; -+ -+static struct platform_device nslu2_i2c_controller = { -+ .name = "IXP4XX-I2C", -+ .id = 0, -+ .dev.platform_data = &nslu2_i2c_gpio_pins, -+ .num_resources = 0, -+}; -+ -+static struct resource nslu2_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 nslu2_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 nslu2_uart = { -+ .name = "serial8250", -+ .id = PLAT8250_DEV_PLATFORM, -+ .dev.platform_data = nslu2_uart_data, -+ .num_resources = 2, -+ .resource = nslu2_uart_resources, -+}; -+ -+static struct platform_device *nslu2_devices[] __initdata = { -+ &nslu2_i2c_controller, -+ &nslu2_flash, -+ &nslu2_uart, -+}; -+ -+static void nslu2_power_off(void) -+{ -+ /* This causes the box to drop the power and go dead. */ -+ -+ /* enable the pwr cntl gpio */ -+ gpio_line_config(NSLU2_PO_GPIO, IXP4XX_GPIO_OUT); -+ -+ /* do the deed */ -+ gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH); -+} -+ -+static void __init nslu2_init(void) -+{ -+ ixp4xx_sys_init(); -+ -+ pm_power_off = nslu2_power_off; -+ -+ platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); -+} -+ -+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, -+ .map_io = ixp4xx_map_io, -+ .init_irq = ixp4xx_init_irq, -+ .timer = &ixp4xx_timer, -+ .init_machine = nslu2_init, -+MACHINE_END ---- linux-2.6.14/include/asm-arm/arch-ixp4xx/hardware.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.14/include/asm-arm/arch-ixp4xx/hardware.h 1970-01-01 00:00:00.000000000 +0000 -@@ -44,5 +44,6 @@ extern unsigned int processor_id; - #include "ixdp425.h" - #include "coyote.h" - #include "prpmc1100.h" -+#include "nslu2.h" - - #endif /* _ASM_ARCH_HARDWARE_H */ ---- linux-2.6.14/include/asm-arm/arch-ixp4xx/irqs.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.14/include/asm-arm/arch-ixp4xx/irqs.h 1970-01-01 00:00:00.000000000 +0000 -@@ -93,4 +93,11 @@ - #define IRQ_COYOTE_PCI_SLOT1 IRQ_IXP4XX_GPIO11 - #define IRQ_COYOTE_IDE IRQ_IXP4XX_GPIO5 - -+/* -+ * NSLU2 board IRQs -+ */ -+#define IRQ_NSLU2_PCI_INTA IRQ_IXP4XX_GPIO11 -+#define IRQ_NSLU2_PCI_INTB IRQ_IXP4XX_GPIO10 -+#define IRQ_NSLU2_PCI_INTC IRQ_IXP4XX_GPIO9 -+ - #endif ---- linux-2.6.14/include/asm-arm/arch-ixp4xx/nslu2.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.14/include/asm-arm/arch-ixp4xx/nslu2.h 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,96 @@ -+/* -+ * include/asm-arm/arch-ixp4xx/nslu2.h -+ * -+ * NSLU2 platform specific definitions -+ * -+ * Author: Mark Rakes <mrakes AT mac.com> -+ * Maintainers: http://www.nslu2-linux.org -+ * -+ * 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 NSLU2_FLASH_BASE IXP4XX_EXP_BUS_CS0_BASE_PHYS -+#define NSLU2_FLASH_SIZE IXP4XX_EXP_BUS_CSX_REGION_SIZE -+ -+#define NSLU2_SDA_PIN 7 -+#define NSLU2_SCL_PIN 6 -+ -+/* -+ * NSLU2 PCI IRQs -+ */ -+#define NSLU2_PCI_MAX_DEV 3 -+#define NSLU2_PCI_IRQ_LINES 3 -+ -+ -+/* PCI controller GPIO to IRQ pin mappings */ -+#define NSLU2_PCI_INTA_PIN 11 -+#define NSLU2_PCI_INTB_PIN 10 -+#define NSLU2_PCI_INTC_PIN 9 -+#define NSLU2_PCI_INTD_PIN 8 -+ -+ -+/* NSLU2 Timer */ -+#define NSLU2_FREQ 66000000 -+#define NSLU2_CLOCK_TICK_RATE (((NSLU2_FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ) -+#define NSLU2_CLOCK_TICKS_PER_USEC ((NSLU2_CLOCK_TICK_RATE + USEC_PER_SEC/2) / USEC_PER_SEC) -+ -+/* GPIO */ -+ -+#define NSLU2_GPIO0 0 -+#define NSLU2_GPIO1 1 -+#define NSLU2_GPIO2 2 -+#define NSLU2_GPIO3 3 -+#define NSLU2_GPIO4 4 -+#define NSLU2_GPIO5 5 -+#define NSLU2_GPIO6 6 -+#define NSLU2_GPIO7 7 -+#define NSLU2_GPIO8 8 -+#define NSLU2_GPIO9 9 -+#define NSLU2_GPIO10 10 -+#define NSLU2_GPIO11 11 -+#define NSLU2_GPIO12 12 -+#define NSLU2_GPIO13 13 -+#define NSLU2_GPIO14 14 -+#define NSLU2_GPIO15 15 -+ -+/* Buttons */ -+ -+#define NSLU2_PB_GPIO NSLU2_GPIO5 -+#define NSLU2_PO_GPIO NSLU2_GPIO8 /* power off */ -+#define NSLU2_RB_GPIO NSLU2_GPIO12 -+ -+#define NSLU2_PB_IRQ IRQ_IXP4XX_GPIO5 -+#define NSLU2_RB_IRQ IRQ_IXP4XX_GPIO12 -+ -+#define NSLU2_PB_BM (1L << NSLU2_PB_GPIO) -+#define NSLU2_PO_BM (1L << NSLU2_PO_GPIO) -+#define NSLU2_RB_BM (1L << NSLU2_RB_GPIO) -+ -+/* Buzzer */ -+ -+#define NSLU2_GPIO_BUZZ 4 -+#define NSLU2_BZ_BM (1L << NSLU2_GPIO_BUZZ) -+/* LEDs */ -+ -+#define NSLU2_LED_RED NSLU2_GPIO0 -+#define NSLU2_LED_GRN NSLU2_GPIO1 -+ -+#define NSLU2_LED_RED_BM (1L << NSLU2_LED_RED) -+#define NSLU2_LED_GRN_BM (1L << NSLU2_LED_GRN) -+ -+#define NSLU2_LED_DISK1 NSLU2_GPIO2 -+#define NSLU2_LED_DISK2 NSLU2_GPIO3 -+ -+#define NSLU2_LED_DISK1_BM (1L << NSLU2_GPIO2) -+#define NSLU2_LED_DISK2_BM (1L << NSLU2_GPIO3) -+ -+ diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/55-nslu2-rtc.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/55-nslu2-rtc.patch deleted file mode 100644 index be1f696940..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/55-nslu2-rtc.patch +++ /dev/null @@ -1,125 +0,0 @@ ---- linux-2.6.13/.pc/55-nslu2-rtc.patch/arch/arm/mach-ixp4xx/Makefile 2005-10-26 15:19:43.171472071 -0700 -+++ linux-2.6.13/arch/arm/mach-ixp4xx/Makefile 2005-10-26 15:23:52.923187955 -0700 -@@ -8,5 +8,5 @@ obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pc - obj-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o coyote-setup.o - 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_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o nslu2-rtc.o - ---- linux-2.6.13/.pc/55-nslu2-rtc.patch/arch/arm/mach-ixp4xx/nslu2-rtc.c 2005-10-26 15:19:43.443489188 -0700 -+++ linux-2.6.13/arch/arm/mach-ixp4xx/nslu2-rtc.c 2005-10-26 15:23:52.923187955 -0700 -@@ -0,0 +1,113 @@ -+/* -+ * arch/arm/mach-ixp4xx/nslu2-rtc.c -+ * -+ * NSLU2 RTC driver -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * -+ * based on x1205-rtc.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/time.h> -+#include <linux/rtc.h> -+#include <linux/init.h> -+ -+#include <linux/x1205.h> -+ -+#include <asm/rtc.h> -+#include <asm/mach-types.h> -+ -+extern int (*set_rtc)(void); -+ -+static int nslu2_set_rtc(void) -+{ -+ struct rtc_time new_tm, old_tm; -+ unsigned long cur_secs = xtime.tv_sec; -+ -+ if (x1205_do_command(X1205_CMD_GETDATETIME, &old_tm)) -+ return 0; -+ -+ /* FIXME xtime.tv_nsec = old_tm.tm_sec * 10000000; */ -+ new_tm.tm_sec = cur_secs % 60; -+ cur_secs /= 60; -+ new_tm.tm_min = cur_secs % 60; -+ cur_secs /= 60; -+ new_tm.tm_hour = cur_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_do_command(X1205_CMD_SETTIME, &new_tm); -+} -+ -+static int rtc_read_alarm(struct rtc_wkalrm *alrm) -+{ -+ return x1205_do_command(X1205_CMD_GETALARM, &alrm->time); -+} -+ -+static int rtc_set_alarm(struct rtc_wkalrm *alrm) -+{ -+ return x1205_do_command(X1205_CMD_SETALARM, &alrm->time); -+} -+ -+static int rtc_read_time(struct rtc_time *tm) -+{ -+ return x1205_do_command(X1205_CMD_GETDATETIME, tm); -+} -+ -+static int rtc_set_time(struct rtc_time *tm) -+{ -+ return x1205_do_command(X1205_CMD_SETDATETIME, tm); -+} -+ -+static struct rtc_ops rtc_ops = { -+ .owner = THIS_MODULE, -+ .read_time = rtc_read_time, -+ .set_time = rtc_set_time, -+ .read_alarm = rtc_read_alarm, -+ .set_alarm = rtc_set_alarm, -+}; -+ -+static int __init nslu2_rtc_init(void) -+{ -+ int ret; -+ -+ if (!(machine_is_nslu2())) -+ return 0; -+ -+ printk(KERN_INFO "NSLU2: rtc\n"); -+ -+ if ((ret = register_rtc(&rtc_ops)) != 0) -+ return ret; -+ -+ set_rtc = nslu2_set_rtc; -+ -+ return 0; -+} -+ -+static void __exit nslu2_rtc_exit(void) -+{ -+ set_rtc = NULL; -+ -+ unregister_rtc(&rtc_ops); -+} -+ -+module_init(nslu2_rtc_init); -+module_exit(nslu2_rtc_exit); diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/60-nslu2-beeper.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/60-nslu2-beeper.patch deleted file mode 100644 index e8a037385b..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/60-nslu2-beeper.patch +++ /dev/null @@ -1,175 +0,0 @@ ---- linux-2.6.13/.pc/60-nslu2-beeper.patch/drivers/input/misc/Kconfig 2005-08-28 16:41:01.000000000 -0700 -+++ linux-2.6.13/drivers/input/misc/Kconfig 2005-10-26 15:24:01.199708764 -0700 -@@ -40,6 +40,18 @@ config INPUT_M68K_BEEP - tristate "M68k Beeper support" - depends on M68K - -+config INPUT_NSLU2_BEEPER -+ tristate "NSLU2 Beeper support" -+ depends on MACH_NSLU2 -+ help -+ Say Y here if you want the embedded beeper on the LinkSys NSLU2 -+ to be used for bells and whistles. -+ -+ If unsure, say Y. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called nslu2spkr. -+ - config INPUT_UINPUT - tristate "User level driver support" - help ---- linux-2.6.13/.pc/60-nslu2-beeper.patch/drivers/input/misc/Makefile 2005-08-28 16:41:01.000000000 -0700 -+++ linux-2.6.13/drivers/input/misc/Makefile 2005-10-26 15:24:01.199708764 -0700 -@@ -10,3 +10,4 @@ obj-$(CONFIG_INPUT_M68K_BEEP) += m68ksp - obj-$(CONFIG_INPUT_98SPKR) += 98spkr.o - obj-$(CONFIG_INPUT_UINPUT) += uinput.o - obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o -+obj-$(CONFIG_INPUT_NSLU2_BEEPER) += nslu2spkr.o ---- linux-2.6.13/.pc/60-nslu2-beeper.patch/drivers/input/misc/nslu2spkr.c 2005-10-26 15:19:43.711506053 -0700 -+++ linux-2.6.13/drivers/input/misc/nslu2spkr.c 2005-10-26 15:24:01.199708764 -0700 -@@ -0,0 +1,144 @@ -+/* -+ * drivers/input/misc/nslu2spkr.c -+ * -+ * NSLU2 Beeper driver -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * -+ * based on nslu2-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/config.h> -+#include <linux/module.h> -+#include <linux/init.h> -+#include <linux/input.h> -+#include <linux/delay.h> -+ -+#include <asm/hardware.h> -+#include <asm/irq.h> -+ -+static unsigned int beep_on_startup = 1; -+module_param(beep_on_startup, bool, 0); -+MODULE_PARM_DESC(beep_on_startup, "Play a beep on module startup"); -+ -+DEFINE_SPINLOCK(beep_lock); -+ -+static int nslu2_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) -+{ -+ unsigned int count = 0; -+ unsigned long flags; -+ -+ if (type != EV_SND) -+ return -1; -+ -+ switch (code) { -+ case SND_BELL: -+ if (value) value = 1000; -+ case SND_TONE: -+ break; -+ default: -+ return -1; -+ } -+ -+ if (value > 20 && value < 32767) -+ count = (NSLU2_FREQ / (value*4)) - 1; -+ -+ spin_lock_irqsave(&beep_lock, flags); -+ -+ if (count) { -+ -+ gpio_line_config(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_OUT); -+ gpio_line_set(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_LOW); -+ -+ *IXP4XX_OSRT2 = (count & ~IXP4XX_OST_RELOAD_MASK) | IXP4XX_OST_ENABLE; -+ -+ } else { -+ -+ gpio_line_config(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_IN); -+ gpio_line_set(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_HIGH); -+ -+ *IXP4XX_OSRT2 = 0; -+ } -+ -+ spin_unlock_irqrestore(&beep_lock, flags); -+ -+ return 0; -+} -+ -+static struct input_dev nslu2_spkr_dev = { -+ .phys = "ixp420/gpio4", -+ .name = "NSLU2 Beeper", -+ .evbit[0] = BIT(EV_SND), -+ .sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE), -+ .event = nslu2_spkr_event, -+ .id = { -+ .bustype = BUS_HOST, -+ .vendor = 0x001f, -+ .product = 0x0001, -+ .version = 0x0100 -+ } -+}; -+ -+static irqreturn_t nslu2_spkr_handler(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ /* clear interrupt */ -+ *IXP4XX_OSST = IXP4XX_OSST_TIMER_2_PEND; -+ -+ /* flip the beeper output */ -+ *IXP4XX_GPIO_GPOUTR ^= NSLU2_BZ_BM; -+ -+ return IRQ_HANDLED; -+} -+ -+static int __init nslu2_spkr_init(void) -+{ -+ if (request_irq(IRQ_IXP4XX_TIMER2, &nslu2_spkr_handler, -+ SA_INTERRUPT | SA_TIMER, "NSLU2 beeper", NULL < 0)) { -+ -+ printk(KERN_INFO "NSLU2 beeper: IRQ %d not available\n", -+ IRQ_IXP4XX_TIMER2); -+ -+ return -EIO; -+ } -+ -+ input_register_device(&nslu2_spkr_dev); -+ -+ /* do a little beep to tell the world we are alive */ -+ if (beep_on_startup) -+ { -+ nslu2_spkr_event(NULL, EV_SND, SND_TONE, 440); -+ msleep(120); -+ nslu2_spkr_event(NULL, EV_SND, SND_TONE, 0); -+ } -+ -+ printk(KERN_INFO "NSLU2: beeper\n"); -+ return 0; -+} -+ -+static void __exit nslu2_spkr_exit(void) -+{ -+ input_unregister_device(&nslu2_spkr_dev); -+ -+ disable_irq(IRQ_IXP4XX_TIMER2); -+ -+ /* turn it off */ -+ nslu2_spkr_event(NULL, EV_SND, SND_BELL, 0); -+ -+ free_irq(IRQ_IXP4XX_TIMER2, NULL); -+} -+ -+module_init(nslu2_spkr_init); -+module_exit(nslu2_spkr_exit); -+ -+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -+MODULE_DESCRIPTION("NSLU2 Beeper driver"); -+MODULE_LICENSE("GPL"); diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/70-nslu2-io.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/70-nslu2-io.patch deleted file mode 100644 index d3d200e4c4..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/70-nslu2-io.patch +++ /dev/null @@ -1,560 +0,0 @@ ---- linux-2.6.13/.pc/70-nslu2-io.patch/arch/arm/mach-ixp4xx/Makefile 2005-10-26 15:19:43.443489188 -0700 -+++ linux-2.6.13/arch/arm/mach-ixp4xx/Makefile 2005-10-26 15:24:08.652177718 -0700 -@@ -8,5 +8,5 @@ obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pc - obj-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o coyote-setup.o - 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 nslu2-rtc.o -+obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o nslu2-rtc.o nslu2-io.o - ---- linux-2.6.13/.pc/70-nslu2-io.patch/arch/arm/mach-ixp4xx/nslu2-io.c 2005-10-26 15:19:43.979522918 -0700 -+++ linux-2.6.13/arch/arm/mach-ixp4xx/nslu2-io.c 2005-10-26 15:24:08.652177718 -0700 -@@ -0,0 +1,548 @@ -+//============================================================================= -+// -+// n2-io.c version 0.1.7 -+// Author: Karen Spearel <kas11 at tampabay.rr.com> -+// please report problems/bugs directly to the address above -+// -+// Boilerplate to be added "real soon now"...it is and has always been GPL'ed per -+// MODULE_LICENSE but is offered without warrantee of any sort..use at your own risk -+// -+// NOTE: THIS IS INCOMPLETE. INCLUDED ONLY TO KEEP FROM BREAKING THE BUILD, -+// IT BEEPS AND SENDS A MESSAGE TO /proc/poweroff. EVENTUALLY IT -+// WILL TALK TO THE n2_pbd DAEMON. EVENTUALLY THE LED DRIVER -+// WILL TALK TO SOME USERLAND APP BUT ***NOT*** SET_LEDS. -+// -+//============================================================================= -+// GPIO Function State -+// 0 Red LED Status -+// 1 Green LED Ready = 1 -+// 2 Disk 2 LED On = 0 -+// 3 Disk 1 LED On = 0 -+// 4 Buzzer -+// 5 Power Button Pressed = 1 -+// 8 Power Down Output = 1 powers down NSLU2 -+// 12 Reset Pressed = 0 -+ -+#include <linux/config.h> -+#include <linux/version.h> -+#include <linux/module.h> -+#include <linux/kernel.h> -+#include <linux/proc_fs.h> -+#include <linux/device.h> -+#include <linux/reboot.h> -+ -+#include <asm/uaccess.h> -+#include <asm-arm/irq.h> -+#include <asm-arm/delay.h> -+ -+/* Set this to 1 to output lots of debug messages. */ -+#define NSLU2_IO_DEBUG 0 -+ -+#if NSLU2_IO_DEBUG -+#define nslu2_io_debug(args) printk args -+#else -+#define nslu2_io_debug(args) ((void)0) -+#endif -+ -+#define VERSION "0.1.7" -+ -+#define NSLU2BZ_MAJOR 62 //buzzer -+#define NSLU2LM_MAJOR 126 -+ -+ -+#define NSLU2_BEEP_DUR_LONG 2000 -+#define NSLU2_BEEP_DUR_MED 400 -+#define NSLU2_BEEP_DUR_SHORT 100 -+#define NSLU2_BEEP_PITCH_HIGH 250 -+#define NSLU2_BEEP_PITCH_MED 500 -+#define NSLU2_BEEP_PITCH_LOW 1000 -+#define NSLU2_LONG_DELAY 30000 -+ -+#define NSLU2_BZ_BM (1L << NSLU2_GPIO_BUZZ) -+ -+// ioctls -- 'M" is used for sound cards...we don't got one so it seems safe -+ -+#define NSLU2BZ_BEEP_STOP _IO('M',0) //stop multi-beep at end of audible -+#define NSLU2BZ_BEEP _IO('M',1) //one beep at current defaults -+#define NSLU2BZ_BEEPS _IOW('M',3,long) //param beeps at current defaults -+#define NSLU2BZ_TONESET _IOW('M',4,long) //set tone: range is high=250 to low=2000 -+#define NSLU2BZ_ONTIME _IOW('M',5,long) //ontime for multi-beeps in jiffies -+#define NSLU2BZ_SILENTTIME _IOW('M',6,long) //offtime for multi-beeps in jiffies -+#define NSLU2BZ_REPEATCNT _IOW('M',7,long) //number of repeats for multi-beeps 0 = forever -+#define NSLU2BZ_COMBINED _IOW('M',8,long) //combine all params in a long -+ -+#define NSLU2LM_OFF _IOW('M',32,long) -+#define NSLU2LM_ON _IOW('M',33,long) -+#define NSLU2LM_BLINK _IOW('M',34,long) -+#define NSLU2LM_ALT _IOW('M',35,long) -+#define NSLU2LM_ALL_ON _IO('M',36) -+#define NSLU2LM_ALL_OFF _IO('M',37) -+ -+#define PHYS_LEDS 4 -+#define BLINK_DELAY 25 -+ -+// OR Masks to turn these LEDs ON -+ -+#define RS_RED_ON 0x00000001 //0b0000 0000 0000 0010 -+#define RS_GRN_ON 0x00000002 //0b0000 0000 0000 0001 -+#define RS_YEL_ON 0x00000003 //0b0000 0000 0000 0011 -+ -+// AND Masks to turn these LEDs OFF -+ -+#define RS_RED_OFF 0xfffffffe //0b1111 1111 1111 1101 -+#define RS_GRN_OFF 0xfffffffd //0b1111 1111 1111 1110 -+#define RS_YEL_OFF 0xfffffffc //0b1111 1111 1111 1100 -+ -+// AND Masks to turn these LEDs ON -+ -+#define DISK1_ON 0xfffffff7 //0b1111 1111 1111 0111 -+#define DISK2_ON 0xfffffffb //0b1111 1111 1111 1011 -+ -+// Or Masks to turn these LEDs OFF -+ -+#define DISK1_OFF 0x00000008 //0b0000 0000 0000 1000 -+#define DISK2_OFF 0x00000004 //0b0000 0000 0000 0100 -+ -+// EOR masks for toggling LEDs on/off -+ -+#define RS_RG_ALT 0x00000003 //eor mask to toggle rs rg bits -+#define RS_GRN_TGL 0x00000002 -+#define RS_RED_TGL 0x00000001 -+#define DISK1_TGL 0x00000008 -+#define DISK2_TGL 0x00000004 -+ -+// The LED names for switches -+ -+#define LED_RS_RED 0 -+#define LED_RS_GRN 1 -+#define LED_DISK1 2 -+#define LED_DISK2 3 -+#define LED_ALL 4 -+ -+static unsigned long ontime = 50; -+static unsigned long offtime = 450; -+static unsigned long bz_repeatcnt = 10; -+static unsigned long tone = 1000; -+ -+static struct timer_list n2lm_rsg_timer; //rs green -+static struct timer_list n2lm_rsr_timer; //rs red -+static struct timer_list n2lm_d1_timer; //drive 1 -+static struct timer_list n2lm_d2_timer; //drive 2 -+static struct timer_list n2bz_timer; //beeper -+ -+// sysfs class -+static struct class *n2lm_class; -+ -+//================================================================================================== -+// -+// Blinking is handled entirely by the 4 timer handlers. On timeout, the bit in the -+// GPIO output register is xor'd with a mask corresponding to the selected led which simply -+// flips that bit. No record of what any of the other leds is doing is needed. -+// -+//================================================================================================== -+// this blinks rs green or green/yellow if rs red is on -+#ifndef CONFIG_LEDS -+static void n2lm_rsg_handler(unsigned long data) -+{ -+ *IXP4XX_GPIO_GPOUTR ^= RS_GRN_TGL; //flip the led -+ n2lm_rsg_timer.expires = jiffies + BLINK_DELAY; //next timeout -+ add_timer(&n2lm_rsg_timer); //reinit timer -+ return; -+} -+ -+// this blinks or alternates rs red green... inited wit green on/red off -+static void n2lm_rsr_handler(unsigned long data) -+{ -+ *IXP4XX_GPIO_GPOUTR ^= n2lm_rsr_timer.data; -+ n2lm_rsr_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_rsr_timer); -+ return; -+} -+// blinks disk 1 -+static void n2lm_d1_handler(unsigned long data) -+{ -+ *IXP4XX_GPIO_GPOUTR ^= DISK1_TGL; -+ n2lm_d1_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_d1_timer); -+ return; -+} -+// blinks disk 2 -+static void n2lm_d2_handler(unsigned long data) -+{ -+ *IXP4XX_GPIO_GPOUTR ^= DISK2_TGL; -+ n2lm_d2_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_d2_timer); -+ return; -+} -+ -+//================================================================================================== -+ -+static void n2lm_timer_start(unsigned long led) -+{ -+ -+ nslu2_io_debug((KERN_DEBUG "timer: %ld\n",led)); -+ -+ switch(led) { -+ case LED_RS_RED: -+ n2lm_rsr_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_rsr_timer); -+ break; -+ -+ case LED_RS_GRN: -+ n2lm_rsg_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_rsg_timer); -+ break; -+ -+ case LED_DISK1: -+ n2lm_d1_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_d1_timer); -+ break; -+ -+ case LED_DISK2: -+ n2lm_d2_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_d2_timer); -+ break; -+ -+ default: -+ break; -+ } -+ return; -+} -+ -+//================================================================================================== -+ -+static void n2lm_timer_stop(unsigned long led) -+{ -+ switch (led) { -+ case LED_RS_RED: -+ del_timer(&n2lm_rsr_timer); -+ break; -+ case LED_RS_GRN: -+ del_timer(&n2lm_rsg_timer); -+ break; -+ case LED_DISK1: -+ del_timer(&n2lm_d1_timer); -+ break; -+ case LED_DISK2: -+ del_timer(&n2lm_d2_timer); -+ break; -+ default: -+ break; -+ } -+ return; -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static void n2lm_timer_stop_all(void) -+{ -+ del_timer(&n2lm_rsg_timer); -+ del_timer(&n2lm_rsr_timer); -+ del_timer(&n2lm_d1_timer); -+ del_timer(&n2lm_d2_timer); -+ return; -+} -+//-------------------------------------------------------------------------------------------------- -+ -+static void n2lm_ledon(unsigned long led) -+{ -+ -+ nslu2_io_debug((KERN_DEBUG "ledon: %ld\n", led)); -+ -+ switch (led) { -+ case LED_RS_RED: -+ *IXP4XX_GPIO_GPOUTR |= RS_RED_ON; //1 -+ return; -+ case LED_RS_GRN: -+ *IXP4XX_GPIO_GPOUTR |= RS_GRN_ON; //2 -+ return; -+ case LED_DISK1: -+ *IXP4XX_GPIO_GPOUTR &= DISK1_ON; //0xfffffff7 -+ return; -+ case LED_DISK2: -+ *IXP4XX_GPIO_GPOUTR &= DISK2_ON; //0xfffffffb -+ return; -+ case LED_ALL: //all green -+ *IXP4XX_GPIO_GPOUTR |= RS_GRN_ON; -+ *IXP4XX_GPIO_GPOUTR &= (DISK1_ON & DISK2_ON); -+ return; -+ } -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static void n2lm_ledoff(unsigned long led) -+{ -+ -+ switch (led) { -+ case LED_RS_RED: -+ *IXP4XX_GPIO_GPOUTR &= RS_RED_OFF; //0xffffffffe -+ return; -+ case LED_RS_GRN: -+ *IXP4XX_GPIO_GPOUTR &= RS_GRN_OFF; //0xfffffffd -+ return; -+ case LED_DISK1: -+ *IXP4XX_GPIO_GPOUTR |= DISK1_OFF; //0x00000008 -+ return; -+ case LED_DISK2: -+ *IXP4XX_GPIO_GPOUTR |= DISK2_OFF; //0x00000004 -+ return; -+ case LED_ALL: -+ *IXP4XX_GPIO_GPOUTR &= (RS_GRN_OFF & RS_RED_OFF); -+ *IXP4XX_GPIO_GPOUTR |= (DISK1_OFF | DISK2_OFF); -+ } -+} -+ -+//================================================================================================== -+ -+static int n2lm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long led) -+{ -+ -+ nslu2_io_debug((KERN_DEBUG "cmd=%d, led=%ld\n", cmd, led)); -+ -+ if (led < 0 || led >= PHYS_LEDS) -+ return -EINVAL; -+ -+ switch (cmd ) { -+ case NSLU2LM_ON: -+ n2lm_timer_stop(led); -+ n2lm_ledon(led); -+ break; -+ -+ case NSLU2LM_OFF: -+ n2lm_timer_stop(led); -+ n2lm_ledoff(led); -+ break; -+ -+ case NSLU2LM_BLINK: -+ n2lm_ledon(led); -+ if (led == LED_RS_RED) -+ n2lm_rsr_timer.data = RS_RED_TGL; -+ n2lm_timer_start(led); -+ break; -+ -+ case NSLU2LM_ALT: -+ if (led == LED_RS_RED) -+ { -+ n2lm_ledon(LED_RS_GRN); -+ n2lm_ledoff(LED_RS_RED); -+ n2lm_rsr_timer.data = RS_RG_ALT; -+ n2lm_timer_start(LED_RS_RED); -+ break; -+ } else -+ return -EINVAL; -+ -+ case NSLU2LM_ALL_ON: -+ n2lm_timer_stop_all(); -+ n2lm_ledon(LED_ALL); -+ break; -+ -+ case NSLU2LM_ALL_OFF: -+ n2lm_timer_stop_all(); -+ n2lm_ledoff(LED_ALL); -+ break; -+ -+ default: -+ return -EINVAL; -+ } -+ -+ return 0; -+} -+ -+static struct file_operations n2lm_fops = { -+ .owner = THIS_MODULE, -+ .ioctl = n2lm_ioctl, -+}; -+#endif -+//================================================================================================== -+// We can't do anything fancy here since the system tick rate is far below that required to -+// generate a desirable tone. Therefore we haven't much choice but to use a busy loop until -+// I get up to speed on the timers. The saving grace is that for the normal uses, nothing -+// important should be haprepening. -+//================================================================================================== -+ -+static void n2_buzz(int tone_delay, int duration) -+{ -+ int i; -+ -+ *IXP4XX_GPIO_GPOER &= ~NSLU2_BZ_BM; -+ -+ for (i = 1; i < duration; i++) { -+ *IXP4XX_GPIO_GPOUTR &= ~NSLU2_BZ_BM; -+ udelay(tone_delay); -+ *IXP4XX_GPIO_GPOUTR |= NSLU2_BZ_BM; -+ udelay(tone_delay); -+ } -+ *IXP4XX_GPIO_GPOER |= NSLU2_BZ_BM; -+ -+ return; -+} -+//================================================================================================= -+ -+// this handles the buzzer duty cycle -+static void n2bz_handler(unsigned long data) -+{ -+ if (--bz_repeatcnt > 0) { //if just one beep left to do -+ n2bz_timer.expires = jiffies + ontime + offtime; //next timeout -+ add_timer(&n2bz_timer); //reinit timer -+ } -+ n2_buzz(tone/2, ontime); -+ nslu2_io_debug((KERN_DEBUG "Count = %d\tOntime = %d\n", bz_repeatcnt, ontime)); -+ return; -+} -+ -+//================================================================================================== -+ -+static int n2bz_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long param) -+{ -+ switch (cmd) { -+ case NSLU2BZ_BEEP: -+ n2_buzz(tone/2, ontime); -+ break; -+ -+ case NSLU2BZ_BEEP_STOP: -+ del_timer(&n2bz_timer); -+ break; -+ -+ case NSLU2BZ_BEEPS: -+ if (param == 0) -+ bz_repeatcnt = 0xffffffff; -+ else -+ bz_repeatcnt = param; -+ n2bz_handler(0); -+ break; -+ -+ case NSLU2BZ_TONESET: -+ if (param >= 250 && param <= 2000) -+ tone = param; -+ break; -+ -+ case NSLU2BZ_ONTIME: -+ if (param > 4 && param < 201) -+ ontime = param; -+ break; -+ -+ case NSLU2BZ_SILENTTIME: -+ if (param > ontime) //enforce a reasonable duty cycle -+ offtime = param; -+ else -+ offtime = ontime; -+ break; -+ -+ case NSLU2BZ_REPEATCNT: -+ if (param == 0) -+ bz_repeatcnt = 0xffffffff; -+ else -+ bz_repeatcnt = param; -+ break; -+ -+ case NSLU2BZ_COMBINED: -+ bz_repeatcnt = (param & 0xF0000000) >> 28; //repeat 1 - 16 -+ ontime = (param & 0x0FF00000) >> 20; //ontime 1 - 256 jiffies -+ offtime = (param & 0x000FFF00) >> 8; //offtime 1 - 4095 jiffies -+ tone = (param & 0x000000FF) << 4; //tone (1 - 255) * 16 -+ break; -+ -+ default: -+ break; -+ } -+ return 0; -+} -+ -+static struct file_operations n2bz_fops = { -+ .owner = THIS_MODULE, -+ .ioctl = n2bz_ioctl, -+}; -+ -+static void n2iom_initarch(void) -+{ -+#ifndef CONFIG_LEDS -+ init_timer(&n2lm_rsg_timer); -+ init_timer(&n2lm_rsr_timer); -+ init_timer(&n2lm_d1_timer); -+ init_timer(&n2lm_d2_timer); -+ -+ n2lm_rsr_timer.function = n2lm_rsr_handler; -+ n2lm_rsg_timer.function = n2lm_rsg_handler; -+ n2lm_d2_timer.function = n2lm_d2_handler; -+ n2lm_d1_timer.function = n2lm_d1_handler; -+#endif -+ -+ init_timer(&n2bz_timer); -+ n2bz_timer.function = n2bz_handler; -+ -+ n2lm_rsr_timer.data = n2lm_rsg_timer.data = n2lm_d1_timer.data = n2lm_d2_timer.data = n2bz_timer.data = 0; -+ -+#ifndef CONFIG_LEDS -+ *IXP4XX_GPIO_GPOER &= 0xfffffff0; //enable gpio 0-3 -+ *IXP4XX_GPIO_GPOUTR |= 0x00000003; //turn off the leds -+ *IXP4XX_GPIO_GPOUTR &= 0xfffffffc; -+ n2lm_ledon(LED_ALL); -+ n2_buzz(NSLU2_BEEP_PITCH_MED, NSLU2_BEEP_DUR_SHORT); -+ n2lm_ledoff(LED_ALL); -+ -+ // Default the Ready/Status to Red during kernel boot, Turn Green at the end of sysvinit -+ n2lm_ledon(LED_RS_RED); -+#endif -+ -+ return; -+} -+ -+//================================================================================================== -+ -+static int __init n2iom_init(void) -+{ -+ printk(KERN_INFO "NSLU2: i/o, %s\n", VERSION); -+ -+ n2iom_initarch(); -+ -+ n2lm_class = class_create(THIS_MODULE, "nslu2"); -+ -+#ifndef CONFIG_LEDS -+ if (register_chrdev(NSLU2LM_MAJOR, "n2_ledm", &n2lm_fops) < 0) { -+ printk(KERN_DEBUG "Led Manager Major %d not available\n", NSLU2LM_MAJOR); -+ return -EBUSY; -+ } -+ else { -+ class_device_create(n2lm_class, MKDEV(NSLU2LM_MAJOR, 0), NULL, "leds"); -+ } -+#endif -+ -+ if (register_chrdev(NSLU2BZ_MAJOR, "n2_bzm", &n2bz_fops) < 0) { -+ printk(KERN_DEBUG "Buzzer Major %d not available\n", NSLU2BZ_MAJOR); -+ return -EBUSY; -+ } -+ else { -+ class_device_create(n2lm_class, MKDEV(NSLU2BZ_MAJOR, 0), NULL, "buzzer"); -+ } -+ -+ return 0; -+} -+ -+//================================================================================================== -+ -+static void __exit n2iom_exit(void) -+{ -+ -+#ifndef CONFIG_LEDS -+ del_timer(&n2lm_rsg_timer); -+ del_timer(&n2lm_rsr_timer); -+ del_timer(&n2lm_d1_timer); -+ del_timer(&n2lm_d2_timer); -+ -+ unregister_chrdev(NSLU2LM_MAJOR, "n2lm" ); -+ class_device_destroy(n2lm_class, MKDEV(NSLU2LM_MAJOR, 0)); -+#endif -+ -+ unregister_chrdev(NSLU2BZ_MAJOR, "n2bz"); -+ class_device_destroy(n2lm_class, MKDEV(NSLU2BZ_MAJOR, 0)); -+ -+ class_destroy(n2lm_class); -+} -+ -+module_init(n2iom_init); -+module_exit(n2iom_exit); -+ -+MODULE_AUTHOR("Karen Spearel <kas11@tampabay.rr.com>"); -+MODULE_DESCRIPTION("NSLU2 I/O driver"); -+MODULE_LICENSE("GPL"); diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/75-nslu2-leds.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/75-nslu2-leds.patch deleted file mode 100644 index 2701c012f3..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/75-nslu2-leds.patch +++ /dev/null @@ -1,267 +0,0 @@ ---- linux-2.6.13/.pc/75-nslu2-leds.patch/arch/arm/Kconfig 2005-10-26 15:19:34.490925838 -0700 -+++ linux-2.6.13/arch/arm/Kconfig 2005-10-26 15:24:18.628805508 -0700 -@@ -389,7 +389,8 @@ config LEDS - ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ - ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ - ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ -- ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE -+ ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ -+ MACH_NSLU2 - help - If you say Y here, the LEDs on your machine will be used - to provide useful information about your current system status. -@@ -403,7 +404,7 @@ config LEDS - - config LEDS_TIMER - bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \ -- MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 -+ MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 || MACH_NSLU2 - depends on LEDS - default y if ARCH_EBSA110 - help -@@ -419,7 +420,8 @@ config LEDS_TIMER - - config LEDS_CPU - bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \ -- !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 -+ !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 \ -+ || MACH_NSLU2 - depends on LEDS - help - If you say Y here, the red LED will be used to give a good real ---- linux-2.6.13/.pc/75-nslu2-leds.patch/arch/arm/mach-ixp4xx/Makefile 2005-10-26 15:19:43.979522918 -0700 -+++ linux-2.6.13/arch/arm/mach-ixp4xx/Makefile 2005-10-26 15:24:18.632805759 -0700 -@@ -10,3 +10,7 @@ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote- - obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o - obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o nslu2-rtc.o nslu2-io.o - -+leds-$(CONFIG_MACH_NSLU2) += nslu2-leds.o -+obj-$(CONFIG_LEDS) += $(leds-y) -+ -+ ---- linux-2.6.13/.pc/75-nslu2-leds.patch/arch/arm/mach-ixp4xx/nslu2-leds.c 2005-10-26 15:19:44.251540035 -0700 -+++ linux-2.6.13/arch/arm/mach-ixp4xx/nslu2-leds.c 2005-10-26 15:24:18.632805759 -0700 -@@ -0,0 +1,223 @@ -+/* -+ * arch/arm/mach-ixp4xx/nslu2-leds.c -+ * -+ * NSLU2 LEDs driver -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * -+ * based on nslu2-io.c -+ * Copyright (C) 2004 Karen Spearel -+ * and arch/arm/mach-footbridge/netwinder-leds.c -+ * Copyright (C) 1998-1999 Russell King -+ * -+ * 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/config.h> -+#include <linux/module.h> -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/spinlock.h> -+#include <linux/notifier.h> -+ -+#include <asm/hardware.h> -+#include <asm/leds.h> -+#include <asm/mach-types.h> -+#include <asm/system.h> -+ -+#define LED_STATE_ENABLED 0x01 -+#define LED_STATE_CLAIMED 0x02 -+#define LED_STATE_IDLE 0x04 -+ -+static unsigned char led_state; -+static unsigned int hw_led_state; -+ -+static const unsigned long idle_seq[4] = { -+ -+ NSLU2_LED_GRN_BM, 0, -+ NSLU2_LED_GRN_BM, 0, -+}; -+ -+static const unsigned long busy_seq[4] = { -+ -+ NSLU2_LED_GRN_BM, 0, -+ NSLU2_LED_GRN_BM | NSLU2_LED_RED_BM, 0, -+}; -+ -+static unsigned char led_count = 0; -+ -+static DEFINE_SPINLOCK(leds_lock); -+extern spinlock_t gpio_lock; -+ -+static void nslu2_leds_event(led_event_t evt) -+{ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&leds_lock, flags); -+ -+ switch (evt) { -+ case led_start: -+ /* Let's rock! Red led on, all others off. Remember -+ * that disk1/disk2 works inverted. On the NSLU2, the -+ * interface starts in a claimed state. XXX -+ */ -+ led_state = LED_STATE_ENABLED | LED_STATE_CLAIMED; -+ hw_led_state = NSLU2_LED_DISK1_BM | NSLU2_LED_DISK2_BM -+ | NSLU2_LED_RED_BM; -+ break; -+ -+ case led_stop: -+ led_state &= ~LED_STATE_ENABLED; -+ break; -+ -+ case led_claim: -+ /* The user claimed the interface, red and green off */ -+ led_state |= LED_STATE_CLAIMED; -+ hw_led_state &= ~(NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM); -+ break; -+ -+ case led_release: -+ /* The user released the interface, preserve the last -+ * status of the leds, except red/green. -+ */ -+ led_state &= ~LED_STATE_CLAIMED; -+ hw_led_state = *IXP4XX_GPIO_GPOUTR & 0x0000000C; -+ break; -+ -+#ifdef CONFIG_LEDS_TIMER -+ case led_timer: -+ /* Pulse green led */ -+ if (!(led_state & LED_STATE_CLAIMED)) -+ { -+ /* clear red and green bits */ -+ hw_led_state &= ~(NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM); -+ -+ /* copy the right sequence in */ -+ if (led_state & LED_STATE_IDLE) -+ hw_led_state |= idle_seq[led_count % 4]; -+ else -+ hw_led_state |= busy_seq[led_count % 4]; -+ -+ led_count++; -+ } -+ break; -+#endif -+ -+#ifdef CONFIG_LEDS_CPU -+ -+ case led_idle_start: -+ led_state |= LED_STATE_IDLE; -+#ifndef CONFIG_LEDS_TIMER -+ /* green on, red off */ -+ hw_led_state |= NSLU2_LED_GRN_BM; -+ hw_led_state &= ~NSLU2_LED_RED_BM; -+#endif -+ break; -+ -+ case led_idle_end: -+ led_state &= ~LED_STATE_IDLE; -+#ifndef CONFIG_LEDS_TIMER -+ /* green on, red on -> amber on */ -+ hw_led_state |= NSLU2_LED_GRN_BM | NSLU2_LED_RED_BM; -+#endif -+ break; -+#endif -+ -+ case led_halted: -+ if (!(led_state & LED_STATE_CLAIMED)) -+ hw_led_state |= NSLU2_LED_RED_BM; -+ break; -+ -+ /* leds */ -+ -+ case led_green_on: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state |= NSLU2_LED_GRN_BM; -+ break; -+ -+ case led_green_off: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state &= ~NSLU2_LED_GRN_BM; -+ break; -+ -+ case led_amber_on: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state |= (NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM); -+ break; -+ -+ case led_amber_off: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state &= ~(NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM); -+ break; -+ -+ case led_red_on: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state |= NSLU2_LED_RED_BM; -+ break; -+ -+ case led_red_off: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state &= ~NSLU2_LED_RED_BM; -+ break; -+ -+ default: -+ break; -+ } -+ -+ spin_unlock_irqrestore(&leds_lock, flags); -+ -+ if (led_state & LED_STATE_ENABLED) { -+ spin_lock_irqsave(&gpio_lock, flags); -+ *IXP4XX_GPIO_GPOUTR = (*IXP4XX_GPIO_GPOUTR & 0xFFFFFFF0) | hw_led_state; -+ spin_unlock_irqrestore(&gpio_lock, flags); -+ } -+} -+ -+static int nslu2_leds_panic_event(struct notifier_block *this, unsigned long event, -+ void *ptr) -+{ -+ leds_event(led_green_off); -+ leds_event(led_red_on); -+ -+ return NOTIFY_DONE; -+} -+ -+static struct notifier_block nslu2_leds_panic_block = { -+ .notifier_call = nslu2_leds_panic_event, -+}; -+ -+static int __init nslu2_leds_init(void) -+{ -+ if (!(machine_is_nslu2())) -+ return 0; -+ -+ printk(KERN_INFO "NSLU2: leds\n"); -+ -+ /* register panic notifier */ -+ notifier_chain_register(&panic_notifier_list, &nslu2_leds_panic_block); -+ -+ /* enable gpio 0-3 */ -+ gpio_line_config(NSLU2_LED_GRN, IXP4XX_GPIO_OUT); -+ gpio_line_config(NSLU2_LED_RED, IXP4XX_GPIO_OUT); -+ gpio_line_config(NSLU2_LED_DISK1, IXP4XX_GPIO_OUT); -+ gpio_line_config(NSLU2_LED_DISK2, IXP4XX_GPIO_OUT); -+ -+ leds_event = nslu2_leds_event; -+ -+ /* this will also initialize the leds to the -+ * default state. -+ */ -+ -+ leds_event(led_start); -+ -+ return 0; -+} -+ -+module_init(nslu2_leds_init); -+ diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/90-ixp4xx-pci-le.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/90-ixp4xx-pci-le.patch deleted file mode 100644 index 1a37b13a79..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/90-ixp4xx-pci-le.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.6.13/.pc/90-ixp4xx-pci-le.patch/arch/arm/mach-ixp4xx/common-pci.c 2005-08-28 16:41:01.000000000 -0700 -+++ linux-2.6.13/arch/arm/mach-ixp4xx/common-pci.c 2005-10-26 15:24:30.337542292 -0700 -@@ -427,7 +427,7 @@ void __init ixp4xx_pci_preinit(void) - #ifdef __ARMEB__ - *PCI_CSR = PCI_CSR_IC | PCI_CSR_ABE | PCI_CSR_PDS | PCI_CSR_ADS; - #else -- *PCI_CSR = PCI_CSR_IC; -+ *PCI_CSR = PCI_CSR_IC | PCI_CSR_ABE; - #endif - - pr_debug("DONE\n"); diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/90-pegasus.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/90-pegasus.patch deleted file mode 100644 index ab80672135..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/90-pegasus.patch +++ /dev/null @@ -1,13 +0,0 @@ -*** linux-2.6.13/drivers/usb/net/pegasus.h.orig Mon Aug 29 01:41:01 2005 ---- linux-2.6.13/drivers/usb/net/pegasus.h Sat Oct 22 20:51:29 2005 -*************** -*** 181,186 **** ---- 181,188 ---- - DEFAULT_GPIO_RESET ) - PEGASUS_DEV( "SpeedStream USB 10/100 Ethernet", VENDOR_ACCTON, 0x5046, - DEFAULT_GPIO_RESET | PEGASUS_II ) -+ PEGASUS_DEV( "Philips CPWUE01/00 USB 10/100 Ethernet", VENDOR_ACCTON, 0xb004, -+ DEFAULT_GPIO_RESET | PEGASUS_II ) - PEGASUS_DEV( "ADMtek ADM8511 \"Pegasus II\" USB Ethernet", - VENDOR_ADMTEK, 0x8511, - DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA ) diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/defconfig b/packages/obsolete/nslu2/nslu2-kernel/2.6.14/defconfig deleted file mode 100644 index 83b25213ac..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.14/defconfig +++ /dev/null @@ -1,1556 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.14 -# Mon Nov 28 18:53:25 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_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_CC_OPTIMIZE_FOR_SIZE=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 - -# -# 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_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=y -# 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_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 is not set - -# -# 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_LEDS is not set -CONFIG_ALIGNMENT_TRAP=y - -# -# Boot options -# -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc x1205.hctosys=1 noirqdebug 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_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 -# 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 -# CONFIG_IP6_NF_TARGET_NFQUEUE 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 -# 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 - -# -# 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 - -# -# 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_EDB7312 is not set -# 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 - -# -# 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 - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -CONFIG_IOSCHED_DEADLINE=y -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_ATA_OVER_ETH is not set - -# -# ATA/ATAPI/MFM/RLL support -# -# CONFIG_IDE 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=y -# 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_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=y -# 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_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=m -# 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 - -# -# 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=y -# 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_SENSORS_X1205=y -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# 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_MXB=m -CONFIG_VIDEO_DPC=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_OVCAMCHIP=m - -# -# 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 is not set -# CONFIG_USB_SL811_HCD is not set - -# -# USB Device Class drivers -# -# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set - -# -# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem -# -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_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_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 - -# -# 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=m -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=m -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_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN 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/obsolete/nslu2/nslu2-kernel/2.6.15/.mtn2git_empty b/packages/obsolete/nslu2/nslu2-kernel/2.6.15/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.15/.mtn2git_empty +++ /dev/null diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.15/00-memory-h-page-shift.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.15/00-memory-h-page-shift.patch deleted file mode 100644 index 30d34952d5..0000000000 --- a/packages/obsolete/nslu2/nslu2-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/obsolete/nslu2/nslu2-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch deleted file mode 100644 index 3fa0535abf..0000000000 --- a/packages/obsolete/nslu2/nslu2-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/obsolete/nslu2/nslu2-kernel/2.6.15/15-jffs2-endian-config.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.15/15-jffs2-endian-config.patch deleted file mode 100644 index fdebb652a7..0000000000 --- a/packages/obsolete/nslu2/nslu2-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/obsolete/nslu2/nslu2-kernel/2.6.15/40-rtc-class.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.15/40-rtc-class.patch deleted file mode 100644 index feea3f2f8b..0000000000 --- a/packages/obsolete/nslu2/nslu2-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/obsolete/nslu2/nslu2-kernel/2.6.15/60-nslu2-beeper.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.15/60-nslu2-beeper.patch deleted file mode 100644 index 12fdc4d96e..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.15/60-nslu2-beeper.patch +++ /dev/null @@ -1,184 +0,0 @@ - drivers/input/misc/Kconfig | 12 +++ - drivers/input/misc/Makefile | 1 - drivers/input/misc/nslu2spkr.c | 148 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 161 insertions(+) - ---- linux-2.6.15/drivers/input/misc/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/drivers/input/misc/Kconfig 1970-01-01 00:00:00.000000000 +0000 -@@ -40,6 +40,18 @@ config INPUT_M68K_BEEP - tristate "M68k Beeper support" - depends on M68K - -+config INPUT_NSLU2_BEEPER -+ tristate "NSLU2 Beeper support" -+ depends on MACH_NSLU2 -+ help -+ Say Y here if you want the embedded beeper on the LinkSys NSLU2 -+ to be used for bells and whistles. -+ -+ If unsure, say Y. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called nslu2spkr. -+ - config INPUT_UINPUT - tristate "User level driver support" - help ---- linux-2.6.15/drivers/input/misc/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/drivers/input/misc/Makefile 1970-01-01 00:00:00.000000000 +0000 -@@ -10,3 +10,4 @@ obj-$(CONFIG_INPUT_M68K_BEEP) += m68ksp - obj-$(CONFIG_INPUT_98SPKR) += 98spkr.o - obj-$(CONFIG_INPUT_UINPUT) += uinput.o - obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o -+obj-$(CONFIG_INPUT_NSLU2_BEEPER) += nslu2spkr.o ---- linux-2.6.15/drivers/input/misc/nslu2spkr.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/drivers/input/misc/nslu2spkr.c 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,148 @@ -+/* -+ * drivers/input/misc/nslu2spkr.c -+ * -+ * NSLU2 Beeper driver -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * -+ * based on nslu2-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/config.h> -+#include <linux/module.h> -+#include <linux/init.h> -+#include <linux/input.h> -+#include <linux/delay.h> -+ -+#include <asm/hardware.h> -+#include <asm/irq.h> -+#include <asm/mach-types.h> -+ -+static unsigned int beep_on_startup = 1; -+module_param(beep_on_startup, bool, 0); -+MODULE_PARM_DESC(beep_on_startup, "Play a beep on module startup"); -+ -+DEFINE_SPINLOCK(beep_lock); -+ -+static int nslu2_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) -+{ -+ unsigned int count = 0; -+ unsigned long flags; -+ -+ if (type != EV_SND) -+ return -1; -+ -+ switch (code) { -+ case SND_BELL: -+ if (value) value = 1000; -+ case SND_TONE: -+ break; -+ default: -+ return -1; -+ } -+ -+ if (value > 20 && value < 32767) -+ count = (NSLU2_FREQ / (value*4)) - 1; -+ -+ spin_lock_irqsave(&beep_lock, flags); -+ -+ if (count) { -+ -+ gpio_line_config(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_OUT); -+ gpio_line_set(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_LOW); -+ -+ *IXP4XX_OSRT2 = (count & ~IXP4XX_OST_RELOAD_MASK) | IXP4XX_OST_ENABLE; -+ -+ } else { -+ -+ gpio_line_config(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_IN); -+ gpio_line_set(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_HIGH); -+ -+ *IXP4XX_OSRT2 = 0; -+ } -+ -+ spin_unlock_irqrestore(&beep_lock, flags); -+ -+ return 0; -+} -+ -+static struct input_dev nslu2_spkr_dev = { -+ .phys = "ixp420/gpio4", -+ .name = "NSLU2 Beeper", -+ .evbit[0] = BIT(EV_SND), -+ .sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE), -+ .event = nslu2_spkr_event, -+ .id = { -+ .bustype = BUS_HOST, -+ .vendor = 0x001f, -+ .product = 0x0001, -+ .version = 0x0100 -+ } -+}; -+ -+static irqreturn_t nslu2_spkr_handler(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ /* clear interrupt */ -+ *IXP4XX_OSST = IXP4XX_OSST_TIMER_2_PEND; -+ -+ /* flip the beeper output */ -+ *IXP4XX_GPIO_GPOUTR ^= NSLU2_BZ_BM; -+ -+ return IRQ_HANDLED; -+} -+ -+static int __init nslu2_spkr_init(void) -+{ -+ if (!(machine_is_nslu2())) -+ return -ENODEV; -+ -+ if (request_irq(IRQ_IXP4XX_TIMER2, &nslu2_spkr_handler, -+ SA_INTERRUPT | SA_TIMER, "nslu2-beeper", NULL < 0)) { -+ -+ printk(KERN_INFO "NSLU2 beeper: IRQ %d not available\n", -+ IRQ_IXP4XX_TIMER2); -+ -+ return -EIO; -+ } -+ -+ input_register_device(&nslu2_spkr_dev); -+ -+ /* do a little beep to tell the world we are alive */ -+ if (beep_on_startup) -+ { -+ nslu2_spkr_event(NULL, EV_SND, SND_TONE, 440); -+ msleep(120); -+ nslu2_spkr_event(NULL, EV_SND, SND_TONE, 0); -+ } -+ -+ printk(KERN_INFO "NSLU2: beeper\n"); -+ return 0; -+} -+ -+static void __exit nslu2_spkr_exit(void) -+{ -+ input_unregister_device(&nslu2_spkr_dev); -+ -+ disable_irq(IRQ_IXP4XX_TIMER2); -+ -+ /* turn it off */ -+ nslu2_spkr_event(NULL, EV_SND, SND_BELL, 0); -+ -+ free_irq(IRQ_IXP4XX_TIMER2, NULL); -+} -+ -+module_init(nslu2_spkr_init); -+module_exit(nslu2_spkr_exit); -+ -+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -+MODULE_DESCRIPTION("NSLU2 Beeper driver"); -+MODULE_LICENSE("GPL"); diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.15/75-nslu2-leds.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.15/75-nslu2-leds.patch deleted file mode 100644 index 7497409e77..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.15/75-nslu2-leds.patch +++ /dev/null @@ -1,272 +0,0 @@ - arch/arm/Kconfig | 8 - - arch/arm/mach-ixp4xx/Makefile | 4 - arch/arm/mach-ixp4xx/nslu2-leds.c | 223 ++++++++++++++++++++++++++++++++++++++ - 3 files changed, 232 insertions(+), 3 deletions(-) - ---- linux-2.6.15/arch/arm/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/arch/arm/Kconfig 1970-01-01 00:00:00.000000000 +0000 -@@ -418,7 +418,8 @@ config LEDS - ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ - ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ - ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ -- ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE -+ ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ -+ MACH_NSLU2 - help - If you say Y here, the LEDs on your machine will be used - to provide useful information about your current system status. -@@ -432,7 +433,7 @@ config LEDS - - config LEDS_TIMER - bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \ -- MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 -+ MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 || MACH_NSLU2 - depends on LEDS - default y if ARCH_EBSA110 - help -@@ -448,7 +449,8 @@ config LEDS_TIMER - - config LEDS_CPU - bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \ -- !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 -+ !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 \ -+ || MACH_NSLU2 - depends on LEDS - help - If you say Y here, the red LED will be used to give a good real ---- linux-2.6.15/arch/arm/mach-ixp4xx/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/arch/arm/mach-ixp4xx/Makefile 1970-01-01 00:00:00.000000000 +0000 -@@ -10,3 +10,7 @@ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote- - obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o - obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o - -+leds-$(CONFIG_MACH_NSLU2) += nslu2-leds.o -+obj-$(CONFIG_LEDS) += $(leds-y) -+ -+ ---- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-leds.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-leds.c 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,223 @@ -+/* -+ * arch/arm/mach-ixp4xx/nslu2-leds.c -+ * -+ * NSLU2 LEDs driver -+ * -+ * Copyright (C) 2005 Tower Technologies -+ * -+ * based on nslu2-io.c -+ * Copyright (C) 2004 Karen Spearel -+ * and arch/arm/mach-footbridge/netwinder-leds.c -+ * Copyright (C) 1998-1999 Russell King -+ * -+ * 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/config.h> -+#include <linux/module.h> -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/spinlock.h> -+#include <linux/notifier.h> -+ -+#include <asm/hardware.h> -+#include <asm/leds.h> -+#include <asm/mach-types.h> -+#include <asm/system.h> -+ -+#define LED_STATE_ENABLED 0x01 -+#define LED_STATE_CLAIMED 0x02 -+#define LED_STATE_IDLE 0x04 -+ -+static unsigned char led_state; -+static unsigned int hw_led_state; -+ -+#ifdef CONFIG_LEDS_TIMER -+static const unsigned long idle_seq[4] = { -+ NSLU2_LED_GRN_BM, 0, -+ NSLU2_LED_GRN_BM, 0, -+}; -+ -+static const unsigned long busy_seq[4] = { -+ NSLU2_LED_GRN_BM, 0, -+ NSLU2_LED_GRN_BM | NSLU2_LED_RED_BM, 0, -+}; -+#endif -+ -+static unsigned char led_count = 0; -+ -+static DEFINE_SPINLOCK(leds_lock); -+extern spinlock_t gpio_lock; -+ -+static void nslu2_leds_event(led_event_t evt) -+{ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&leds_lock, flags); -+ -+ switch (evt) { -+ case led_start: -+ /* Let's rock! Red led on, all others off. Remember -+ * that disk1/disk2 works inverted. -+ */ -+ led_state = LED_STATE_ENABLED; -+ hw_led_state = NSLU2_LED_DISK1_BM | NSLU2_LED_DISK2_BM -+ | NSLU2_LED_RED_BM; -+ break; -+ -+ case led_stop: -+ led_state &= ~LED_STATE_ENABLED; -+ break; -+ -+ case led_claim: -+ /* The user claimed the interface, red and green off */ -+ led_state |= LED_STATE_CLAIMED; -+ hw_led_state &= ~(NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM); -+ break; -+ -+ case led_release: -+ /* The user released the interface, preserve the last -+ * status of the leds, except red/green. -+ */ -+ led_state &= ~LED_STATE_CLAIMED; -+ hw_led_state = *IXP4XX_GPIO_GPOUTR & 0x0000000C; -+ break; -+ -+#ifdef CONFIG_LEDS_TIMER -+ case led_timer: -+ /* Pulse green led */ -+ if (!(led_state & LED_STATE_CLAIMED)) -+ { -+ /* clear red and green bits */ -+ hw_led_state &= ~(NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM); -+ -+ /* copy the right sequence in */ -+ if (led_state & LED_STATE_IDLE) -+ hw_led_state |= idle_seq[led_count % 4]; -+ else -+ hw_led_state |= busy_seq[led_count % 4]; -+ -+ led_count++; -+ } -+ break; -+#endif -+ -+#ifdef CONFIG_LEDS_CPU -+ case led_idle_start: -+ led_state |= LED_STATE_IDLE; -+#ifndef CONFIG_LEDS_TIMER -+ /* green on, red off */ -+ hw_led_state |= NSLU2_LED_GRN_BM; -+ hw_led_state &= ~NSLU2_LED_RED_BM; -+#endif -+ break; -+ -+ case led_idle_end: -+ led_state &= ~LED_STATE_IDLE; -+#ifndef CONFIG_LEDS_TIMER -+ /* green on, red on -> amber on */ -+ hw_led_state |= NSLU2_LED_GRN_BM | NSLU2_LED_RED_BM; -+#endif -+ break; -+#endif /* CONFIG_LEDS_CPU */ -+ -+ case led_halted: -+ if (!(led_state & LED_STATE_CLAIMED)) -+ hw_led_state |= NSLU2_LED_RED_BM; -+ break; -+ -+ /* leds */ -+ -+ case led_green_on: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state |= NSLU2_LED_GRN_BM; -+ break; -+ -+ case led_green_off: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state &= ~NSLU2_LED_GRN_BM; -+ break; -+ -+ case led_amber_on: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state |= (NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM); -+ break; -+ -+ case led_amber_off: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state &= ~(NSLU2_LED_RED_BM | NSLU2_LED_GRN_BM); -+ break; -+ -+ case led_red_on: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state |= NSLU2_LED_RED_BM; -+ break; -+ -+ case led_red_off: -+ if (led_state & LED_STATE_CLAIMED) -+ hw_led_state &= ~NSLU2_LED_RED_BM; -+ break; -+ -+ default: -+ break; -+ } -+ -+ spin_unlock_irqrestore(&leds_lock, flags); -+ -+ if (led_state & LED_STATE_ENABLED) { -+ spin_lock_irqsave(&gpio_lock, flags); -+ *IXP4XX_GPIO_GPOUTR = (*IXP4XX_GPIO_GPOUTR & 0xFFFFFFF0) | hw_led_state; -+ spin_unlock_irqrestore(&gpio_lock, flags); -+ } -+} -+ -+static int nslu2_leds_panic_event(struct notifier_block *this, unsigned long event, -+ void *ptr) -+{ -+#ifdef CONFIG_LEDS_TIMER -+ leds_event(led_claim); -+#endif -+ leds_event(led_green_off); -+ leds_event(led_red_on); -+ -+ return NOTIFY_DONE; -+} -+ -+static struct notifier_block nslu2_leds_panic_block = { -+ .notifier_call = nslu2_leds_panic_event, -+}; -+ -+static int __init nslu2_leds_init(void) -+{ -+ if (!(machine_is_nslu2())) -+ return 0; -+ -+ printk(KERN_INFO "NSLU2: leds\n"); -+ -+ /* register panic notifier */ -+ notifier_chain_register(&panic_notifier_list, &nslu2_leds_panic_block); -+ -+ /* enable gpio 0-3 */ -+ gpio_line_config(NSLU2_LED_GRN, IXP4XX_GPIO_OUT); -+ gpio_line_config(NSLU2_LED_RED, IXP4XX_GPIO_OUT); -+ gpio_line_config(NSLU2_LED_DISK1, IXP4XX_GPIO_OUT); -+ gpio_line_config(NSLU2_LED_DISK2, IXP4XX_GPIO_OUT); -+ -+ leds_event = nslu2_leds_event; -+ -+ /* this will also initialize the leds to the -+ * default state. -+ */ -+ -+ leds_event(led_start); -+ -+ return 0; -+} -+ -+module_init(nslu2_leds_init); diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.15/80-nslu2-io.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.15/80-nslu2-io.patch deleted file mode 100644 index 26031f6f00..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.15/80-nslu2-io.patch +++ /dev/null @@ -1,560 +0,0 @@ ---- linux-2.6.15/arch/arm/mach-ixp4xx/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/arch/arm/mach-ixp4xx/Makefile 1970-01-01 00:00:00.000000000 +0000 -@@ -8,5 +8,5 @@ obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pc - obj-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o coyote-setup.o - 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_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o nslu2-io.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 @@ -+//============================================================================= -+// -+// n2-io.c version 0.1.7 -+// Author: Karen Spearel <kas11 at tampabay.rr.com> -+// please report problems/bugs directly to the address above -+// -+// Boilerplate to be added "real soon now"...it is and has always been GPL'ed per -+// MODULE_LICENSE but is offered without warrantee of any sort..use at your own risk -+// -+// NOTE: THIS IS INCOMPLETE. INCLUDED ONLY TO KEEP FROM BREAKING THE BUILD, -+// IT BEEPS AND SENDS A MESSAGE TO /proc/poweroff. EVENTUALLY IT -+// WILL TALK TO THE n2_pbd DAEMON. EVENTUALLY THE LED DRIVER -+// WILL TALK TO SOME USERLAND APP BUT ***NOT*** SET_LEDS. -+// -+//============================================================================= -+// GPIO Function State -+// 0 Red LED Status -+// 1 Green LED Ready = 1 -+// 2 Disk 2 LED On = 0 -+// 3 Disk 1 LED On = 0 -+// 4 Buzzer -+// 5 Power Button Pressed = 1 -+// 8 Power Down Output = 1 powers down NSLU2 -+// 12 Reset Pressed = 0 -+ -+#include <linux/config.h> -+#include <linux/version.h> -+#include <linux/module.h> -+#include <linux/kernel.h> -+#include <linux/proc_fs.h> -+#include <linux/device.h> -+#include <linux/reboot.h> -+ -+#include <asm/uaccess.h> -+#include <asm-arm/irq.h> -+#include <asm-arm/delay.h> -+ -+/* Set this to 1 to output lots of debug messages. */ -+#define NSLU2_IO_DEBUG 0 -+ -+#if NSLU2_IO_DEBUG -+#define nslu2_io_debug(args) printk args -+#else -+#define nslu2_io_debug(args) ((void)0) -+#endif -+ -+#define VERSION "0.1.7" -+ -+#define NSLU2BZ_MAJOR 62 //buzzer -+#define NSLU2LM_MAJOR 126 -+ -+ -+#define NSLU2_BEEP_DUR_LONG 2000 -+#define NSLU2_BEEP_DUR_MED 400 -+#define NSLU2_BEEP_DUR_SHORT 100 -+#define NSLU2_BEEP_PITCH_HIGH 250 -+#define NSLU2_BEEP_PITCH_MED 500 -+#define NSLU2_BEEP_PITCH_LOW 1000 -+#define NSLU2_LONG_DELAY 30000 -+ -+#define NSLU2_BZ_BM (1L << NSLU2_GPIO_BUZZ) -+ -+// ioctls -- 'M" is used for sound cards...we don't got one so it seems safe -+ -+#define NSLU2BZ_BEEP_STOP _IO('M',0) //stop multi-beep at end of audible -+#define NSLU2BZ_BEEP _IO('M',1) //one beep at current defaults -+#define NSLU2BZ_BEEPS _IOW('M',3,long) //param beeps at current defaults -+#define NSLU2BZ_TONESET _IOW('M',4,long) //set tone: range is high=250 to low=2000 -+#define NSLU2BZ_ONTIME _IOW('M',5,long) //ontime for multi-beeps in jiffies -+#define NSLU2BZ_SILENTTIME _IOW('M',6,long) //offtime for multi-beeps in jiffies -+#define NSLU2BZ_REPEATCNT _IOW('M',7,long) //number of repeats for multi-beeps 0 = forever -+#define NSLU2BZ_COMBINED _IOW('M',8,long) //combine all params in a long -+ -+#define NSLU2LM_OFF _IOW('M',32,long) -+#define NSLU2LM_ON _IOW('M',33,long) -+#define NSLU2LM_BLINK _IOW('M',34,long) -+#define NSLU2LM_ALT _IOW('M',35,long) -+#define NSLU2LM_ALL_ON _IO('M',36) -+#define NSLU2LM_ALL_OFF _IO('M',37) -+ -+#define PHYS_LEDS 4 -+#define BLINK_DELAY 25 -+ -+// OR Masks to turn these LEDs ON -+ -+#define RS_RED_ON 0x00000001 //0b0000 0000 0000 0010 -+#define RS_GRN_ON 0x00000002 //0b0000 0000 0000 0001 -+#define RS_YEL_ON 0x00000003 //0b0000 0000 0000 0011 -+ -+// AND Masks to turn these LEDs OFF -+ -+#define RS_RED_OFF 0xfffffffe //0b1111 1111 1111 1101 -+#define RS_GRN_OFF 0xfffffffd //0b1111 1111 1111 1110 -+#define RS_YEL_OFF 0xfffffffc //0b1111 1111 1111 1100 -+ -+// AND Masks to turn these LEDs ON -+ -+#define DISK1_ON 0xfffffff7 //0b1111 1111 1111 0111 -+#define DISK2_ON 0xfffffffb //0b1111 1111 1111 1011 -+ -+// Or Masks to turn these LEDs OFF -+ -+#define DISK1_OFF 0x00000008 //0b0000 0000 0000 1000 -+#define DISK2_OFF 0x00000004 //0b0000 0000 0000 0100 -+ -+// EOR masks for toggling LEDs on/off -+ -+#define RS_RG_ALT 0x00000003 //eor mask to toggle rs rg bits -+#define RS_GRN_TGL 0x00000002 -+#define RS_RED_TGL 0x00000001 -+#define DISK1_TGL 0x00000008 -+#define DISK2_TGL 0x00000004 -+ -+// The LED names for switches -+ -+#define LED_RS_RED 0 -+#define LED_RS_GRN 1 -+#define LED_DISK1 2 -+#define LED_DISK2 3 -+#define LED_ALL 4 -+ -+static unsigned long ontime = 50; -+static unsigned long offtime = 450; -+static unsigned long bz_repeatcnt = 10; -+static unsigned long tone = 1000; -+ -+static struct timer_list n2lm_rsg_timer; //rs green -+static struct timer_list n2lm_rsr_timer; //rs red -+static struct timer_list n2lm_d1_timer; //drive 1 -+static struct timer_list n2lm_d2_timer; //drive 2 -+static struct timer_list n2bz_timer; //beeper -+ -+// sysfs class -+static struct class *n2lm_class; -+ -+//================================================================================================== -+// -+// Blinking is handled entirely by the 4 timer handlers. On timeout, the bit in the -+// GPIO output register is xor'd with a mask corresponding to the selected led which simply -+// flips that bit. No record of what any of the other leds is doing is needed. -+// -+//================================================================================================== -+// this blinks rs green or green/yellow if rs red is on -+#ifndef CONFIG_LEDS -+static void n2lm_rsg_handler(unsigned long data) -+{ -+ *IXP4XX_GPIO_GPOUTR ^= RS_GRN_TGL; //flip the led -+ n2lm_rsg_timer.expires = jiffies + BLINK_DELAY; //next timeout -+ add_timer(&n2lm_rsg_timer); //reinit timer -+ return; -+} -+ -+// this blinks or alternates rs red green... inited wit green on/red off -+static void n2lm_rsr_handler(unsigned long data) -+{ -+ *IXP4XX_GPIO_GPOUTR ^= n2lm_rsr_timer.data; -+ n2lm_rsr_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_rsr_timer); -+ return; -+} -+// blinks disk 1 -+static void n2lm_d1_handler(unsigned long data) -+{ -+ *IXP4XX_GPIO_GPOUTR ^= DISK1_TGL; -+ n2lm_d1_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_d1_timer); -+ return; -+} -+// blinks disk 2 -+static void n2lm_d2_handler(unsigned long data) -+{ -+ *IXP4XX_GPIO_GPOUTR ^= DISK2_TGL; -+ n2lm_d2_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_d2_timer); -+ return; -+} -+ -+//================================================================================================== -+ -+static void n2lm_timer_start(unsigned long led) -+{ -+ -+ nslu2_io_debug((KERN_DEBUG "timer: %ld\n",led)); -+ -+ switch(led) { -+ case LED_RS_RED: -+ n2lm_rsr_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_rsr_timer); -+ break; -+ -+ case LED_RS_GRN: -+ n2lm_rsg_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_rsg_timer); -+ break; -+ -+ case LED_DISK1: -+ n2lm_d1_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_d1_timer); -+ break; -+ -+ case LED_DISK2: -+ n2lm_d2_timer.expires = jiffies + BLINK_DELAY; -+ add_timer(&n2lm_d2_timer); -+ break; -+ -+ default: -+ break; -+ } -+ return; -+} -+ -+//================================================================================================== -+ -+static void n2lm_timer_stop(unsigned long led) -+{ -+ switch (led) { -+ case LED_RS_RED: -+ del_timer(&n2lm_rsr_timer); -+ break; -+ case LED_RS_GRN: -+ del_timer(&n2lm_rsg_timer); -+ break; -+ case LED_DISK1: -+ del_timer(&n2lm_d1_timer); -+ break; -+ case LED_DISK2: -+ del_timer(&n2lm_d2_timer); -+ break; -+ default: -+ break; -+ } -+ return; -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static void n2lm_timer_stop_all(void) -+{ -+ del_timer(&n2lm_rsg_timer); -+ del_timer(&n2lm_rsr_timer); -+ del_timer(&n2lm_d1_timer); -+ del_timer(&n2lm_d2_timer); -+ return; -+} -+//-------------------------------------------------------------------------------------------------- -+ -+static void n2lm_ledon(unsigned long led) -+{ -+ -+ nslu2_io_debug((KERN_DEBUG "ledon: %ld\n", led)); -+ -+ switch (led) { -+ case LED_RS_RED: -+ *IXP4XX_GPIO_GPOUTR |= RS_RED_ON; //1 -+ return; -+ case LED_RS_GRN: -+ *IXP4XX_GPIO_GPOUTR |= RS_GRN_ON; //2 -+ return; -+ case LED_DISK1: -+ *IXP4XX_GPIO_GPOUTR &= DISK1_ON; //0xfffffff7 -+ return; -+ case LED_DISK2: -+ *IXP4XX_GPIO_GPOUTR &= DISK2_ON; //0xfffffffb -+ return; -+ case LED_ALL: //all green -+ *IXP4XX_GPIO_GPOUTR |= RS_GRN_ON; -+ *IXP4XX_GPIO_GPOUTR &= (DISK1_ON & DISK2_ON); -+ return; -+ } -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static void n2lm_ledoff(unsigned long led) -+{ -+ -+ switch (led) { -+ case LED_RS_RED: -+ *IXP4XX_GPIO_GPOUTR &= RS_RED_OFF; //0xffffffffe -+ return; -+ case LED_RS_GRN: -+ *IXP4XX_GPIO_GPOUTR &= RS_GRN_OFF; //0xfffffffd -+ return; -+ case LED_DISK1: -+ *IXP4XX_GPIO_GPOUTR |= DISK1_OFF; //0x00000008 -+ return; -+ case LED_DISK2: -+ *IXP4XX_GPIO_GPOUTR |= DISK2_OFF; //0x00000004 -+ return; -+ case LED_ALL: -+ *IXP4XX_GPIO_GPOUTR &= (RS_GRN_OFF & RS_RED_OFF); -+ *IXP4XX_GPIO_GPOUTR |= (DISK1_OFF | DISK2_OFF); -+ } -+} -+ -+//================================================================================================== -+ -+static int n2lm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long led) -+{ -+ -+ nslu2_io_debug((KERN_DEBUG "cmd=%d, led=%ld\n", cmd, led)); -+ -+ if (led < 0 || led >= PHYS_LEDS) -+ return -EINVAL; -+ -+ switch (cmd ) { -+ case NSLU2LM_ON: -+ n2lm_timer_stop(led); -+ n2lm_ledon(led); -+ break; -+ -+ case NSLU2LM_OFF: -+ n2lm_timer_stop(led); -+ n2lm_ledoff(led); -+ break; -+ -+ case NSLU2LM_BLINK: -+ n2lm_ledon(led); -+ if (led == LED_RS_RED) -+ n2lm_rsr_timer.data = RS_RED_TGL; -+ n2lm_timer_start(led); -+ break; -+ -+ case NSLU2LM_ALT: -+ if (led == LED_RS_RED) -+ { -+ n2lm_ledon(LED_RS_GRN); -+ n2lm_ledoff(LED_RS_RED); -+ n2lm_rsr_timer.data = RS_RG_ALT; -+ n2lm_timer_start(LED_RS_RED); -+ break; -+ } else -+ return -EINVAL; -+ -+ case NSLU2LM_ALL_ON: -+ n2lm_timer_stop_all(); -+ n2lm_ledon(LED_ALL); -+ break; -+ -+ case NSLU2LM_ALL_OFF: -+ n2lm_timer_stop_all(); -+ n2lm_ledoff(LED_ALL); -+ break; -+ -+ default: -+ return -EINVAL; -+ } -+ -+ return 0; -+} -+ -+static struct file_operations n2lm_fops = { -+ .owner = THIS_MODULE, -+ .ioctl = n2lm_ioctl, -+}; -+#endif -+//================================================================================================== -+// We can't do anything fancy here since the system tick rate is far below that required to -+// generate a desirable tone. Therefore we haven't much choice but to use a busy loop until -+// I get up to speed on the timers. The saving grace is that for the normal uses, nothing -+// important should be haprepening. -+//================================================================================================== -+ -+static void n2_buzz(int tone_delay, int duration) -+{ -+ int i; -+ -+ *IXP4XX_GPIO_GPOER &= ~NSLU2_BZ_BM; -+ -+ for (i = 1; i < duration; i++) { -+ *IXP4XX_GPIO_GPOUTR &= ~NSLU2_BZ_BM; -+ udelay(tone_delay); -+ *IXP4XX_GPIO_GPOUTR |= NSLU2_BZ_BM; -+ udelay(tone_delay); -+ } -+ *IXP4XX_GPIO_GPOER |= NSLU2_BZ_BM; -+ -+ return; -+} -+//================================================================================================= -+ -+// this handles the buzzer duty cycle -+static void n2bz_handler(unsigned long data) -+{ -+ if (--bz_repeatcnt > 0) { //if just one beep left to do -+ n2bz_timer.expires = jiffies + ontime + offtime; //next timeout -+ add_timer(&n2bz_timer); //reinit timer -+ } -+ n2_buzz(tone/2, ontime); -+ nslu2_io_debug((KERN_DEBUG "Count = %d\tOntime = %d\n", bz_repeatcnt, ontime)); -+ return; -+} -+ -+//================================================================================================== -+ -+static int n2bz_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long param) -+{ -+ switch (cmd) { -+ case NSLU2BZ_BEEP: -+ n2_buzz(tone/2, ontime); -+ break; -+ -+ case NSLU2BZ_BEEP_STOP: -+ del_timer(&n2bz_timer); -+ break; -+ -+ case NSLU2BZ_BEEPS: -+ if (param == 0) -+ bz_repeatcnt = 0xffffffff; -+ else -+ bz_repeatcnt = param; -+ n2bz_handler(0); -+ break; -+ -+ case NSLU2BZ_TONESET: -+ if (param >= 250 && param <= 2000) -+ tone = param; -+ break; -+ -+ case NSLU2BZ_ONTIME: -+ if (param > 4 && param < 201) -+ ontime = param; -+ break; -+ -+ case NSLU2BZ_SILENTTIME: -+ if (param > ontime) //enforce a reasonable duty cycle -+ offtime = param; -+ else -+ offtime = ontime; -+ break; -+ -+ case NSLU2BZ_REPEATCNT: -+ if (param == 0) -+ bz_repeatcnt = 0xffffffff; -+ else -+ bz_repeatcnt = param; -+ break; -+ -+ case NSLU2BZ_COMBINED: -+ bz_repeatcnt = (param & 0xF0000000) >> 28; //repeat 1 - 16 -+ ontime = (param & 0x0FF00000) >> 20; //ontime 1 - 256 jiffies -+ offtime = (param & 0x000FFF00) >> 8; //offtime 1 - 4095 jiffies -+ tone = (param & 0x000000FF) << 4; //tone (1 - 255) * 16 -+ break; -+ -+ default: -+ break; -+ } -+ return 0; -+} -+ -+static struct file_operations n2bz_fops = { -+ .owner = THIS_MODULE, -+ .ioctl = n2bz_ioctl, -+}; -+ -+static void n2iom_initarch(void) -+{ -+#ifndef CONFIG_LEDS -+ init_timer(&n2lm_rsg_timer); -+ init_timer(&n2lm_rsr_timer); -+ init_timer(&n2lm_d1_timer); -+ init_timer(&n2lm_d2_timer); -+ -+ n2lm_rsr_timer.function = n2lm_rsr_handler; -+ n2lm_rsg_timer.function = n2lm_rsg_handler; -+ n2lm_d2_timer.function = n2lm_d2_handler; -+ n2lm_d1_timer.function = n2lm_d1_handler; -+#endif -+ -+ init_timer(&n2bz_timer); -+ n2bz_timer.function = n2bz_handler; -+ -+ n2lm_rsr_timer.data = n2lm_rsg_timer.data = n2lm_d1_timer.data = n2lm_d2_timer.data = n2bz_timer.data = 0; -+ -+#ifndef CONFIG_LEDS -+ *IXP4XX_GPIO_GPOER &= 0xfffffff0; //enable gpio 0-3 -+ *IXP4XX_GPIO_GPOUTR |= 0x00000003; //turn off the leds -+ *IXP4XX_GPIO_GPOUTR &= 0xfffffffc; -+ n2lm_ledon(LED_ALL); -+ n2_buzz(NSLU2_BEEP_PITCH_MED, NSLU2_BEEP_DUR_SHORT); -+ n2lm_ledoff(LED_ALL); -+ -+ // Default the Ready/Status to Red during kernel boot, Turn Green at the end of sysvinit -+ n2lm_ledon(LED_RS_RED); -+#endif -+ -+ return; -+} -+ -+//================================================================================================== -+ -+static int __init n2iom_init(void) -+{ -+ printk(KERN_INFO "NSLU2: i/o, %s\n", VERSION); -+ -+ n2iom_initarch(); -+ -+ n2lm_class = class_create(THIS_MODULE, "nslu2"); -+ -+#ifndef CONFIG_LEDS -+ if (register_chrdev(NSLU2LM_MAJOR, "n2_ledm", &n2lm_fops) < 0) { -+ printk(KERN_DEBUG "Led Manager Major %d not available\n", NSLU2LM_MAJOR); -+ return -EBUSY; -+ } -+ else { -+ class_device_create(n2lm_class, NULL, MKDEV(NSLU2LM_MAJOR, 0), NULL, "leds"); -+ } -+#endif -+ -+ if (register_chrdev(NSLU2BZ_MAJOR, "n2_bzm", &n2bz_fops) < 0) { -+ printk(KERN_DEBUG "Buzzer Major %d not available\n", NSLU2BZ_MAJOR); -+ return -EBUSY; -+ } -+ else { -+ class_device_create(n2lm_class, NULL, MKDEV(NSLU2BZ_MAJOR, 0), NULL, "buzzer"); -+ } -+ -+ return 0; -+} -+ -+//================================================================================================== -+ -+static void __exit n2iom_exit(void) -+{ -+ -+#ifndef CONFIG_LEDS -+ del_timer(&n2lm_rsg_timer); -+ del_timer(&n2lm_rsr_timer); -+ del_timer(&n2lm_d1_timer); -+ del_timer(&n2lm_d2_timer); -+ -+ unregister_chrdev(NSLU2LM_MAJOR, "n2lm" ); -+ class_device_destroy(n2lm_class, MKDEV(NSLU2LM_MAJOR, 0)); -+#endif -+ -+ unregister_chrdev(NSLU2BZ_MAJOR, "n2bz"); -+ class_device_destroy(n2lm_class, MKDEV(NSLU2BZ_MAJOR, 0)); -+ -+ class_destroy(n2lm_class); -+} -+ -+module_init(n2iom_init); -+module_exit(n2iom_exit); -+ -+MODULE_AUTHOR("Karen Spearel <kas11@tampabay.rr.com>"); -+MODULE_DESCRIPTION("NSLU2 I/O driver"); -+MODULE_LICENSE("GPL"); diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6.15/85-timer.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6.15/85-timer.patch deleted file mode 100644 index 3d4a03f616..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.15/85-timer.patch +++ /dev/null @@ -1,285 +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/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 -@@ -119,6 +119,11 @@ static void nslu2_power_off(void) - - static void __init nslu2_init(void) - { -+ /* The NSLU2 has a 33MHz crystal on board - 1.01% different -+ * from the typical value. -+ */ -+ ixp4xx_set_board_tick_rate(66000000); -+ - ixp4xx_sys_init(); - - pm_power_off = nslu2_power_off; ---- linux-2.6.15/drivers/input/misc/nslu2spkr.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/drivers/input/misc/nslu2spkr.c 1970-01-01 00:00:00.000000000 +0000 -@@ -51,7 +51,7 @@ static int nslu2_spkr_event(struct input - } - - if (value > 20 && value < 32767) -- count = (NSLU2_FREQ / (value*4)) - 1; -+ count = (ixp4xx_get_board_tick_rate() / (value*4)) - 1; - - spin_lock_irqsave(&beep_lock, flags); - ---- linux-2.6.15/include/asm-arm/arch-ixp4xx/nslu2.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/include/asm-arm/arch-ixp4xx/nslu2.h 1970-01-01 00:00:00.000000000 +0000 -@@ -38,11 +38,6 @@ - #define NSLU2_PCI_INTD_PIN 8 - - --/* NSLU2 Timer */ --#define NSLU2_FREQ 66000000 --#define NSLU2_CLOCK_TICK_RATE (((NSLU2_FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ) --#define NSLU2_CLOCK_TICKS_PER_USEC ((NSLU2_CLOCK_TICK_RATE + USEC_PER_SEC/2) / USEC_PER_SEC) -- - /* GPIO */ - - #define NSLU2_GPIO0 0 ---- 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/obsolete/nslu2/nslu2-kernel/2.6.15/defconfig b/packages/obsolete/nslu2/nslu2-kernel/2.6.15/defconfig deleted file mode 100644 index 9f7bf76471..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6.15/defconfig +++ /dev/null @@ -1,1617 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.15 -# Mon Nov 14 10:44:43 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=y -# 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_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 is not set - -# -# 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_LEDS is not set -CONFIG_ALIGNMENT_TRAP=y - -# -# Boot options -# -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f noirqdebug 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 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=y -# 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=y -# 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=y - -# -# 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=y -CONFIG_INPUT_NSLU2_BEEPER=m -# CONFIG_INPUT_UINPUT 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 is not set -# 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=y -# 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_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# 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_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 is not set -# 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_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=y -# 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=m -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=m -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/obsolete/nslu2/nslu2-kernel/2.6/.mtn2git_empty b/packages/obsolete/nslu2/nslu2-kernel/2.6/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6/.mtn2git_empty +++ /dev/null diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6/40-scsi-idle.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6/40-scsi-idle.patch deleted file mode 100644 index e04996e2a8..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6/40-scsi-idle.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ur linux-2.6.12.2/drivers/scsi/sd.c linux-2.6.12.2_scsi-idle/drivers/scsi/sd.c ---- linux-2.6.12.2/drivers/scsi/sd.c 2005-08-27 06:12:31.000000000 +0200 -+++ linux-2.6.12.2_scsi-idle/drivers/scsi/sd.c 2005-08-27 06:26:50.000000000 +0200 -@@ -266,6 +266,9 @@ - "count=%d\n", disk->disk_name, - (unsigned long long)block, this_count)); - -+ /* Update idle-since time */ -+ sdp->idle = jiffies; -+ - if (!sdp || !scsi_device_online(sdp) || - block + rq->nr_sectors > get_capacity(disk)) { - SCSI_LOG_HLQUEUE(2, printk("Finishing %ld sectors\n", -@@ -600,6 +603,8 @@ - case SCSI_IOCTL_GET_IDLUN: - case SCSI_IOCTL_GET_BUS_NUMBER: - return scsi_ioctl(sdp, cmd, p); -+ case SCSI_IOCTL_IDLE: -+ return (jiffies - sdp->idle) / HZ + 1; - default: - error = scsi_cmd_ioctl(filp, disk, cmd, p); - if (error != -ENOTTY) -diff -ur linux-2.6.12.2/include/scsi/scsi_device.h linux-2.6.12.2_scsi-idle/include/scsi/scsi_device.h ---- linux-2.6.12.2/include/scsi/scsi_device.h 2005-08-27 06:12:44.000000000 +0200 -+++ linux-2.6.12.2_scsi-idle/include/scsi/scsi_device.h 2005-08-27 06:27:09.000000000 +0200 -@@ -125,6 +125,7 @@ - atomic_t ioerr_cnt; - - int timeout; -+ unsigned long idle; /* scsi idle time in jiffers */ - - struct device sdev_gendev; - struct class_device sdev_classdev; -diff -ur linux-2.6.12.2/include/scsi/scsi_ioctl.h linux-2.6.12.2_scsi-idle/include/scsi/scsi_ioctl.h ---- linux-2.6.12.2/include/scsi/scsi_ioctl.h 2005-08-27 06:12:44.000000000 +0200 -+++ linux-2.6.12.2_scsi-idle/include/scsi/scsi_ioctl.h 2005-08-28 17:32:17.000000000 +0200 -@@ -7,6 +7,7 @@ - #define SCSI_IOCTL_SYNC 4 /* Request synchronous parameters */ - #define SCSI_IOCTL_START_UNIT 5 - #define SCSI_IOCTL_STOP_UNIT 6 -+#define SCSI_IOCTL_IDLE 4746 /* get idle time in jiffies */ - /* The door lock/unlock constants are compatible with Sun constants for - the cdrom */ - #define SCSI_IOCTL_DOORLOCK 0x5380 /* lock the eject mechanism */ diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6/91-maclist.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6/91-maclist.patch deleted file mode 100644 index 27af1ea639..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6/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/obsolete/nslu2/nslu2-kernel/2.6/92-nslu2-maclist.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6/92-nslu2-maclist.patch deleted file mode 100644 index c8b8a9bede..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6/92-nslu2-maclist.patch +++ /dev/null @@ -1,80 +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 -@@ -11,8 +11,8 @@ comment "IXP4xx Platforms" - # This entry is placed on top because otherwise it would have - # been shown as a submenu. - config MACH_NSLU2 -- bool -- prompt "NSLU2" if !(MACH_IXDP465 || MACH_IXDPG425 || ARCH_IXDP425 || ARCH_ADI_COYOTE || ARCH_AVILA || ARCH_IXCDP1100 || ARCH_PRPMC1100 || MACH_GTWX5715) -+ bool "NSLU2" -+ select MACLIST - help - Say 'Y' here if you want your kernel to support Linksys's - NSLU2 NAS device. For more information on this platform, ---- 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 -@@ -16,11 +16,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 nslu2_flash_data = { - .map_name = "cfi_probe", - .width = 2, -@@ -112,6 +115,37 @@ static void nslu2_power_off(void) - gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH); - } - -+/* -+ * When the RedBoot partition is added the MAC address is read from -+ * it. -+ */ -+void flash_add(struct mtd_info *mtd) { -+ if (strcmp(mtd->name, "RedBoot") == 0) { -+ size_t retlen; -+ u_char mac[6]; -+ -+ /* The MAC is at a known offset... */ -+ if (mtd->read(mtd, 0x3FFB0, 6, &retlen, mac) == 0 && retlen == 6) { -+ printk(KERN_INFO "NSLU2 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 "NSLU2 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 nslu2_init(void) - { - /* The NSLU2 has a 33MHz crystal on board - 1.01% different -@@ -119,6 +153,11 @@ static void __init nslu2_init(void) - */ - ixp4xx_set_board_tick_rate(66000000); - -+ /* 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 = nslu2_power_off; diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6/compile-switches.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6/compile-switches.patch deleted file mode 100644 index 4b7a688313..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6/compile-switches.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- linux-2.6.11/arch/arm/Makefile.orig 2005-03-20 15:02:07.587138712 -0800 -+++ linux-2.6.11/arch/arm/Makefile 2005-03-20 15:10:36.546765088 -0800 -@@ -33,6 +33,12 @@ - AFLAGS += -mlittle-endian - endif - -+ifeq ($(CONFIG_ARM_THUMB_INTERWORK),y) -+CFLAGS += -mthumb-interwork -+else -+CFLAGS += -mno-thumb-interwork -+endif -+ - comma = , - - # This selects which instruction set is used. -@@ -43,6 +49,8 @@ - arch-$(CONFIG_CPU_32v5) :=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4) - arch-$(CONFIG_CPU_32v4) :=-D__LINUX_ARM_ARCH__=4 -march=armv4 - arch-$(CONFIG_CPU_32v3) :=-D__LINUX_ARM_ARCH__=3 -march=armv3 -+# The following overrides the CPU_32v5 setting if specified -+arch-$(CONFIG_ARCH_XSCALE) :=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=xscale,-march=armv5te) - - # This selects how we optimise for the processor. - tune-$(CONFIG_CPU_ARM610) :=-mtune=arm610 ---- linux-2.6.11/arch/arm/mm/Kconfig.orig 2005-03-20 14:54:07.927058128 -0800 -+++ linux-2.6.11/arch/arm/mm/Kconfig 2005-03-20 15:01:26.727350344 -0800 -@@ -366,6 +366,31 @@ - - If you don't know what this all is, saying Y is a safe choice. - -+config ARM_THUMB_INTERWORK -+ bool "Support Thumb code within the kernel" -+ depends on CPU_ARM720T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 || CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || CPU_XSCALE || CPU_V6 -+ default n -+ help -+ Say Y to compile the whole kernel with support for the interworking -+ of the 16 bit thumb instruction set and 32 bit ARM instruction set. -+ -+ You only need this if some parts of the kernel will be compiled -+ as thumb code, this is not usual. It increases the total kernel -+ size by about 3%. -+ -+config ARCH_XSCALE -+ bool "Use -march=xscale in preference to -march=armv5te" -+ depends on CPU_XSCALE -+ default y -+ help -+ Say yes to ask gcc to use the xscale architecture (instruction set) -+ in preference to armv5te. This allows gcc to use the extra xscale -+ instructions but means the code will not run on a standard (non-xscale) -+ armv5te. At present this makes no difference - gcc 3.4.3 does not -+ generate any xscale specific instructions - however gcc 3.4.3 does -+ generate slightly more optimal instructions if this is specified (this -+ is an error inside gcc 3.4.3 which should be fixed in 4.1.) -+ - config CPU_BIG_ENDIAN - bool "Build big-endian kernel" - depends on ARCH_SUPPORTS_BIG_ENDIAN diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6/ixp4xx-regs.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6/ixp4xx-regs.patch deleted file mode 100644 index 32f7e3ccb8..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6/ixp4xx-regs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.6.11/.pc/2.6.patch/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2005-03-01 23:37:49.000000000 -0800 -+++ linux-2.6.11/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2005-06-17 17:51:32.569981939 -0700 -@@ -52,7 +52,7 @@ - * Expansion BUS Configuration registers - */ - #define IXP4XX_EXP_CFG_BASE_PHYS (0xC4000000) --#define IXP4XX_EXP_CFG_BASE_VIRT (0xFFBFD000) -+#define IXP4XX_EXP_CFG_BASE_VIRT (0xFFBFE000) - #define IXP4XX_EXP_CFG_REGION_SIZE (0x00001000) - - /* diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6/nslu2-io_rpbutton.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6/nslu2-io_rpbutton.patch deleted file mode 100644 index b5ce101d68..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6/nslu2-io_rpbutton.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- nslu2-io.c.old 2da1d3f5c0aa0804c5769588337077ddcb35c5e9 -+++ linux-2.6.12.2/arch/arm/mach-ixp4xx/nslu2-io.c e895da638b4aae16a11fafe52ae0b063645a9a12 -@@ -158,6 +158,8 @@ - #define LED_DISK2 3 - #define LED_ALL 4 - -+static int nslu2_shutdown_in_progress = 0; -+ - static unsigned long init_jiffy = 0; //jiffies at init time - static unsigned long rb_presses = 0; //number of reset button presses - static unsigned long ontime = 50; -@@ -503,40 +505,20 @@ - static irqreturn_t n2pb_handler (int irq, void *dev_id, struct pt_regs *regs) - { - void *ret; -- -- wake_up(&n2pb_waitq); -- remove_proc_entry(PWR_OFF_STR, NULL); //no parent -- n2_buzz(N2_BEEP_PITCH_MED, N2_BEEP_DUR_MED); -- ret = create_proc_entry(PWR_OFF_STR, 0, NULL); -- nslu2_io_debug((KERN_DEBUG "cpe ret = %p\n", ret)); -- --// WARNING: This is RUDE...it unconditionally pulls the power plug. --// Your data will be at risk...since this is just a test system --// I am leaving it enabled...eventually userland needs to get the --// message, do an orderly shutdown and use an ioctl or something in --// /proc/powerdowm to actually have us pull the plug. -- -- machine_power_off(); -- -+ if (!nslu2_shutdown_in_progress++) { -+ wake_up(&n2pb_waitq); -+ remove_proc_entry(PWR_OFF_STR, NULL); //no parent -+ n2_buzz(N2_BEEP_PITCH_HIGH, N2_BEEP_DUR_SHORT); // Short, high-pitched "OK" -+ ret = create_proc_entry(PWR_OFF_STR, 0, NULL); -+ nslu2_io_debug((KERN_DEBUG "Powerbutton pressed. Shutting down. cpe ret = %p\n", ret)); -+ kill_proc(1,SIGINT,1); // Signal init to shut down -+ } else { -+ n2_buzz(N2_BEEP_PITCH_LOW, N2_BEEP_DUR_MED); // Make a scary noise! -+ nslu2_io_debug((KERN_DEBUG "Powerbutton pressed while already in shutdown")); // Whine! -+ } - return IRQ_HANDLED; - } - --//================================================================================================== --// --//static void do_rb_timeout(unsigned long data) --//{ --// int i; --// --// for (i = 0; i < rb_presses; i++) --// n2_buzz(N2_BEEP_PITCH_MED,N2_BEEP_DUR_SHORT); --// return; --//} --// --//================================================================================================== --// does nothing -- waiting for userland to define --// This thing is sorta braindead...edge triggered IRQs aren't available in the drivers yet...so --// we hang in a loop until the button is no longer pressed -- - struct testr { - int ctl; - long param; -@@ -544,72 +526,11 @@ - - static irqreturn_t n2rb_handler (int irq, void *dev_id, struct pt_regs *regs) - { -+// This doesn't reset the NSLU2. It powers it off. Close enough, since reset is unreliable - -- static struct testr test[] = { -- { N2LM_ALL_OFF,0 }, -- { N2LM_ON,0 }, -- { N2LM_OFF,0 }, -- { N2LM_ON,1 }, -- { N2LM_ALL_OFF,1 }, -- { N2LM_ON,2 }, -- { N2LM_OFF,2 }, -- { N2LM_ON,3 }, -- { N2LM_OFF,3 }, -- { N2LM_BLINK,0 }, -- { N2LM_OFF,0 }, -- { N2LM_BLINK,1 }, -- { N2LM_OFF,1 }, -- { N2LM_BLINK,2 }, -- { N2LM_OFF,2 }, -- { N2LM_BLINK,3 }, -- { N2LM_OFF,3 }, -- { N2LM_ALL_OFF,0 }, -- { N2LM_ALT,1 }, -- { N2LM_OFF,1 }, -- { N2LM_ALL_ON,0 } -- }; -- -- nslu2_io_debug(("Reset Entry IRQ =%d Presses = %d Jiffies = %08lx\tIO = %x\tIOW = %x\n", irq, rb_presses, jiffies, (int)_IO('M',rb_presses), (int)_IOW('M',rb_presses,long))); -- - wake_up(&n2rb_waitq); -- while ((*IXP4XX_GPIO_GPINR & GPIO_RB_BM) == 0) -- ; //wait for button release -- -- if (rb_presses > 20) -- rb_presses = 0; -- tone = (rb_presses * 50) + 200; -- ontime = (rb_presses*10) + 100; -- offtime = 500 - (rb_presses*20); -- nslu2_io_debug(("Ontime = %d\tOfftime = %d\tTone = %d\n",ontime,offtime,tone)); -- rb_presses++; -- -- n2bz_ioctl(NULL,NULL, N2BZ_BEEPS, rb_presses); -- n2lm_ioctl(NULL,NULL, test[rb_presses].ctl, test[rb_presses].param); --// if (rb_presses == 0) { --// init_jiffy = jiffies; --// init_timer (&n2rb_timer); --// n2rb_timer.function = do_rb_timeout; --// }; --// --// if (rb_presses == 8) --// rb_presses = 0; --// if (rb_presses & 1) --// n2lm_ledon(test[rb_presses]); --// else --// n2lm_ledoff(test[rb_presses]); --// --// n2rb_timer.expires = (jiffies + RB_DELAY); --// add_timer (&n2rb_timer); --// if (rb_presses < 5) { --// if (rb_presses > 0) --// n2lm_ledoff(rb_presses); --// n2lm_ledon(++rb_presses); --// n2lm_timer_start(rb_presses); --// }; -- -- nslu2_io_debug((KERN_DEBUG "Reset Exit IRQ=%d Presses= %d Jiffies= %08lx\n", irq, rb_presses, jiffies)); -- return IRQ_HANDLED; -- -+ machine_power_off(); -+ return IRQ_HANDLED; // So we don't get a nobody cared error :-P - } - - //================================================================================================== diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6/thumb-swi.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6/thumb-swi.patch deleted file mode 100644 index 2e73bb103f..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6/thumb-swi.patch +++ /dev/null @@ -1,19 +0,0 @@ -# This patch changes the thumb swi handling for any thumb swi with -# an immediate value != 0, those swis are mapped into the arm -# specific swis. This implements a thumb breakpoint swi. ---- linux-2.6.12.2/arch/arm/kernel/entry-common.S.orig 2005-09-19 12:48:42.323365573 -0700 -+++ linux-2.6.12.2/arch/arm/kernel/entry-common.S 2005-09-19 13:31:19.004247358 -0700 -@@ -137,8 +137,11 @@ - */ - #ifdef CONFIG_ARM_THUMB - tst r8, #PSR_T_BIT @ this is SPSR from save_user_regs -- addne scno, r7, #__NR_SYSCALL_BASE @ put OS number in -- ldreq scno, [lr, #-4] -+ ldrneh ip, [lr, #-2] @ thumb swi instruction -+ ldreq scno, [lr, #-4] @ arm swi instruction -+ addne scno, r7, #__NR_SYSCALL_BASE @ put OS number in to thumb r7 value -+ bicnes ip, ip, #0xff00 @ clear thumb swi bits -+ addne scno, ip, #__ARM_NR_BASE @ thumb swi0->r7, swi!0->arm swi - #else - ldr scno, [lr, #-4] @ get SWI instruction - #endif diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6/timer.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6/timer.patch deleted file mode 100644 index 6279746e64..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6/timer.patch +++ /dev/null @@ -1,24 +0,0 @@ -# Fix for the NSLU2 timer problem (tickadj 10101.01 when it should be 10000) -# Also contains a fix for the more generate problem on the ixp4xx in that the -# Intel spec says to use a 33.33MHz crystal, not 33.333333Mhz - ---- linux-2.6.12.2/include/asm-arm/arch-ixp4xx/timex.h.orig 2005-08-05 11:02:09.872690723 -0700 -+++ linux-2.6.12.2/include/asm-arm/arch-ixp4xx/timex.h 2005-08-05 11:45:08.786971567 -0700 -@@ -7,7 +7,14 @@ - - /* - * We use IXP425 General purpose timer for our timer needs, it runs at -- * 66.66... MHz -+ * 66.66 MHz (exactly) by the Intel specification. - */ --#define CLOCK_TICK_RATE (66666666) -- -+#if 0 -+#define CLOCK_TICK_RATE (66660000) -+#else -+/* -+ * Unfortunately the NSLU2 has a 33MHz crystal, so the rate is not the -+ * specified one. -+ */ -+#define CLOCK_TICK_RATE (66000000) -+#endif diff --git a/packages/obsolete/nslu2/nslu2-kernel/2.6/x1205-rtc.patch b/packages/obsolete/nslu2/nslu2-kernel/2.6/x1205-rtc.patch deleted file mode 100644 index 913f44e2ae..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/2.6/x1205-rtc.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- linux-2.6.11/.pc/2.6.patch/drivers/i2c/chips/Kconfig 2005-06-17 17:51:28.635578329 -0700 -+++ linux-2.6.11/drivers/i2c/chips/Kconfig 2005-06-17 17:51:32.565982545 -0700 -@@ -430,6 +430,15 @@ - - This driver can also be built as a module. If so, the module - will be called isp1301_omap. -+config SENSORS_X1205 -+ tristate "Xicor X1205 RTC chip" -+ depends on I2C && EXPERIMENTAL -+ select I2C_SENSOR -+ help -+ If you say yes here you get support for the Xicor x1205 RTC chip. -+ -+ This driver can also be built as a module. If so, the module -+ will be called x1205-rtc - - config SENSORS_M41T00 - tristate "ST M41T00 RTC chip" ---- linux-2.6.11/.pc/2.6.patch/drivers/i2c/chips/Makefile 2005-06-17 17:51:28.636578177 -0700 -+++ linux-2.6.11/drivers/i2c/chips/Makefile 2005-06-17 17:51:32.566982394 -0700 -@@ -41,6 +41,7 @@ - obj-$(CONFIG_SENSORS_VIA686A) += via686a.o - obj-$(CONFIG_SENSORS_W83L785TS) += w83l785ts.o - obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o -+obj-$(CONFIG_SENSORS_X1205) += x1205-rtc.o - - ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) - EXTRA_CFLAGS += -DDEBUG ---- linux-2.6.11/.pc/2.6.patch/include/linux/i2c-id.h 2005-06-17 17:51:31.358165630 -0700 -+++ linux-2.6.11/include/linux/i2c-id.h 2005-06-17 17:51:32.569981939 -0700 -@@ -108,6 +108,7 @@ - #define I2C_DRIVERID_TDA7313 62 /* TDA7313 audio processor */ - #define I2C_DRIVERID_MAX6900 63 /* MAX6900 real-time clock */ - #define I2C_DRIVERID_SAA7114H 64 /* video decoder */ -+#define I2C_DRIVERID_X1205 0xF0 - - - #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ diff --git a/packages/obsolete/nslu2/nslu2-kernel/files/.mtn2git_empty b/packages/obsolete/nslu2/nslu2-kernel/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/files/.mtn2git_empty +++ /dev/null diff --git a/packages/obsolete/nslu2/nslu2-kernel/files/anonymiser.patch b/packages/obsolete/nslu2/nslu2-kernel/files/anonymiser.patch deleted file mode 100644 index 3384b15fe2..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel/files/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/obsolete/nslu2/nslu2-kernel_2.6.14-mm1.bb b/packages/obsolete/nslu2/nslu2-kernel_2.6.14-mm1.bb deleted file mode 100644 index dff6b0e4b0..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel_2.6.14-mm1.bb +++ /dev/null @@ -1,38 +0,0 @@ -# Kernel for NSLU2 -# -# Increment PR_CONFIG for changes to the nslu2-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 = "r1.${PR_CONFIG}" - -require nslu2-kernel.inc - -# N2K_PATCHES - full list of patches to apply -N2K_PATCHES = "\ - file://00-memory-h-page-shift.patch;patch=1 \ - file://90-ixp4xx-pci-le.patch;patch=1 \ - file://18-ixp4xx-io-h-addr.patch;patch=1 \ - file://19-jffs2-force-be.patch;patch=1 \ - file://20-timer.patch;patch=1 \ - file://29-ipv4-route-c-spinlock.patch;patch=1 \ - file://30-i2c-x1205-mm1.patch;patch=1 \ - file://50-nslu2-arch.patch;patch=1 \ - file://55-nslu2-rtc.patch;patch=1 \ - file://60-nslu2-beeper.patch;patch=1 \ - file://70-nslu2-io.patch;patch=1 \ - file://75-nslu2-leds.patch;patch=1 \ - file://80-nslu2-class-device-create.patch;patch=1 \ - file://90-pegasus.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 nslu2-kernel.inc) -CMDLINE_KERNEL_OPTIONS = "x1205.hctosys=1" diff --git a/packages/obsolete/nslu2/nslu2-kernel_2.6.14.5.bb b/packages/obsolete/nslu2/nslu2-kernel_2.6.14.5.bb deleted file mode 100644 index b7790be8be..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel_2.6.14.5.bb +++ /dev/null @@ -1,42 +0,0 @@ -# Kernel for NSLU2 -# -# Increment PR_CONFIG for changes to the nslu2-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 = "r0.${PR_CONFIG}" - -require nslu2-kernel.inc - -# N2K_PATCHES - full list of patches to apply -N2K_PATCHES = "\ - file://90-ixp4xx-pci-le.patch;patch=1 \ - file://10-ixp4xx-copy-from.patch;patch=1 \ - file://10-ixp4xx-le.patch;patch=1 \ - file://10-mtdpart-redboot-fis-byteswap.patch;patch=1 \ - file://15-ixp4xx-writesb-l-w.patch;patch=1 \ - file://18-ixp4xx-io-h-addr.patch;patch=1 \ - file://19-jffs2-force-be.patch;patch=1 \ - file://29-ipv4-route-c-spinlock.patch;patch=1 \ - file://30-i2c-x1205.patch;patch=1 \ - file://50-nslu2-arch.patch;patch=1 \ - file://55-nslu2-rtc.patch;patch=1 \ - file://60-nslu2-beeper.patch;patch=1 \ - file://70-nslu2-io.patch;patch=1 \ - file://75-nslu2-leds.patch;patch=1 \ - file://90-pegasus.patch;patch=1 \ - file://20-timer.patch;patch=1 \ - file://91-maclist.patch;patch=1 \ - file://92-nslu2-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 nslu2-kernel.inc) -CMDLINE_KERNEL_OPTIONS = "x1205.hctosys=1" diff --git a/packages/obsolete/nslu2/nslu2-kernel_2.6.15.bb b/packages/obsolete/nslu2/nslu2-kernel_2.6.15.bb deleted file mode 100644 index 68b2b56f1a..0000000000 --- a/packages/obsolete/nslu2/nslu2-kernel_2.6.15.bb +++ /dev/null @@ -1,35 +0,0 @@ -# Kernel for NSLU2 -# -# Increment PR_CONFIG for changes to the nslu2-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 = "r3.${PR_CONFIG}" - -require nslu2-kernel.inc - -# N2K_PATCHES - full list of patches to apply -N2K_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://40-scsi-idle.patch;patch=1 \ - file://60-nslu2-beeper.patch;patch=1 \ - file://75-nslu2-leds.patch;patch=1 \ - file://80-nslu2-io.patch;patch=1 \ - file://85-timer.patch;patch=1 \ - file://91-maclist.patch;patch=1 \ - file://92-nslu2-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 nslu2-kernel.inc) -CMDLINE_KERNEL_OPTIONS = "rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f" diff --git a/packages/pam/libpam_0.79.bb b/packages/pam/libpam_0.79.bb index c19d0ff9c8..14dab423f8 100644 --- a/packages/pam/libpam_0.79.bb +++ b/packages/pam/libpam_0.79.bb @@ -17,7 +17,7 @@ Administrators' Guide." HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam" SECTION = "libs" PRIORITY = "optional" -LICENSE = "GPL-2" +LICENSE = "GPLv2" PR = "r1" # The project is actually called Linux-PAM but that gives diff --git a/packages/reiser4progs/reiser4progs_1.0.4.bb b/packages/reiser4progs/reiser4progs_1.0.4.bb index 8185b8df89..c54b2f1ba4 100644 --- a/packages/reiser4progs/reiser4progs_1.0.4.bb +++ b/packages/reiser4progs/reiser4progs_1.0.4.bb @@ -5,7 +5,7 @@ PR = "r1" DESCRIPTION = "User-level tools for Reiser4 filesystems" HOMEPAGE = "http://www.namesys.com" SECTION = "base" -LICENSE = "GPL-2" +LICENSE = "GPLv2" SRC_URI = "ftp://ftp.namesys.com/pub/${PN}/old-versions/${P}.tar.gz \ file://oid40.c.patch;patch=1 \ diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb new file mode 100644 index 0000000000..c25dcd973f --- /dev/null +++ b/packages/tasks/task-slugos.bb @@ -0,0 +1,51 @@ +# 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 = "Task packages for the SlugOS distribution" +HOMEPAGE = "http://www.nslu2-linux.org" +LICENSE = "MIT" +PR = "r2" +PACKAGE_ARCH = "${MACHINE_ARCH}" +ALLOW_EMPTY = "1" + +# CONFIG: +# SLUGOS_EXTRA_RDEPENDS: set in conf, things to add to the image +# SLUGOS_SUPPORT: set here, see below, added to the image. +# SLUGOS_KERNEL: set here, kernel modules added to the image +# +# Do not override the last two unless you really know what you +# are doing - there is more information below. + +# diff, cpio and find are required for reflash and turnup ram. +# Removing these probably leaves the system bootable, but standard +# openslug and ucslugc stuff won't work, so only take these out in +# very non-standard turnkey slugos builds. +# +# udev is the default way of handling devices, there is no guarantee +# that the static device table is completely correct (it is just +# known to be sufficient for boot.) +SLUGOS_SUPPORT ?= "diffutils cpio findutils udev" + +SLUGOS_KERNEL ?= "" + +SLUGOS_EXTRA_RDEPENDS ?= "" + +RDEPENDS = "kernel ixp4xx-npe \ + base-files base-passwd netbase \ + busybox initscripts-slugos slugos-init \ + update-modules sysvinit tinylogin \ + module-init-tools modutils-initscripts \ + ipkg-collateral ipkg ipkg-link \ + portmap \ + dropbear \ + beep \ + e2fsprogs-blkid \ + util-linux-mount \ + util-linux-umount \ + util-linux-swaponoff \ + util-linux-losetup \ + ${SLUGOS_SUPPORT} \ + ${SLUGOS_KERNEL} \ + ${SLUGOS_EXTRA_RDEPENDS}" diff --git a/packages/texmaker/texmaker_1.3.bb b/packages/texmaker/texmaker_1.3.bb index 7f14e90b34..5682338f31 100644 --- a/packages/texmaker/texmaker_1.3.bb +++ b/packages/texmaker/texmaker_1.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "TeXmaker is a free cross-platform LaTeX editor" HOMEPAGE = "http://www.xm1math.net/texmaker" -SECTION = "x11/apps" +SECTION = "x11/applications" LICENSE = "GPL" SRC_URI = "http://www.xm1math.net/texmaker/texmaker-${PV}.tar.bz2" diff --git a/packages/treecc/treecc_0.3.6.bb b/packages/treecc/treecc_0.3.6.bb index 9a6c7c8eda..e54beb4810 100644 --- a/packages/treecc/treecc_0.3.6.bb +++ b/packages/treecc/treecc_0.3.6.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Tree Compiler-Compiler from dotGNU" SECTION = "devel" -LICENSE = "GPL-2" +LICENSE = "GPLv2" HOMEPAGE = "http://www.southern-storm.com.au/treecc.html" PRIORITY = "optional" diff --git a/packages/uboot-utils/uboot-utils_1.1.2.bb b/packages/uboot-utils/uboot-utils_1.1.2.bb index 638f1cb713..3bcf1eba6c 100644 --- a/packages/uboot-utils/uboot-utils_1.1.2.bb +++ b/packages/uboot-utils/uboot-utils_1.1.2.bb @@ -1,4 +1,5 @@ DESCRIPTION = "U-boot bootloader OS env. access tools for PPC" +SECTION = "bootloaders" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "mtd-utils" diff --git a/packages/uboot/u-boot.inc b/packages/uboot/u-boot.inc new file mode 100644 index 0000000000..3b26e55f1b --- /dev/null +++ b/packages/uboot/u-boot.inc @@ -0,0 +1,30 @@ +DESCRIPTION = "U-boot bootloader" +HOMEPAGE = "http://u-boot.sf.net" +SECTION = "bootloaders" +PRIORITY = "optional" +LICENSE = "GPL" +PROVIDES = "virtual/bootloader" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" + +UBOOT_MACHINE ?= "${MACHINE}_config" +UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" + +do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + oe_runmake ${UBOOT_MACHINE} + oe_runmake all +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} +} +do_deploy[dirs] = "${S}" +addtask deploy before do_build after do_compile + +do_stage() { + install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE} +} diff --git a/packages/uboot/u-boot_1.1.2.bb b/packages/uboot/u-boot_1.1.2.bb index 6b87cf9c05..cefaa9b1a1 100644 --- a/packages/uboot/u-boot_1.1.2.bb +++ b/packages/uboot/u-boot_1.1.2.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "U-boot bootloader" -PROVIDES = "virtual/bootloader" -SECTION = "bootloader" -PRIORITY = "optional" -LICENSE = "GPL" +require u-boot.inc SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ file://arm_flags.patch;patch=1 " @@ -13,13 +9,10 @@ SRC_URI_append_mnci = "file://mnci.patch;patch=1 \ file://command-names.patch;patch=1" # TODO: SRC_URI_append_rt3000 -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" TARGET_LDFLAGS = "" -UBOOT_MACHINE ?= "${MACHINE}_config" UBOOT_MACHINE_mnci = "mnci_config" UBOOT_MACHINE_vibren = "pxa255_idp_config" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" inherit base @@ -28,18 +21,6 @@ do_compile () { oe_runmake all } -do_stage() { - install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE} -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} -} -do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile - - ######################################################### RDEPENDS_append_mnci = " hwctrl" diff --git a/packages/uboot/u-boot_1.1.4.bb b/packages/uboot/u-boot_1.1.4.bb index ca6baece4c..5c158f2401 100644 --- a/packages/uboot/u-boot_1.1.4.bb +++ b/packages/uboot/u-boot_1.1.4.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "U-boot bootloader" -PROVIDES = "virtual/bootloader" -SECTION = "bootloader" -PRIORITY = "optional" -LICENSE = "GPL" +require u-boot.inc DEFAULT_PREFERENCE = "-1" @@ -30,13 +26,9 @@ SRC_URI_append_dht-walnut= "\ file://u-boot-dht-walnut-df2.patch;patch=1" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" EXTRA_OEMAKE_gumstix = "CROSS_COMPILE=${TARGET_PREFIX} GUMSTIX_400MHZ=${GUMSTIX_400MHZ}" TARGET_LDFLAGS = "" -UBOOT_MACHINE ?= "${MACHINE}_config" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" - UBOOT_MACHINE_dht-walnut = "walnut_config" def gumstix_mhz(d): @@ -55,14 +47,3 @@ do_compile () { oe_runmake ${UBOOT_MACHINE} oe_runmake all } - -do_stage() { - install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE} -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} -} -do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile diff --git a/packages/uboot/u-boot_1.1.6.bb b/packages/uboot/u-boot_1.1.6.bb index bfd0fb8132..7bd09c6f35 100644 --- a/packages/uboot/u-boot_1.1.6.bb +++ b/packages/uboot/u-boot_1.1.6.bb @@ -1,36 +1,8 @@ -DESCRIPTION = "U-boot bootloader" -PROVIDES = "virtual/bootloader" -SECTION = "bootloader" -PRIORITY = "optional" -LICENSE = "GPL" +require u-boot.inc PR = "r1" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2 \ file://devkit-idp.patch;patch=1" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" - -UBOOT_MACHINE ?= "${MACHINE}_config" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" - PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_compile () { - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - oe_runmake ${UBOOT_MACHINE} - oe_runmake all -} - -do_stage() { - install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE} -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} -} -do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile diff --git a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb index 361d9c876b..c29aba7cd5 100644 --- a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb +++ b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "U-boot bootloader" -PROVIDES = "virtual/bootloader" -SECTION = "bootloader" -PRIORITY = "optional" -LICENSE = "GPL" +require u-boot.inc PR = "r2" @@ -16,31 +12,6 @@ SRC_URI_append_navman-icn330 = " http://www.duff.dk/navman/navman-u-boot-2006-30 S = "${WORKDIR}/git" -#EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS=""" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" - -UBOOT_MACHINE ?= "${MACHINE}_config" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" - PACKAGE_ARCH = "${MACHINE_ARCH}" #inherit base - -do_compile () { - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - oe_runmake ${UBOOT_MACHINE} - oe_runmake all -} - -do_stage() { - install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE} -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} -} -do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile diff --git a/packages/uboot/u-boot_git.bb b/packages/uboot/u-boot_git.bb index fa59bab085..9362b62041 100644 --- a/packages/uboot/u-boot_git.bb +++ b/packages/uboot/u-boot_git.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "U-boot bootloader" -PROVIDES = "virtual/bootloader" -SECTION = "bootloader" -PRIORITY = "optional" -LICENSE = "GPL" +require u-boot.inc DEFAULT_PREFERENCE = "-1" @@ -10,31 +6,6 @@ SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " S = "${WORKDIR}/git" -#EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS=""" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" - -UBOOT_MACHINE ?= "${MACHINE}_config" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" - PACKAGE_ARCH = "${MACHINE_ARCH}" #inherit base - -do_compile () { - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - oe_runmake ${UBOOT_MACHINE} - oe_runmake all -} - -do_stage() { - install -m 755 tools/mkimage ${STAGING_BINDIR_NATIVE} -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} -} -do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile diff --git a/packages/upslug/upslug-native_1.0.bb b/packages/upslug/upslug-native_1.0.bb index 729f176a75..02c41eb42b 100644 --- a/packages/upslug/upslug-native_1.0.bb +++ b/packages/upslug/upslug-native_1.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "NSLU2 binary upload tool" HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug" SECTION = "console/network" PRIORITY = "optional" -LICENSE = "GPL-2" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "nslu2" SRC_TAG = "UPSLUG_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}" diff --git a/packages/upslug/upslug-native_cvs.bb b/packages/upslug/upslug-native_cvs.bb index 95b340c589..e0d7f2b708 100644 --- a/packages/upslug/upslug-native_cvs.bb +++ b/packages/upslug/upslug-native_cvs.bb @@ -5,7 +5,7 @@ DESCRIPTION = "NSLU2 binary upload tool" HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug" SECTION = "console/network" PRIORITY = "optional" -LICENSE = "GPL-2" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "nslu2" # Use releases in preference diff --git a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb index b322350e03..0787a7ced7 100644 --- a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "X mkfontdir app" -SECTION = "x11/apps" +SECTION = "x11/applications" LICENSE = "MIT-X" S="${WORKDIR}/mkfontdir-${PV}" diff --git a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb index 3ec30fde48..0eb85010b9 100644 --- a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb +++ b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb @@ -1,5 +1,5 @@ DESCRIPTION = "X mkfontdir app" -SECTION = "x11/apps" +SECTION = "x11/applications" LICENSE = "MIT-X" S="${WORKDIR}/mkfontdir-${PV}" diff --git a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb index 051a9e5f63..5bbab6a5fd 100644 --- a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb +++ b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "X mkfontscale app" -SECTION = "x11/apps" +SECTION = "x11/applications" LICENSE = "MIT-X" S="${WORKDIR}/mkfontscale-${PV}" diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc index 27a1dd2bfa..b2a73f9ca8 100644 --- a/packages/xorg-app/xorg-app-common.inc +++ b/packages/xorg-app/xorg-app-common.inc @@ -1,6 +1,6 @@ DESCRIPTION = "X application" HOMEPAGE = "http://www.x.org" -SECTION = "x11/apps" +SECTION = "x11/applications" LICENSE = "MIT-X" #DEPENDS = "" diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb index b1291037b4..5d02234b35 100644 --- a/packages/xorg-app/xterm_207.bb +++ b/packages/xorg-app/xterm_207.bb @@ -1,5 +1,5 @@ DESCRIPTION = "xterm app" -SECTION = "x11/apps" +SECTION = "x11/applications" LICENSE = "MIT-X" DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau libxpm ncurses" diff --git a/packages/yeaphone/yeaphone_0.1.bb b/packages/yeaphone/yeaphone_0.1.bb index d17e8c2fcf..e1e06d52e9 100644 --- a/packages/yeaphone/yeaphone_0.1.bb +++ b/packages/yeaphone/yeaphone_0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A VoIP SIP phone for the Yealink USB handset" HOMEPAGE = "http://www.devbase.at/voip/" MAINTAINER = "Thomas Reitmayr <treitmayr@yahoo.com>" -LICENSE = "GPL-2" +LICENSE = "GPLv2" PRIORITY = "optional" DEPENDS = "liblinphone" RDEPENDS = "liblinphone" |