On Sun, Jul 19, 2009 at 07:00:05PM +0200, Dominik Brodowski wrote: > Hey Colin, Per, > > pcmciautils (014-4) contains a few patches of interest for upstream -- e.g. > it the config files for hppa and ppc. Could you re-base to 015 and send me > the patches (as usual, with Signed-off-by-lines...), please?
Sorry for the delay in responding. Here are some config.opts improvements against git head. Thanks, -- Colin Watson [cjwat...@debian.org]
>From c7db6c770dd9446ffbf2a0c941aacad385e1712f Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwat...@debian.org> Date: Tue, 5 Jan 2010 12:05:15 +0000 Subject: [PATCH 1/3] Add config.opts for powerpc Originally from the PCMCIA-HOWTO (http://pcmcia-cs.sourceforge.net/ftp/doc/PCMCIA-HOWTO-1.html#ss1.12), via Debian's pcmcia-cs package thanks to Per Olofsson. See http://bugs.debian.org/242069. Signed-off-by: Colin Watson <cjwat...@debian.org> --- config/config.opts.ppc | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) create mode 100644 config/config.opts.ppc diff --git a/config/config.opts.ppc b/config/config.opts.ppc new file mode 100644 index 0000000..29b6b86 --- /dev/null +++ b/config/config.opts.ppc @@ -0,0 +1,21 @@ +# +# Local PCMCIA Configuration File +# +#---------------------------------------------------------------------- +# +# System resources available for PCMCIA cards +# +# NOTE: these settings have no effect on resources assigned to a +# CardBus bridge device itself; this file only affects resources +# assigned to cards. Also, interrupt settings here will only affect +# ISA bus interrupts assigned to 16-bit cards. PCI interrupts +# generally can't be reconfigured. +# +# With the kernel PCMCIA subsystem, these settings also have no effect +# at all on resources used for 32-bit CardBus cards. Those are set by +# the PCI hotplug subsystem. +# + +include port 0x100-0x4ff +include port 0x1000-0x17ff +include memory 0x80000000-0x80ffffff -- 1.6.5.7
>From 193712e6b992029509ff7b2c9690fdba48cc82ed Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwat...@debian.org> Date: Tue, 5 Jan 2010 12:09:39 +0000 Subject: [PATCH 2/3] Add config.opts for hppa Apparently originally by James Bottomley, included by Per Olofsson in Debian's pcmcia-cs package starting from version 3.2.5-6. Signed-off-by: Colin Watson <cjwat...@debian.org> --- config/config.opts.hppa | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) create mode 100644 config/config.opts.hppa diff --git a/config/config.opts.hppa b/config/config.opts.hppa new file mode 100644 index 0000000..849ceb6 --- /dev/null +++ b/config/config.opts.hppa @@ -0,0 +1,29 @@ +# +# Local PCMCIA Configuration File +# +#---------------------------------------------------------------------- +# +# System resources available for PCMCIA cards +# +# NOTE: these settings have no effect on resources assigned to a +# CardBus bridge device itself; this file only affects resources +# assigned to cards. Also, interrupt settings here will only affect +# ISA bus interrupts assigned to 16-bit cards. PCI interrupts +# generally can't be reconfigured. +# +# With the kernel PCMCIA subsystem, these settings also have no effect +# at all on resources used for 32-bit CardBus cards. Those are set by +# the PCI hotplug subsystem. +# + +# Allow all the dino/cujo port ranges (usually we get the first one) +# NOTE: the address range for this is a signed short (hence the upper +# limit is 0x7fff). If the PCMCIA card isn't on the dino/cujo bus +# which has been assigned this range, you're out of luck. In +# particular, PCMCIA won't work in a box with an EISA subsystem +# because that claims 0-0xffff. +include port 0x0-0x7fff + +# Allow all parisc I/O space +include memory 0xf0000000-0xffffffff + -- 1.6.5.7
>From 2a7642bf0607a31f08a8cda4b6babfaf639bcfb6 Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwat...@debian.org> Date: Tue, 5 Jan 2010 12:11:13 +0000 Subject: [PATCH 3/3] Use architecture-specific config.opts if it exists Originally by Per Olofsson <pe...@debian.org>. Signed-off-by: Colin Watson <cjwat...@debian.org> --- Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index f4acfb3..e7ff190 100644 --- a/Makefile +++ b/Makefile @@ -297,6 +297,9 @@ uninstall-tools: install-config: $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts + if [ -f config/config.opts.$(ARCH) ]; then + $(INSTALL_DATA) -D config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ + fi uninstall-config: # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts -- 1.6.5.7
_______________________________________________ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
