18 files changed, 50 insertions, 1 deletions
diff --git a/src/include/usr/autoboot.h b/src/include/usr/autoboot.h
index a081a70df..fbc8b10e9 100644
--- a/src/include/usr/autoboot.h
+++ b/src/include/usr/autoboot.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 #include <ipxe/device.h>
 
diff --git a/src/include/usr/certmgmt.h b/src/include/usr/certmgmt.h
index 4363b03e1..ff646236b 100644
--- a/src/include/usr/certmgmt.h
+++ b/src/include/usr/certmgmt.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 #include <ipxe/x509.h>
 
diff --git a/src/include/usr/dhcpmgmt.h b/src/include/usr/dhcpmgmt.h
index ed669eb9d..2440b1713 100644
--- a/src/include/usr/dhcpmgmt.h
+++ b/src/include/usr/dhcpmgmt.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 struct net_device;
 
diff --git a/src/include/usr/fdtmgmt.h b/src/include/usr/fdtmgmt.h
new file mode 100644
index 000000000..3d3aef859
--- /dev/null
+++ b/src/include/usr/fdtmgmt.h
@@ -0,0 +1,16 @@
+#ifndef _USR_FDTMGMT_H
+#define _USR_FDTMGMT_H
+
+/** @file
+ *
+ * Flattened Device Tree management
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <ipxe/image.h>
+
+extern int imgfdt ( struct image *image );
+
+#endif /* _USR_FDTMGMT_H */
diff --git a/src/include/usr/ifmgmt.h b/src/include/usr/ifmgmt.h
index 8d8a6bb56..3b489c02a 100644
--- a/src/include/usr/ifmgmt.h
+++ b/src/include/usr/ifmgmt.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 struct net_device;
 struct net_device_configurator;
diff --git a/src/include/usr/imgcrypt.h b/src/include/usr/imgcrypt.h
new file mode 100644
index 000000000..c9408c75f
--- /dev/null
+++ b/src/include/usr/imgcrypt.h
@@ -0,0 +1,17 @@
+#ifndef _USR_IMGCRYPT_H
+#define _USR_IMGCRYPT_H
+
+/** @file
+ *
+ * Image encryption management
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <ipxe/image.h>
+
+extern int imgdecrypt ( struct image *image, struct image *envelope,
+			const char *name );
+
+#endif /* _USR_IMGCRYPT_H */
diff --git a/src/include/usr/imgmgmt.h b/src/include/usr/imgmgmt.h
index 14fb7cbc6..f98af7984 100644
--- a/src/include/usr/imgmgmt.h
+++ b/src/include/usr/imgmgmt.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 #include <ipxe/image.h>
 
@@ -18,6 +19,6 @@ extern int imgdownload_string ( const char *uri_string, unsigned long timeout,
 extern int imgacquire ( const char *name, unsigned long timeout,
 			struct image **image );
 extern void imgstat ( struct image *image );
-extern int imgmem ( const char *name, userptr_t data, size_t len );
+extern int imgmem ( const char *name, const void *data, size_t len );
 
 #endif /* _USR_IMGMGMT_H */
diff --git a/src/include/usr/imgtrust.h b/src/include/usr/imgtrust.h
index 414e07a80..1e43f5d3d 100644
--- a/src/include/usr/imgtrust.h
+++ b/src/include/usr/imgtrust.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 #include <ipxe/image.h>
 
diff --git a/src/include/usr/ipstat.h b/src/include/usr/ipstat.h
index 803254bcb..2399446eb 100644
--- a/src/include/usr/ipstat.h
+++ b/src/include/usr/ipstat.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 extern void ipstat ( void );
 
diff --git a/src/include/usr/neighmgmt.h b/src/include/usr/neighmgmt.h
index 06f03716e..5ed5829c4 100644
--- a/src/include/usr/neighmgmt.h
+++ b/src/include/usr/neighmgmt.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 extern void nstat ( void );
 
diff --git a/src/include/usr/nslookup.h b/src/include/usr/nslookup.h
index d34649e9f..3b2bb504d 100644
--- a/src/include/usr/nslookup.h
+++ b/src/include/usr/nslookup.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER );
+FILE_SECBOOT ( PERMITTED );
 
 extern int nslookup ( const char *name, const char *setting_name );
 
diff --git a/src/include/usr/ntpmgmt.h b/src/include/usr/ntpmgmt.h
index 284e668e6..6d90ec749 100644
--- a/src/include/usr/ntpmgmt.h
+++ b/src/include/usr/ntpmgmt.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 extern int ntp ( const char *hostname );
 
diff --git a/src/include/usr/pingmgmt.h b/src/include/usr/pingmgmt.h
index c7a8434be..d15a748d8 100644
--- a/src/include/usr/pingmgmt.h
+++ b/src/include/usr/pingmgmt.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 #include <stdint.h>
 
diff --git a/src/include/usr/profstat.h b/src/include/usr/profstat.h
index b7812ca7f..c5d545a86 100644
--- a/src/include/usr/profstat.h
+++ b/src/include/usr/profstat.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 extern void profstat ( void );
 
diff --git a/src/include/usr/prompt.h b/src/include/usr/prompt.h
index 8d3eeee3c..22c39105f 100644
--- a/src/include/usr/prompt.h
+++ b/src/include/usr/prompt.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 extern int prompt ( const char *text, unsigned long timeout, int key );
 
diff --git a/src/include/usr/route.h b/src/include/usr/route.h
index 7ec4a3509..7503c8c55 100644
--- a/src/include/usr/route.h
+++ b/src/include/usr/route.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 #include <ipxe/tables.h>
 
diff --git a/src/include/usr/shimmgmt.h b/src/include/usr/shimmgmt.h
index 0c59f54a8..0ed85c468 100644
--- a/src/include/usr/shimmgmt.h
+++ b/src/include/usr/shimmgmt.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 #include <ipxe/image.h>
 
diff --git a/src/include/usr/sync.h b/src/include/usr/sync.h
index b6f12ad6e..b24ab32fb 100644
--- a/src/include/usr/sync.h
+++ b/src/include/usr/sync.h
@@ -8,6 +8,7 @@
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+FILE_SECBOOT ( PERMITTED );
 
 extern int sync ( unsigned long timeout );