i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86_64: added acpi to the image.

Browse Source 
* embedded_controller crashes on x86_64, disabled for now.
* removed the -fno-pic compile option.
* synched HaikuBootstrap package with Haiku package.
This commit is contained in:
Jérôme Duval
2013-10-19 21:46:56 +02:00
parent c74afb578a
commit 5d9aaba22f
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/HaikuImage
+3 -3
View File
@@ -186,7 +186,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
3com atheros813x ar81xx attansic_l1 attansic_l2 broadcom440x
broadcom570x dec21xxx ipro100 ipro1000 jmicron2x0 marvell_yukon nforce
pcnet rtl8139 rtl81xx sis19x syskonnect via_rhine vt612x
}@ # x86_64
}@ # x86,x86_64
etherpci pegasus sis900 usb_davicom usb_asix usb_ecm wb840
@@ -204,8 +204,8 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures acpi_button@x86 ] ;
SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
ata@ata pci ps2@x86,x86_64 isa@x86,x86_64
ide@ide scsi config_manager agp_gart@x86,x86_64 usb firewire@x86 acpi@x86
virtio random
ide@ide scsi config_manager agp_gart@x86,x86_64 usb firewire@x86
acpi@x86,x86_64 virtio random
] ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs cdda exfat ext2 fat iso9660 nfs
nfs4 attribute_overlay write_overlay ntfs packagefs reiserfs@x86 udf
build/jam/packages/Haiku
+1 -1
View File
@@ -242,7 +242,7 @@ AddFilesToPackage data KeyboardLayouts ThinkPad
# boot module links
AddBootModuleSymlinksToPackage
acpi@x86 ata@ata pci isa@x86 config_manager dpc
acpi@x86,x86_64 ata@ata pci isa@x86,x86_64 config_manager dpc
ide@ide scsi usb
openpic@ppc
ata_adapter@ata ide_adapter@ide locked_pool scsi_periph
build/jam/packages/HaikuBootstrap
+2 -2
View File
@@ -26,7 +26,7 @@ for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
# modules
AddFilesToPackage add-ons kernel bus_managers : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
AddFilesToPackage add-ons kernel busses agp_gart : <agp_gart>intel@x86 ;
AddFilesToPackage add-ons kernel busses agp_gart : <agp_gart>intel@x86,x86_64 ;
if $(HAIKU_ATA_STACK) = 1 {
AddFilesToPackage add-ons kernel busses ata
@@ -206,7 +206,7 @@ AddFilesToPackage data KeyboardLayouts ThinkPad
# boot module links
AddBootModuleSymlinksToPackage
acpi@x86 ata@ata pci isa@x86 config_manager dpc
acpi@x86,x86_64 ata@ata pci isa@x86,x86_64 config_manager dpc
ide@ide scsi usb
openpic@ppc
ata_adapter@ata ide_adapter@ide locked_pool scsi_periph
src/add-ons/kernel/bus_managers/acpi/Jamfile
+1 -1
View File
@@ -4,7 +4,7 @@ UsePrivateKernelHeaders ;
SubDirHdrs [ FDirName $(SUBDIR) acpica include ] ;
SubDirHdrs [ FDirName $(SUBDIR) acpica include platform ] ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) pci ] ;
SubDirCcFlags -fno-pic -D_KERNEL_MODE ;
SubDirCcFlags -D_KERNEL_MODE ;
local common_src =
src/add-ons/kernel/bus_managers/acpi/Module.cpp
+2
View File
@@ -233,7 +233,9 @@ module_info* modules[] = {
(module_info*)&sACPIRootModule,
(module_info*)&acpi_ns_dump_module,
(module_info*)&gACPIDeviceModule,
#ifndef __x86_64__
(module_info*)&embedded_controller_driver_module,
(module_info*)&embedded_controller_device_module,
#endif
NULL
};