Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boot headers have been moved.

Browse Source 
Now builds a boot_arch_stage2.o object file that can be used by the architecture
independent Jamfile.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3163 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2003-05-03 16:28:05 +00:00
parent b2704e693c
commit d0c59e6faf
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/boot/arch/x86/Jamfile
View File

@ -1,6 +1,6 @@
SubDir OBOS_TOP src kernel boot arch x86 ; SubDir OBOS_TOP src kernel boot arch x86 ;
KernelObjects KernelMergeObject boot_arch_stage2.o :
<$(SOURCE_GRIST)>stage2.c <$(SOURCE_GRIST)>stage2.c
<$(SOURCE_GRIST)>stage2_asm.S <$(SOURCE_GRIST)>stage2_asm.S
<$(SOURCE_GRIST)>smp_boot.c <$(SOURCE_GRIST)>smp_boot.c

4
src/kernel/boot/arch/x86/smp_boot.c
View File

@ -4,7 +4,7 @@
*/ */
#include <stage2.h> #include <boot/stage2.h>
#include <arch/x86/stage2_priv.h> #include <arch/x86/stage2_priv.h>
#include <arch/x86/smp_apic.h> #include <arch/x86/smp_apic.h>
@ -270,7 +270,7 @@ smp_setup_apic(kernel_args *ka)
config = apic_read(APIC_SIVR) & 0xfffffc00; config = apic_read(APIC_SIVR) & 0xfffffc00;
config |= APIC_ENABLE | 0xff; config |= APIC_ENABLE | 0xff;
apic_write(APIC_SIVR, config); apic_write(APIC_SIVR, config);
#if 0 #if 1
/* setup LINT0 as ExtINT */ /* setup LINT0 as ExtINT */
config = (apic_read(APIC_LINT0) & 0xffff1c00); config = (apic_read(APIC_LINT0) & 0xffff1c00);
config |= APIC_LVT_DM_ExtINT | APIC_LVT_IIPP | APIC_LVT_TM; config |= APIC_LVT_DM_ExtINT | APIC_LVT_IIPP | APIC_LVT_TM;

4
src/kernel/boot/arch/x86/stage2.c
View File

@ -3,8 +3,8 @@
** Distributed under the terms of the NewOS License. ** Distributed under the terms of the NewOS License.
*/ */
#include <bootdir.h> #include <boot/bootdir.h>
#include <stage2.h> #include <boot/stage2.h>
#include "arch/x86/stage2_priv.h" #include "arch/x86/stage2_priv.h"
#include "arch/x86/descriptors.h" #include "arch/x86/descriptors.h"
#include "vesa.h" #include "vesa.h"