From 92f8310ff7d6319cdc2d1b69cc20328069b57adf Mon Sep 17 00:00:00 2001 From: Mark Cave-Ayland Date: Sun, 14 Mar 2010 20:34:01 +0000 Subject: [PATCH] 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 git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@698 f158a5a8-5612-0410-a976-696ce0be7e32 --- arch/amd64/boot.c | 2 +- arch/ppc/briq/briq.c | 2 +- arch/ppc/briq/init.c | 2 +- arch/ppc/briq/main.c | 2 +- arch/ppc/mol/init.c | 2 +- arch/ppc/mol/main.c | 2 +- arch/ppc/mol/mol.c | 2 +- arch/ppc/pearpc/init.c | 2 +- arch/ppc/pearpc/main.c | 2 +- arch/ppc/pearpc/pearpc.c | 2 +- arch/ppc/qemu/init.c | 2 +- arch/ppc/qemu/main.c | 3 ++- arch/ppc/qemu/qemu.c | 2 +- arch/sparc32/boot.c | 2 +- arch/sparc32/openbios.c | 3 ++- arch/sparc64/boot.c | 2 +- arch/sparc64/openbios.c | 3 ++- arch/unix/boot.c | 2 +- arch/x86/boot.c | 2 +- drivers/macio.c | 3 ++- drivers/obio.c | 2 +- include/{openbios => arch/common}/nvram.h | 4 ---- include/packages/nvram.h | 24 +++++++++++++++++++++++ packages/nvram.c | 3 ++- 24 files changed, 51 insertions(+), 26 deletions(-) rename include/{openbios => arch/common}/nvram.h (82%) create mode 100644 include/packages/nvram.h diff --git a/arch/amd64/boot.c b/arch/amd64/boot.c index 8ea6886..aa4e779 100644 --- a/arch/amd64/boot.c +++ b/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" diff --git a/arch/ppc/briq/briq.c b/arch/ppc/briq/briq.c index 4667fce..a8541c3 100644 --- a/arch/ppc/briq/briq.c +++ b/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" diff --git a/arch/ppc/briq/init.c b/arch/ppc/briq/init.c index 15f9e1f..8a62b4f 100644 --- a/arch/ppc/briq/init.c +++ b/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" diff --git a/arch/ppc/briq/main.c b/arch/ppc/briq/main.c index 60144e7..6f7d408 100644 --- a/arch/ppc/briq/main.c +++ b/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" diff --git a/arch/ppc/mol/init.c b/arch/ppc/mol/init.c index 3b35c46..d878b8c 100644 --- a/arch/ppc/mol/init.c +++ b/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" diff --git a/arch/ppc/mol/main.c b/arch/ppc/mol/main.c index ad3b0db..c6e7dc0 100644 --- a/arch/ppc/mol/main.c +++ b/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" diff --git a/arch/ppc/mol/mol.c b/arch/ppc/mol/mol.c index 8264379..86b3b66 100644 --- a/arch/ppc/mol/mol.c +++ b/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" diff --git a/arch/ppc/pearpc/init.c b/arch/ppc/pearpc/init.c index a9e5a4d..804006f 100644 --- a/arch/ppc/pearpc/init.c +++ b/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" diff --git a/arch/ppc/pearpc/main.c b/arch/ppc/pearpc/main.c index 419fb63..0d9d061 100644 --- a/arch/ppc/pearpc/main.c +++ b/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" diff --git a/arch/ppc/pearpc/pearpc.c b/arch/ppc/pearpc/pearpc.c index 00da89c..234052c 100644 --- a/arch/ppc/pearpc/pearpc.c +++ b/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" diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index b60852a..0ecfae1 100644 --- a/arch/ppc/qemu/init.c +++ b/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" diff --git a/arch/ppc/qemu/main.c b/arch/ppc/qemu/main.c index 7f49d6f..edb6fb9 100644 --- a/arch/ppc/qemu/main.c +++ b/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" diff --git a/arch/ppc/qemu/qemu.c b/arch/ppc/qemu/qemu.c index ab4e6e9..82ba752 100644 --- a/arch/ppc/qemu/qemu.c +++ b/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" diff --git a/arch/sparc32/boot.c b/arch/sparc32/boot.c index b9cb18f..5ad2651 100644 --- a/arch/sparc32/boot.c +++ b/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" diff --git a/arch/sparc32/openbios.c b/arch/sparc32/openbios.c index 24fd8ae..a6d7272 100644 --- a/arch/sparc32/openbios.c +++ b/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" diff --git a/arch/sparc64/boot.c b/arch/sparc64/boot.c index 48ecf77..f7f7278 100644 --- a/arch/sparc64/boot.c +++ b/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" diff --git a/arch/sparc64/openbios.c b/arch/sparc64/openbios.c index 4726c1b..199fe33 100644 --- a/arch/sparc64/openbios.c +++ b/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" diff --git a/arch/unix/boot.c b/arch/unix/boot.c index c37e26f..df37e05 100644 --- a/arch/unix/boot.c +++ b/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); diff --git a/arch/x86/boot.c b/arch/x86/boot.c index d7aaf33..792c43c 100644 --- a/arch/x86/boot.c +++ b/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" diff --git a/drivers/macio.c b/drivers/macio.c index 5df20d9..d6d1696 100644 --- a/drivers/macio.c +++ b/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" diff --git a/drivers/obio.c b/drivers/obio.c index 4a47434..3c31554 100644 --- a/drivers/obio.c +++ b/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 diff --git a/include/openbios/nvram.h b/include/arch/common/nvram.h similarity index 82% rename from include/openbios/nvram.h rename to include/arch/common/nvram.h index 49e1897..41b31ca 100644 --- a/include/openbios/nvram.h +++ b/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 */ diff --git a/include/packages/nvram.h b/include/packages/nvram.h new file mode 100644 index 0000000..ba1b38b --- /dev/null +++ b/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> + * + * + * + * 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 */ diff --git a/packages/nvram.c b/packages/nvram.c index 30d944b..bbc9c53 100644 --- a/packages/nvram.c +++ b/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...) \