mirror of
https://gitlab.com/qemu-project/openbios.git
synced 2024-02-13 08:34:06 +08:00
Fix Unix target build
Move sys_info to load.c to make it also available on Unix build. Signed-off-by: Blue Swirl <blauwirbel@gmail.com> git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@826 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
@@ -14,8 +14,6 @@ int linux_load(struct sys_info *, const char *filename, const char *cmdline);
|
|||||||
|
|
||||||
void boot(void);
|
void boot(void);
|
||||||
|
|
||||||
struct sys_info sys_info;
|
|
||||||
|
|
||||||
void boot(void)
|
void boot(void)
|
||||||
{
|
{
|
||||||
char *path=pop_fstr_copy(), *param;
|
char *path=pop_fstr_copy(), *param;
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ arch_init( void )
|
|||||||
|
|
||||||
int openbios(void)
|
int openbios(void)
|
||||||
{
|
{
|
||||||
extern struct sys_info sys_info;
|
|
||||||
#ifdef CONFIG_DEBUG_CONSOLE
|
#ifdef CONFIG_DEBUG_CONSOLE
|
||||||
#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
|
#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
|
||||||
uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED);
|
uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED);
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
#include "openprom.h"
|
#include "openprom.h"
|
||||||
#include "boot.h"
|
#include "boot.h"
|
||||||
|
|
||||||
struct sys_info sys_info;
|
|
||||||
uint32_t kernel_image;
|
uint32_t kernel_image;
|
||||||
uint32_t kernel_size;
|
uint32_t kernel_size;
|
||||||
uint32_t qemu_cmdline;
|
uint32_t qemu_cmdline;
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
#include "libopenbios/forth_load.h"
|
#include "libopenbios/forth_load.h"
|
||||||
#include "boot.h"
|
#include "boot.h"
|
||||||
|
|
||||||
struct sys_info sys_info;
|
|
||||||
uint64_t kernel_image;
|
uint64_t kernel_image;
|
||||||
uint64_t kernel_size;
|
uint64_t kernel_size;
|
||||||
uint64_t qemu_cmdline;
|
uint64_t qemu_cmdline;
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include "libopenbios/forth_load.h"
|
#include "libopenbios/forth_load.h"
|
||||||
#include "boot.h"
|
#include "boot.h"
|
||||||
|
|
||||||
struct sys_info sys_info;
|
|
||||||
void *boot_notes = NULL;
|
void *boot_notes = NULL;
|
||||||
|
|
||||||
static int try_path(const char *path, char *param)
|
static int try_path(const char *path, char *param)
|
||||||
|
|||||||
@@ -33,6 +33,8 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
struct sys_info sys_info;
|
||||||
|
|
||||||
void load(ihandle_t dev)
|
void load(ihandle_t dev)
|
||||||
{
|
{
|
||||||
/* Invoke the loaders on the specified device */
|
/* Invoke the loaders on the specified device */
|
||||||
|
|||||||
Reference in New Issue
Block a user