[infiniband] Include SRP by default, but only for Infiniband builds

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/config/config.c b/src/config/config.c
index e50170356d76c39e0a449fc941edde4b3f9ff125..fcf27f04354d543c9e764de43e6795d4d236a0b7 100644 (file)
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -135,9 +135,6 @@ REQUIRE_OBJECT ( slam );
 #ifdef SANBOOT_PROTO_ISCSI
 REQUIRE_OBJECT ( iscsiboot );
 #endif
-#ifdef SANBOOT_PROTO_IB_SRP
-REQUIRE_OBJECT ( ib_srpboot );
-#endif
 
 /*
  * Drag in all requested resolvers

diff --git a/src/config/config_infiniband.c b/src/config/config_infiniband.c
new file mode 100644 (file)
index 0000000..1b8c53a
--- /dev/null
+++ b/src/config/config_infiniband.c
@@ -0,0 +1,23 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or (at
+ * your option) any later version.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+#include <config/general.h>
+
+/** @file
+ *
+ * Infiniband configuration options
+ *
+ */
+
+/*
+ * Drag in Infiniband-specific protocols
+ */
+#ifdef SANBOOT_PROTO_IB_SRP
+REQUIRE_OBJECT ( ib_srpboot );
+#endif

diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h
index ec9a002858e2123b08c64aa4cd2e96d96111a1ab..246a8cd98c4d73dff22db3bd60bcd760d448ede8 100644 (file)
--- a/src/config/defaults/pcbios.h
+++ b/src/config/defaults/pcbios.h
@@ -31,5 +31,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #define        SANBOOT_PROTO_ISCSI     /* iSCSI protocol */
 #define        SANBOOT_PROTO_AOE       /* AoE protocol */
+#define        SANBOOT_PROTO_IB_SRP    /* Infiniband SCSI RDMA protocol */
 
 #endif /* CONFIG_DEFAULTS_PCBIOS_H */