aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/conf/files.i38610
-rw-r--r--sys/i386/conf/GENERIC1
-rw-r--r--sys/i386/conf/NOTES5
-rw-r--r--sys/modules/Makefile2
4 files changed, 18 insertions, 0 deletions
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 919c2ac6a4db..8c62a0be0091 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -56,6 +56,11 @@ hal.o optional ath_hal \
compile-with "uudecode < $S/contrib/dev/ath/freebsd/i386-elf.hal.o.uu" \
no-implicit-rule
#
+hptmvraid.o optional hptmv \
+ dependency "$S/contrib/dev/hptmv/i386-elf.raid.o.uu" \
+ compile-with "uudecode < $S/contrib/dev/hptmv/i386-elf.raid.o.uu" \
+ no-implicit-rule
+#
#
compat/linux/linux_file.c optional compat_linux
compat/linux/linux_getcwd.c optional compat_linux
@@ -96,6 +101,11 @@ contrib/dev/oltr/if_oltr.c optional oltr
contrib/dev/oltr/trlldbm.c optional oltr
contrib/dev/oltr/trlldhm.c optional oltr
contrib/dev/oltr/trlldmac.c optional oltr
+contrib/dev/hptmv/gui_lib.c optional hptmv
+contrib/dev/hptmv/hptproc.c optional hptmv
+contrib/dev/hptmv/ioctl.c optional hptmv
+dev/hptmv/entry.c optional hptmv
+dev/hptmv/mv.c optional hptmv
bf_enc.o optional ipsec ipsec_esp \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 3d0b2efdff38..5ad9b1da9694 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -128,6 +128,7 @@ device amr # AMI MegaRAID
device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
+device hptmv # Highpoint RocketRAID 182x
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 55df75280347..8ae999004b15 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -617,6 +617,11 @@ device aac
device aacp # SCSI Passthrough interface (optional, CAM required)
#
+# Highpoint RocketRAID 182x. This is really just software RAID on a
+# Marvell SATA chip.
+device hptmv
+
+#
# IBM (now Adaptec) ServeRAID controllers
device ips
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index a3cceea2885b..45ba8cb88082 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -85,6 +85,7 @@ SUBDIR= ${_3dfx} \
${_hfa} \
hifn \
hme \
+ ${_hptmv} \
${_i2c} \
${_ibcs2} \
${_ichwd} \
@@ -348,6 +349,7 @@ _dpt= dpt
_el= el
_ex= ex
_exca= exca
+_hptmv= hptmv
_ichwd= ichwd
_ida= ida
_idt= idt