7 files changed, 22 insertions, 3 deletions
diff --git a/src/config/config.c b/src/config/config.c
index fcf27f043..46df6bd2c 100644
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -133,7 +133,7 @@ REQUIRE_OBJECT ( slam );
  *
  */
 #ifdef SANBOOT_PROTO_ISCSI
-REQUIRE_OBJECT ( iscsiboot );
+REQUIRE_OBJECT ( iscsi );
 #endif
 
 /*
diff --git a/src/config/config_ethernet.c b/src/config/config_ethernet.c
index 51c197d72..f6cb87bc0 100644
--- a/src/config/config_ethernet.c
+++ b/src/config/config_ethernet.c
@@ -19,5 +19,5 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * Drag in Ethernet-specific protocols
  */
 #ifdef SANBOOT_PROTO_AOE
-REQUIRE_OBJECT ( aoeboot );
+REQUIRE_OBJECT ( aoe );
 #endif
diff --git a/src/config/config_infiniband.c b/src/config/config_infiniband.c
index 1b8c53a9d..432e621d0 100644
--- a/src/config/config_infiniband.c
+++ b/src/config/config_infiniband.c
@@ -19,5 +19,5 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * Drag in Infiniband-specific protocols
  */
 #ifdef SANBOOT_PROTO_IB_SRP
-REQUIRE_OBJECT ( ib_srpboot );
+REQUIRE_OBJECT ( ib_srp );
 #endif
diff --git a/src/config/defaults/efi.h b/src/config/defaults/efi.h
index 35e5fde97..9c3f3ff3e 100644
--- a/src/config/defaults/efi.h
+++ b/src/config/defaults/efi.h
@@ -15,6 +15,7 @@
 #define NAP_EFIX86
 #define UMALLOC_EFI
 #define SMBIOS_EFI
+#define SANBOOT_NULL
 
 #define	IMAGE_EFI		/* EFI image support */
 #define	IMAGE_SCRIPT		/* iPXE script image support */
diff --git a/src/config/defaults/linux.h b/src/config/defaults/linux.h
index 901097fda..647dc0a53 100644
--- a/src/config/defaults/linux.h
+++ b/src/config/defaults/linux.h
@@ -13,6 +13,7 @@
 #define UMALLOC_LINUX
 #define NAP_LINUX
 #define SMBIOS_LINUX
+#define SANBOOT_NULL
 
 #define DRIVERS_LINUX
 
diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h
index 246a8cd98..d2ffc3d23 100644
--- a/src/config/defaults/pcbios.h
+++ b/src/config/defaults/pcbios.h
@@ -17,6 +17,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define NAP_PCBIOS
 #define UMALLOC_MEMTOP
 #define SMBIOS_PCBIOS
+#define SANBOOT_PCBIOS
 
 #define	IMAGE_ELF		/* ELF image support */
 #define	IMAGE_MULTIBOOT		/* MultiBoot image support */
diff --git a/src/config/sanboot.h b/src/config/sanboot.h
new file mode 100644
index 000000000..1d7f5f177
--- /dev/null
+++ b/src/config/sanboot.h
@@ -0,0 +1,16 @@
+#ifndef CONFIG_SANBOOT_H
+#define CONFIG_SANBOOT_H
+
+/** @file
+ *
+ * sanboot API configuration
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+#include <config/defaults.h>
+
+#include <config/local/sanboot.h>
+
+#endif /* CONFIG_SANBOOT_H */