diff options
| author | Michael Brown <mcb30@ipxe.org> | 2010-09-12 21:44:48 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2010-09-12 22:26:44 +0100 |
| commit | 50da1122e6d215d11e1eb9eac144ede3e25e7f3f (patch) | |
| tree | 76935d5cf5fa989dd598c591582ba850960bb5c1 | |
| parent | 588ba3ee9ad4899e0933cebd05556b3e42cf4eef (diff) | |
| download | ipxe-50da1122e6d215d11e1eb9eac144ede3e25e7f3f.tar.gz | |
[infiniband] Include SRP by default, but only for Infiniband builds
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/config/config.c | 3 | ||||
| -rw-r--r-- | src/config/config_infiniband.c | 23 | ||||
| -rw-r--r-- | src/config/defaults/pcbios.h | 1 |
3 files changed, 24 insertions, 3 deletions
diff --git a/src/config/config.c b/src/config/config.c index e5017035..fcf27f04 100644 --- 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 index 00000000..1b8c53a9 --- /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 ec9a0028..246a8cd9 100644 --- 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 */ |