aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2016-08-17 15:32:48 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2016-08-30 16:59:47 +1000
commitad461cc7a45ac2f8ed6f2c6373545d402e936502 (patch)
treed153d0986cb3c25be1e9939519d6751cf3b004c2
parent9478b216e5678b1a2e738abe771a335588f0f072 (diff)
downloadskiboot-ad461cc7a45ac2f8ed6f2c6373545d402e936502.zip
skiboot-ad461cc7a45ac2f8ed6f2c6373545d402e936502.tar.gz
skiboot-ad461cc7a45ac2f8ed6f2c6373545d402e936502.tar.bz2
nvram: rename nvram-format.h to nvram.h
The NVRAM handling code was split into two files so that the partition parsing could be separately tested. Currently there is no nvram.h and the tests #include nvram-format.c directly. This patch renames nvram-format.h to something more sensible. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--core/nvram-format.c2
-rw-r--r--core/nvram.c2
-rw-r--r--include/nvram.h (renamed from include/nvram-format.h)6
3 files changed, 5 insertions, 5 deletions
diff --git a/core/nvram-format.c b/core/nvram-format.c
index 5a16fd3..a81663c 100644
--- a/core/nvram-format.c
+++ b/core/nvram-format.c
@@ -15,7 +15,7 @@
*/
#include <skiboot.h>
-#include <nvram-format.h>
+#include <nvram.h>
/*
* NVRAM Format as specified in PAPR
diff --git a/core/nvram.c b/core/nvram.c
index c64c431..9a9a6ff 100644
--- a/core/nvram.c
+++ b/core/nvram.c
@@ -20,7 +20,7 @@
#include <lock.h>
#include <device.h>
#include <platform.h>
-#include <nvram-format.h>
+#include <nvram.h>
static void *nvram_image;
static uint32_t nvram_size;
diff --git a/include/nvram-format.h b/include/nvram.h
index d7432a7..ce33d2f 100644
--- a/include/nvram-format.h
+++ b/include/nvram.h
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#ifndef __NVRAM_FORMAT_H
-#define __NVRAM_FORMAT_H
+#ifndef __NVRAM_H
+#define __NVRAM_H
int nvram_format(void *nvram_image, uint32_t nvram_size);
int nvram_check(void *nvram_image, uint32_t nvram_size);
-#endif /* __NVRAM_FORMAT_H */
+#endif /* __NVRAM_H */