[Skiboot] [PATCH v2 1/7] nvram: rename nvram-format.h to nvram.h

[Oliver O'Halloran]

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 at gmail.com>
---
 core/nvram-format.c    |  2 +-
 core/nvram.c           |  2 +-
 include/nvram-format.h | 23 -----------------------
 include/nvram.h        | 23 +++++++++++++++++++++++
 4 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 include/nvram-format.h
 create mode 100644 include/nvram.h

diff --git a/core/nvram-format.c b/core/nvram-format.c
index 5a16fd3de5e6..a81663ceb35f 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 38babcc7c7e2..9e860d983768 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-format.h
deleted file mode 100644
index d7432a7fe720..000000000000
--- a/include/nvram-format.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2013-2014 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * 	http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __NVRAM_FORMAT_H
-#define __NVRAM_FORMAT_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 */
diff --git a/include/nvram.h b/include/nvram.h
new file mode 100644
index 000000000000..ce33d2fc2d80
--- /dev/null
+++ b/include/nvram.h
@@ -0,0 +1,23 @@
+/* Copyright 2013-2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#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_H */
-- 
2.5.5