Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BOOTDATA] Add SMP Entry (#5859)

Browse source 
[HALX86] Enable SMP Hal for x86
[BOOTDATA] add livecd and set entrys
This commit is contained in:
Justin Miller 2023-11-01 06:43:44 -07:00 committed by GitHub
parent 5d1be078f8
commit 0a951f1112
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
boot/bootdata/livecd.ini
View file

@ -9,6 +9,7 @@ MinimalUI=Yes
[Operating Systems] [Operating Systems]
LiveCD="LiveCD" LiveCD="LiveCD"
LiveCD_Debug="LiveCD (Debug)" LiveCD_Debug="LiveCD (Debug)"
LiveCD_Macpi="LiveCD ACPI SMP (Debug)"
LiveCD_Aacpi="LiveCD ACPI APIC (Debug)" LiveCD_Aacpi="LiveCD ACPI APIC (Debug)"
LiveCD_VBoxDebug="LiveCD (VBox Debug)" LiveCD_VBoxDebug="LiveCD (VBox Debug)"
LiveCD_Screen="LiveCD (Screen)" LiveCD_Screen="LiveCD (Screen)"
@ -24,6 +25,11 @@ BootType=Windows2003
SystemPath=\reactos SystemPath=\reactos
Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
[LiveCD_Macpi]
BootType=Windows2003
SystemPath=\reactos
Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
[LiveCD_Aacpi] [LiveCD_Aacpi]
BootType=Windows2003 BootType=Windows2003
SystemPath=\reactos SystemPath=\reactos

10
boot/bootdata/txtsetup.sif
View file

@ -229,7 +229,7 @@ DefaultLanguage = 00000409
pci_up = "Standard PC Uniprocessor" pci_up = "Standard PC Uniprocessor"
;pci_mp = "Standard PC Multiprocessor" ;pci_mp = "Standard PC Multiprocessor"
acpi_up = "ACPI PC Uniprocessor" acpi_up = "ACPI PC Uniprocessor"
;acpi_mp = "ACPI PC Multiprocessor" acpi_mp = "ACPI PC Multiprocessor"
apic_up = "Standard APIC PC Uniprocessor" apic_up = "Standard APIC PC Uniprocessor"
aacpi_up = "ACPI APIC PC Uniprocessor" aacpi_up = "ACPI APIC PC Uniprocessor"
xbox = "Original Xbox (x86 based)" xbox = "Original Xbox (x86 based)"
@ -244,7 +244,7 @@ x64_mp = "Standard x64 Multiprocessor"
pci_up = "PC UP" pci_up = "PC UP"
;pci_mp = "PC MP" ;pci_mp = "PC MP"
acpi_up = "ACPI UP" acpi_up = "ACPI UP"
;acpi_mp = "ACPI MP" acpi_mp = "ACPI MP"
apic_up = "APIC UP" apic_up = "APIC UP"
aacpi_up = "AAPIC UP" aacpi_up = "AAPIC UP"
xbox = "Xbox" xbox = "Xbox"
@ -266,9 +266,9 @@ hal.dll = 1,,,,,,,2,,,,1,2
ntoskrnl.exe = 1,,,,,,,2,,,,1,2 ntoskrnl.exe = 1,,,,,,,2,,,,1,2
halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2
;[Files.acpi_mp] [Files.acpi_mp]
;ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2 ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2
;halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 halmacpi.dll = 1,,,,,,,2,,,hal.dll,1,2
[Files.apic_up] [Files.apic_up]
ntoskrnl.exe = 1,,,,,,,2,,,,1,2 ntoskrnl.exe = 1,,,,,,,2,,,,1,2

2
hal/halx86/CMakeLists.txt
View file

@ -66,7 +66,7 @@ if(ARCH STREQUAL "i386")
add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS xbox up) add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS xbox up)
add_hal(halpc98 SOURCES pc98/halpc98.rc COMPONENTS pc98 up) add_hal(halpc98 SOURCES pc98/halpc98.rc COMPONENTS pc98 up)
#add_hal(halmacpi SOURCES smp/halmacpi.rc COMPONENTS generic acpi smp apic) add_hal(halmacpi SOURCES smp/halmacpi.rc COMPONENTS generic acpi smp apic)
#add_hal(halmp SOURCES mp/halmp.rc COMPONENTS generic legacy smp apic) #add_hal(halmp SOURCES mp/halmp.rc COMPONENTS generic legacy smp apic)
elseif(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "amd64")