Split nvram.h into its proper two components - one for the arch-specific functions and another for the package functions.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>


git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@698 f158a5a8-5612-0410-a976-696ce0be7e32

arch/amd64/boot.c

@@ -5,7 +5,7 @@
 #include "config.h"
 #include "libopenbios/bindings.h"
 #include "libopenbios/elfload.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libc/diskio.h"
 #include "libopenbios/sys_info.h"
 

arch/ppc/briq/briq.c

@@ -18,7 +18,7 @@
 
 #include "config.h"
 #include "kernel/kernel.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libc/vsprintf.h"
 #include "libc/string.h"
 #include "briq/briq.h"

arch/ppc/briq/init.c

@@ -21,7 +21,7 @@
 
 #include "config.h"
 #include "libopenbios/bindings.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "briq/briq.h"
 #include "libopenbios/ofmem.h"
 #include "openbios-version.h"

arch/ppc/briq/main.c

@@ -19,7 +19,7 @@
 #include "config.h"
 #include "libopenbios/bindings.h"
 #include "libopenbios/elfload.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
 #include "briq/briq.h"

arch/ppc/mol/init.c

@@ -17,7 +17,7 @@
 
 #include "config.h"
 #include "libopenbios/bindings.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "mol/mol.h"
 #include "libopenbios/ofmem.h"
 #include "mol/prom.h"

arch/ppc/mol/main.c

@@ -18,7 +18,7 @@
 #include "config.h"
 #include "libopenbios/bindings.h"
 #include "libopenbios/elfload.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
 #include "mol/mol.h"

arch/ppc/mol/mol.c

@@ -16,7 +16,7 @@
 
 #include "config.h"
 #include "kernel/kernel.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libc/vsprintf.h"
 #include "libc/string.h"
 #include "mol/mol.h"

arch/ppc/pearpc/init.c

@@ -22,7 +22,7 @@
 
 #include "config.h"
 #include "libopenbios/bindings.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "pearpc/pearpc.h"
 #include "libopenbios/ofmem.h"
 #include "openbios-version.h"

arch/ppc/pearpc/main.c

@@ -19,7 +19,7 @@
 #include "config.h"
 #include "libopenbios/bindings.h"
 #include "libopenbios/elfload.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
 #include "pearpc/pearpc.h"

arch/ppc/pearpc/pearpc.c

@@ -18,7 +18,7 @@
 
 #include "config.h"
 #include "kernel/kernel.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libc/vsprintf.h"
 #include "libc/string.h"
 #include "pearpc/pearpc.h"

arch/ppc/qemu/init.c

@@ -23,7 +23,7 @@
 #include "config.h"
 #include "libopenbios/bindings.h"
 #include "drivers/pci.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "drivers/drivers.h"
 #include "qemu/qemu.h"
 #include "libopenbios/ofmem.h"

arch/ppc/qemu/main.c

@@ -17,7 +17,8 @@
 #include "config.h"
 #include "libopenbios/bindings.h"
 #include "libopenbios/elfload.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
+#include "packages/nvram.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
 #include "kernel.h"

arch/ppc/qemu/qemu.c

@@ -18,7 +18,7 @@
 
 #include "config.h"
 #include "kernel/kernel.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libopenbios/bindings.h"
 #include "drivers/drivers.h"
 #include "libc/vsprintf.h"

arch/sparc32/boot.c

@@ -5,7 +5,7 @@
 #include "config.h"
 #include "libopenbios/bindings.h"
 #include "libopenbios/elfload.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "drivers/drivers.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"

arch/sparc32/openbios.c

@@ -13,7 +13,8 @@
 #include "dict.h"
 #include "kernel/kernel.h"
 #include "kernel/stack.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
+#include "packages/nvram.h"
 #include "../../drivers/timer.h" // XXX
 #include "libopenbios/sys_info.h"
 #include "openbios.h"

arch/sparc64/boot.c

@@ -5,7 +5,7 @@
 #include "config.h"
 #include "libopenbios/bindings.h"
 #include "libopenbios/elfload.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
 #include "libopenbios/sys_info.h"

arch/sparc64/openbios.c

@@ -10,7 +10,8 @@
 #include "libopenbios/bindings.h"
 #include "drivers/drivers.h"
 #include "dict.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
+#include "packages/nvram.h"
 #include "libopenbios/sys_info.h"
 #include "openbios.h"
 #include "drivers/pci.h"

arch/unix/boot.c

@@ -5,7 +5,7 @@
 #include "config.h"
 #include "libopenbios/bindings.h"
 #include "libopenbios/elfload.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libc/diskio.h"
 
 void boot(void);

arch/x86/boot.c

@@ -10,7 +10,7 @@
 #include "config.h"
 #include "libopenbios/bindings.h"
 #include "libopenbios/elfload.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libc/diskio.h"
 #include "libopenbios/sys_info.h"
 #include "boot.h"

drivers/macio.c

@@ -9,7 +9,8 @@
  */
 
 #include "config.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
+#include "packages/nvram.h"
 #include "libopenbios/bindings.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"

drivers/obio.c

@@ -17,7 +17,7 @@
 #include "libc/vsprintf.h"
 
 #include "drivers/drivers.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
 #include "libopenbios/ofmem.h"
 #include "obio.h"
 #define NO_QEMU_PROTOS

include/arch/common/nvram.h

@@ -21,8 +21,4 @@ extern int	arch_nvram_size( void );
 extern void	arch_nvram_get( char *buf );
 extern void	arch_nvram_put( char *buf );
 
-extern void	nvconf_init( void );
-extern void	nvram_init( const char *path );
-extern void	update_nvram( void );
-
 #endif   /* _H_NVRAM */

include/packages/nvram.h

@@ -0,0 +1,24 @@
+/*
+ *   Creation Date: <2003/12/20 01:04:25 samuel>
+ *   Time-stamp: <2004/01/07 19:59:11 samuel>
+ *
+ *	<nvram.h>
+ *
+ *	arch NVRAM interface
+ *
+ *   Copyright (C) 2003, 2004 Samuel Rydh (samuel@ibrium.se)
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   version 2
+ *
+ */
+
+#ifndef _H_NVRAM_PACKAGE
+#define _H_NVRAM_PACKAGE
+
+extern void	nvconf_init( void );
+extern void	nvram_init( const char *path );
+extern void	update_nvram( void );
+
+#endif   /* _H_NVRAM_PACKAGE */

packages/nvram.c

@@ -16,7 +16,8 @@
 
 #include "config.h"
 #include "libopenbios/bindings.h"
-#include "openbios/nvram.h"
+#include "arch/common/nvram.h"
+#include "packages/nvram.h"
 
 #ifdef CONFIG_DEBUG_NVRAM
 #define DPRINTF(fmt, args...) \