diff options
author | Eric Biederman <ebiederm@xmission.com> | 2004-10-16 06:20:29 +0000 |
---|---|---|
committer | Eric Biederman <ebiederm@xmission.com> | 2004-10-16 06:20:29 +0000 |
commit | 7003ba4a88a847707c55d593e517eaa70fc8c63d (patch) | |
tree | ad29fcd2fde474cb9bdd32835a76101edabe1ef9 /src/arch/i386/init | |
parent | 216525d1fd86c13e0f1ebe85ba518cdc1da06fcb (diff) |
- First stab at running linuxbios without the old static device tree.
Things are close but not quite there yet.
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1681 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/i386/init')
-rw-r--r-- | src/arch/i386/init/crt0.S.lb | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/arch/i386/init/crt0.S.lb b/src/arch/i386/init/crt0.S.lb index 4d9face092..29e3e28277 100644 --- a/src/arch/i386/init/crt0.S.lb +++ b/src/arch/i386/init/crt0.S.lb @@ -37,12 +37,21 @@ #include "crt0_includes.h" + /* uses: esp, ebx, ax, dx */ +#define __CONSOLE_TX_STRING(string) \ + mov string, %ebx ; \ + CALLSP(console_tx_string) + +#if ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG +#define CONSOLE_DEBUG_TX_STRING(string) __CONSOLE_TX_STRING(string) +#else +#define CONSOLE_DEBUG_TX_STRING(string) +#endif /* clear boot_complete flag */ xorl %ebp, %ebp __main: - mov $str_copying_to_ram, %ebx - CALLSP(console_tx_string) + CONSOLE_DEBUG_TX_STRING($str_copying_to_ram) /* * Copy data into RAM and clear the BSS. Since these segments @@ -149,8 +158,7 @@ decompr_end_n2b: movl %esp, %ebp #endif - mov $str_pre_main, %ebx - CALLSP(console_tx_string) + CONSOLE_DEBUG_TX_STRING($str_pre_main) leal _iseg, %edi jmp %edi @@ -159,12 +167,9 @@ decompr_end_n2b: hlt jmp .Lhlt - +#if ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG /* Uses esp, ebx, ax, dx */ console_tx_string: -#if ASM_CONSOLE_LOGLEVEL <= BIOS_DEBUG - RETSP -#else mov (%ebx), %al inc %ebx cmp $0, %al @@ -210,4 +215,3 @@ str_pre_main: .string "Jumping to LinuxBIOS.\r\n" .previous #endif /* ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG */ -
\ No newline at end of file |