diff options
Diffstat (limited to 'package/pcmcia-cs')
| -rw-r--r-- | package/pcmcia-cs/Makefile | 68 | ||||
| -rw-r--r-- | package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch | 13 | ||||
| -rw-r--r-- | package/pcmcia-cs/patches/002-serial-cardctl_path.patch | 11 | ||||
| -rw-r--r-- | package/pcmcia-cs/patches/003-cardmgr_c.patch | 41 | ||||
| -rw-r--r-- | package/pcmcia-cs/patches/004-pcmcia_resources.patch | 19 |
5 files changed, 0 insertions, 152 deletions
diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile deleted file mode 100644 index 384394b612..0000000000 --- a/package/pcmcia-cs/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=pcmcia-cs -PKG_VERSION:=3.2.8 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5 - -include $(INCLUDE_DIR)/package.mk - -define Package/pcmcia-cs - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=@LINUX_2_4 @PCMCIA_SUPPORT - TITLE:=PCMCIA/Cardbus management utilities - URL:=http://pcmcia-cs.sourceforge.net/ -endef - -$(STAMP_CONFIGURED): $(LINUX_DIR)/.config - -define Build/Configure - ( cd $(PKG_BUILD_DIR); \ - ./Configure \ - --noprompt \ - --kernel="$(LINUX_DIR)" \ - --target="$(PKG_INSTALL_DIR)" \ - --arch="$(ARCH)" \ - --ucc="$(TARGET_CC)" \ - --uflags="$(TARGET_CFLAGS)" \ - --srctree \ - --cardbus \ - --noapm \ - --nopnp \ - --notrust \ - --nox11 \ - --rcdir="/etc" \ - --sysv \ - ) -endef - -define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(call Build/Compile/Default, \ - CFLAGS="$(TARGET_CFLAGS)" \ - all install \ - ) -endef - -define Package/pcmcia-cs/install - $(INSTALL_DIR) $(1)/etc - $(CP) $(PKG_INSTALL_DIR)/etc/pcmcia $(1)/etc/ - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/ -endef - -$(eval $(call BuildPackage,pcmcia-cs)) diff --git a/package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch b/package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch deleted file mode 100644 index 0d1b133393..0000000000 --- a/package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/etc/config -+++ b/etc/config -@@ -2413,6 +2413,10 @@ card "Xircom RBM56G Modem" - pci 0x115d, 0x0101 - bind "serial_cb" - -+card "Novatel Wireless - Merlin U630 UMTS Modem" -+ manfid 0x00a4, 0x0276 -+ bind "serial_cs" to 0, "serial_cs" to 1 -+ - # Include configuration files for add-on drivers - - source ./*.conf diff --git a/package/pcmcia-cs/patches/002-serial-cardctl_path.patch b/package/pcmcia-cs/patches/002-serial-cardctl_path.patch deleted file mode 100644 index ec8603224d..0000000000 --- a/package/pcmcia-cs/patches/002-serial-cardctl_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/etc/shared -+++ b/etc/shared -@@ -167,7 +167,7 @@ get_info () - STAB=/var/run/stab - fi - grep_stab $1 < $STAB || usage -- eval `/sbin/cardctl info $SOCKET` -+ eval `/usr/sbin/cardctl info $SOCKET` - fi - } - diff --git a/package/pcmcia-cs/patches/003-cardmgr_c.patch b/package/pcmcia-cs/patches/003-cardmgr_c.patch deleted file mode 100644 index 716a0b26b9..0000000000 --- a/package/pcmcia-cs/patches/003-cardmgr_c.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/cardmgr/cardmgr.c -+++ b/cardmgr/cardmgr.c -@@ -739,10 +739,7 @@ static int try_insmod(char *mod, char *o - int ret; - - strcpy(cmd, "insmod "); -- if (strchr(mod, '/') != NULL) -- sprintf(cmd+7, "%s/%s.o", modpath, mod); -- else -- sprintf(cmd+7, "%s/pcmcia/%s.o", modpath, mod); -+ sprintf(cmd+7, "%s/%s.o", modpath, mod); - if (access(cmd+7, R_OK) != 0) { - syslog(LOG_NOTICE, "module %s not available", cmd+7); - free(cmd); -@@ -808,11 +805,13 @@ static void install_module(char *mod, ch - } - - if (do_modprobe) { -- if (try_modprobe(mod, opts) != 0) -+ if (try_modprobe(mod, opts) != 0) { - try_insmod(mod, opts); -+ } - } else { -- if (try_insmod(mod, opts) != 0) -+ if (try_insmod(mod, opts) != 0) { - try_modprobe(mod, opts); -+ } - } - } - -@@ -1113,8 +1112,9 @@ static void do_remove(int sn) - - /* remove kernel modules in inverse order */ - for (i = 0; i < card->bindings; i++) { -- for (j = dev[i]->modules-1; j >= 0; j--) -+ for (j = dev[i]->modules-1; j >= 0; j--) { - remove_module(dev[i]->module[j]); -+ } - free_device(dev[i]); - } - /* Remove any MTD's bound to this socket */ diff --git a/package/pcmcia-cs/patches/004-pcmcia_resources.patch b/package/pcmcia-cs/patches/004-pcmcia_resources.patch deleted file mode 100644 index 4ce0de20be..0000000000 --- a/package/pcmcia-cs/patches/004-pcmcia_resources.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/etc/config.opts -+++ b/etc/config.opts -@@ -17,14 +17,13 @@ - # - - include port 0x100-0x4ff, port 0x800-0x8ff, port 0xc00-0xcff --include memory 0xc0000-0xfffff --include memory 0xa0000000-0xa0ffffff, memory 0x60000000-0x60ffffff -+include memory 0x40004000-0x40007fff - - # High port numbers do not always work... - # include port 0x1000-0x17ff - - # Extra port range for IBM Token Ring --include port 0xa00-0xaff -+# include port 0xa00-0xaff - - # Resources we should not use, even if they appear to be available - |