Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-06-27 00:29:30 +00:00
Code Issues Projects Releases Wiki Activity

move console_init() to main()

Browse Source
This commit is contained in:
Laurent Vivier 2007-09-16 15:09:15 +00:00
parent ac5de6e43d
commit b78ead9cf9
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
second/head.S
View File

@ -36,12 +36,6 @@ setup:
bsr relocate
/* initialize console, so we can debug ;-) */
lea _start(%pc), %a0
move.l %a0, -(%sp)
bsr console_init@PLTPC
/* begin to work */
lea _start(%pc), %a0

12
second/main.c
View File

@ -37,6 +37,7 @@ extern u_int32_t _bootstrap_end;
#include "vga.h"
#include "driver.h"
#include "config.h"
#include "serial.h"
#include "enter_kernel.h"
@ -75,16 +76,18 @@ int start(emile_l2_header_t* info)
char *ramdisk_path;
char *command_line;
serial_init();
console_init();
arch_init();
init_memory_map();
#ifdef BANK_DUMP
bank_dump();
#endif
enter_kernel_init();
if (read_config(info, &kernel_path, &command_line, &ramdisk_path) != 0)
error("cannot read configuration\n");
#ifdef ARCH_M68K
if (arch_type == gestalt68k)
{
@ -110,9 +113,6 @@ int start(emile_l2_header_t* info)
error("EMILE doesn't support your architecture");
#endif
if (read_config(info, &kernel_path, &command_line, &ramdisk_path) != 0)
error("cannot read configuration\n");
/* load kernel */
kernel = load_kernel(kernel_path,