summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/cam/cam_xpt.c7
-rw-r--r--sys/conf/options1
2 files changed, 8 insertions, 0 deletions
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 172b225..f92c33c 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -878,6 +878,13 @@ xpt_init(void *dummy)
mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF);
mtx_init(&xsoftc.xpt_topo_lock, "XPT topology lock", NULL, MTX_DEF);
+#ifdef CAM_BOOT_DELAY
+ /*
+ * Override this value at compile time to assist our users
+ * who don't use loader to boot a kernel.
+ */
+ xsoftc.boot_delay = CAM_BOOT_DELAY;
+#endif
/*
* The xpt layer is, itself, the equivelent of a SIM.
* Allow 16 ccbs in the ccb pool for it. This should
diff --git a/sys/conf/options b/sys/conf/options
index c5bdbb0..b124820 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -307,6 +307,7 @@ CAM_DEBUG_BUS opt_cam.h
CAM_DEBUG_TARGET opt_cam.h
CAM_DEBUG_LUN opt_cam.h
CAM_DEBUG_FLAGS opt_cam.h
+CAM_BOOT_DELAY opt_cam.h
SCSI_DELAY opt_scsi.h
SCSI_NO_SENSE_STRINGS opt_scsi.h
SCSI_NO_OP_STRINGS opt_scsi.h
OpenPOWER on IntegriCloud