Author: mcayland Date: Sun Mar 14 21:34:01 2010 New Revision: 698 URL: http://tracker.coreboot.org/trac/openbios/changeset/698
Log: 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
Added: trunk/openbios-devel/include/arch/common/nvram.h (contents, props changed) - copied, changed from r696, trunk/openbios-devel/include/openbios/nvram.h trunk/openbios-devel/include/packages/nvram.h Deleted: trunk/openbios-devel/include/openbios/nvram.h Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/ppc/briq/briq.c trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/briq/main.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/mol/main.c trunk/openbios-devel/arch/ppc/mol/mol.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/pearpc/main.c trunk/openbios-devel/arch/ppc/pearpc/pearpc.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/unix/boot.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/packages/nvram.c
Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/briq/briq.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/briq/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/mol/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/mol/mol.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/pearpc/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/pearpc/pearpc.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 21:34:01 2010 (r698) @@ -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);
Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/drivers/macio.c Sun Mar 14 21:34:01 2010 (r698) @@ -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"
Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 21:34:01 2010 (r698) @@ -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
Copied and modified: trunk/openbios-devel/include/arch/common/nvram.h (from r696, trunk/openbios-devel/include/openbios/nvram.h) ============================================================================== --- trunk/openbios-devel/include/openbios/nvram.h Sun Mar 14 21:10:01 2010 (r696, copy source) +++ trunk/openbios-devel/include/arch/common/nvram.h Sun Mar 14 21:34:01 2010 (r698) @@ -21,8 +21,4 @@ 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 */
Added: trunk/openbios-devel/include/packages/nvram.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/packages/nvram.h Sun Mar 14 21:34:01 2010 (r698) @@ -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 */
Modified: trunk/openbios-devel/packages/nvram.c ============================================================================== --- trunk/openbios-devel/packages/nvram.c Sun Mar 14 21:19:46 2010 (r697) +++ trunk/openbios-devel/packages/nvram.c Sun Mar 14 21:34:01 2010 (r698) @@ -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...) \