3 files changed, 23 insertions, 0 deletions
diff --git a/src/include/usr/isteps/istep21list.H b/src/include/usr/isteps/istep21list.H
index ad3129217..582ecf292 100644
--- a/src/include/usr/isteps/istep21list.H
+++ b/src/include/usr/isteps/istep21list.H
@@ -129,6 +129,9 @@ const DepModInfo  g_istep21Dependancies = {
         DEP_LIB(libhtmgt.so),
         DEP_LIB(libisteps_mss.so),
 #endif
+#ifndef CONFIG_FSP_BUILD
+        DEP_LIB(libnvram.so),
+#endif
         NULL
     }
 };
diff --git a/src/include/usr/nvram/import/nvram.h b/src/include/usr/nvram/import/nvram.h
index e335b0f4b..7f6b3b2ed 100644
--- a/src/include/usr/nvram/import/nvram.h
+++ b/src/include/usr/nvram/import/nvram.h
@@ -27,6 +27,16 @@
 
 #include <stdint.h>
 
+typedef uint16_t beint16_t;
+typedef beint16_t be16;
+
+struct chrp_nvram_hdr {
+    uint8_t     sig;
+    uint8_t     cksum;
+    be16        len;
+    char        name[12];
+};
+
 extern "C"
 {
 int nvram_format(void *nvram_image, uint32_t nvram_size);
diff --git a/src/include/usr/nvram/import/skiboot.h b/src/include/usr/nvram/import/skiboot.h
index 689eef541..6fa141588 100644
--- a/src/include/usr/nvram/import/skiboot.h
+++ b/src/include/usr/nvram/import/skiboot.h
@@ -36,12 +36,22 @@ typedef uint16_t beint16_t;
 typedef beint16_t be16;
 
 #define BE16_TO_CPU(le_val) ((uint16_t)(le_val))
+#define CPU_TO_BE16(native) ((beint16_t)(native))
 
 static inline uint16_t be16_to_cpu(beint16_t be_val)
 {
     return BE16_TO_CPU(be_val);
 }
 
+/**
+ * cpu_to_be16 - convert a uint16_t value to big endian.
+ * @native: value to convert
+ */
+static inline beint16_t cpu_to_be16(uint16_t native)
+{
+    return CPU_TO_BE16(native);
+}
+
 // For console logging
 #define PR_EMERG    0
 #define PR_ALERT    1