Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

Rearrange nvram init

Browse Source 
git-svn-id: svn://coreboot.org/openbios/openbios-devel@262 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Blue Swirl
2008-11-25 18:30:22 +00:00
parent df5359c81a
commit b210e52224
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc32/openbios.c
View File

@@ -118,7 +118,7 @@ arch_init( void )
ob_obio_init(hwdef->slavio_base, hwdef->fd_offset, ob_obio_init(hwdef->slavio_base, hwdef->fd_offset,
hwdef->counter_offset, hwdef->intr_offset, hwdef->counter_offset, hwdef->intr_offset,
hwdef->aux1_offset, hwdef->aux2_offset); hwdef->aux1_offset, hwdef->aux2_offset);
nvram_init(); nvconf_init();
#endif #endif
#ifdef CONFIG_DRIVER_SBUS #ifdef CONFIG_DRIVER_SBUS
#ifdef CONFIG_DEBUG_CONSOLE_VIDEO #ifdef CONFIG_DEBUG_CONSOLE_VIDEO

2
arch/sparc64/openbios.c
View File

@@ -833,7 +833,7 @@ arch_init( void )
init_video(); init_video();
#endif #endif
nvram_init(); nvconf_init();
ob_su_init(0x1fe02000000ULL, 0x3f8ULL, 0); ob_su_init(0x1fe02000000ULL, 0x3f8ULL, 0);
device_end(); device_end();

3
include/openbios/nvram.h
View File

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

8
modules/nvram.c
View File

@@ -163,7 +163,7 @@ update_nvram( void )
arch_nvram_put( nvram.data ); arch_nvram_put( nvram.data );
} }
static void void
nvconf_init( void ) nvconf_init( void )
{ {
int once=0; int once=0;
@@ -219,7 +219,7 @@ typedef struct {
uint mark_lo; uint mark_lo;
} nvram_ibuf_t; } nvram_ibuf_t;
DECLARE_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t), "Tnvram" ); DECLARE_UNNAMED_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t ));
/* ( pos_lo pos_hi -- status ) */ /* ( pos_lo pos_hi -- status ) */
static void static void
@@ -289,9 +289,9 @@ NODE_METHODS( nvram ) = {
void void
nvram_init( void ) nvram_init( char *path )
{ {
nvconf_init(); nvconf_init();
REGISTER_NODE( nvram ); REGISTER_NAMED_NODE( nvram, path );
} }