MFC r289626: Update firmware images for Qlogic 24xx/25xx from 5.5.0 to 7.3.0.
This also removes separate "_multi" images, since this funcationality is now in base, and there is simply no new images without it for years.
This commit is contained in:
mav
parent
8a80adfe14
commit
e8de4f451a
@ -899,9 +899,6 @@ isp_pci_attach(device_t dev)
|
||||
if (IS_SCSI(isp) && (ISP_SPI_PC(isp, 0)->def_role & ISP_ROLE_TARGET)) {
|
||||
snprintf(fwname, sizeof (fwname), "isp_%04x_it", did);
|
||||
isp->isp_osinfo.fw = firmware_get(fwname);
|
||||
} else if (IS_24XX(isp)) {
|
||||
snprintf(fwname, sizeof (fwname), "isp_%04x_multi", did);
|
||||
isp->isp_osinfo.fw = firmware_get(fwname);
|
||||
}
|
||||
if (isp->isp_osinfo.fw == NULL) {
|
||||
snprintf(fwname, sizeof (fwname), "isp_%04x", did);
|
||||
|
||||
42700
sys/dev/ispfw/asm_2400.h
42700
sys/dev/ispfw/asm_2400.h
File diff suppressed because it is too large
Load Diff
40781
sys/dev/ispfw/asm_2500.h
40781
sys/dev/ispfw/asm_2500.h
File diff suppressed because it is too large
Load Diff
@ -51,9 +51,7 @@ __FBSDID("$FreeBSD$");
|
||||
#define ISP_2300 1
|
||||
#define ISP_2322 1
|
||||
#define ISP_2400 1
|
||||
#define ISP_2400_MULTI 1
|
||||
#define ISP_2500 1
|
||||
#define ISP_2500_MULTI 1
|
||||
#endif
|
||||
|
||||
#ifndef MODULE_NAME
|
||||
@ -88,10 +86,10 @@ __FBSDID("$FreeBSD$");
|
||||
#if defined(ISP_2322)
|
||||
#include <dev/ispfw/asm_2322.h>
|
||||
#endif
|
||||
#if defined(ISP_2400) || defined(ISP_2400_MULTI)
|
||||
#if defined(ISP_2400)
|
||||
#include <dev/ispfw/asm_2400.h>
|
||||
#endif
|
||||
#if defined(ISP_2500) || defined(ISP_2500_MULTI)
|
||||
#if defined(ISP_2500)
|
||||
#include <dev/ispfw/asm_2500.h>
|
||||
#endif
|
||||
|
||||
@ -131,15 +129,9 @@ static int isp_2322_loaded;
|
||||
#if defined(ISP_2400)
|
||||
static int isp_2400_loaded;
|
||||
#endif
|
||||
#if defined(ISP_2400_MULTI)
|
||||
static int isp_2400_multi_loaded;
|
||||
#endif
|
||||
#if defined(ISP_2500)
|
||||
static int isp_2500_loaded;
|
||||
#endif
|
||||
#if defined(ISP_2500_MULTI)
|
||||
static int isp_2500_multi_loaded;
|
||||
#endif
|
||||
|
||||
#define ISPFW_VERSION 1
|
||||
|
||||
@ -219,15 +211,9 @@ do_load_fw(void)
|
||||
#if defined(ISP_2400)
|
||||
RMACRO(isp_2400);
|
||||
#endif
|
||||
#if defined(ISP_2400_MULTI)
|
||||
RMACRO(isp_2400_multi);
|
||||
#endif
|
||||
#if defined(ISP_2500)
|
||||
RMACRO(isp_2500);
|
||||
#endif
|
||||
#if defined(ISP_2500_MULTI)
|
||||
RMACRO(isp_2500_multi);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
@ -270,15 +256,9 @@ do_unload_fw(void)
|
||||
#if defined(ISP_2400)
|
||||
UMACRO(isp_2400);
|
||||
#endif
|
||||
#if defined(ISP_2400_MULTI)
|
||||
UMACRO(isp_2400_multi);
|
||||
#endif
|
||||
#if defined(ISP_2500)
|
||||
UMACRO(isp_2500);
|
||||
#endif
|
||||
#if defined(ISP_2500_MULTI)
|
||||
UMACRO(isp_2500_multi);
|
||||
#endif
|
||||
}
|
||||
|
||||
static int
|
||||
@ -328,12 +308,8 @@ DECLARE_MODULE(isp_2300, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
DECLARE_MODULE(isp_2322, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
#elif defined(ISP_2400)
|
||||
DECLARE_MODULE(isp_2400, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
#elif defined(ISP_2400_MULTI)
|
||||
DECLARE_MODULE(isp_2400_multi, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
#elif defined(ISP_2500)
|
||||
DECLARE_MODULE(isp_2500, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
#elif defined(ISP_2500_MULTI)
|
||||
DECLARE_MODULE(isp_2500_multi, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
#else
|
||||
#error "firmware not specified"
|
||||
#endif
|
||||
|
||||
@ -39,9 +39,7 @@ SUBDIR += isp_2200
|
||||
SUBDIR += isp_2300
|
||||
SUBDIR += isp_2322
|
||||
SUBDIR += isp_2400
|
||||
SUBDIR += isp_2400_multi
|
||||
SUBDIR += isp_2500
|
||||
SUBDIR += isp_2500_multi
|
||||
.if ${MACHINE} == "sparc64"
|
||||
SUBDIR += isp_1000
|
||||
.endif
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
# $FreeBSD$
|
||||
#-
|
||||
# Copyright (c) 2009 by Matthew Jacob
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice immediately at the beginning of the file, without modification,
|
||||
# this list of conditions, and the following disclaimer.
|
||||
# 2. The name of the author may not be used to endorse or promote products
|
||||
# derived from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
|
||||
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
#
|
||||
|
||||
.PATH: ${.CURDIR}/../../../dev/ispfw
|
||||
|
||||
KMOD= isp_2400_multi
|
||||
SRCS= ispfw.c
|
||||
|
||||
CFLAGS += -DISP_2400_MULTI -DMODULE_NAME=\"${KMOD}\"
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
@ -1,35 +0,0 @@
|
||||
# $FreeBSD$
|
||||
#-
|
||||
# Copyright (c) 2009 by Matthew Jacob
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice immediately at the beginning of the file, without modification,
|
||||
# this list of conditions, and the following disclaimer.
|
||||
# 2. The name of the author may not be used to endorse or promote products
|
||||
# derived from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
|
||||
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
#
|
||||
|
||||
.PATH: ${.CURDIR}/../../../dev/ispfw
|
||||
|
||||
KMOD= isp_2500_multi
|
||||
SRCS= ispfw.c
|
||||
|
||||
CFLAGS += -DISP_2500_MULTI -DMODULE_NAME=\"${KMOD}\"
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
Loading…
x
Reference in New Issue
Block a user