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

build/jam: add virtio_mmio, virtio_input to images

Browse Source 
* virtio_mmio for riscv64,arm,arm64
* enable new FDT bus for riscv64,arm,arm64

Change-Id: I5141de4e0bfcb44c5368dfafdf68ebf06ca5fb93
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4063
Reviewed-by: Jérôme Duval <jerome.duval@gmail.com>
This commit is contained in:
X512 2021-06-06 23:10:55 +09:00 committed by Jérôme Duval
parent cc818f35c4
commit 39ddb58870
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/jam/images/definitions/minimum
View File

@ -143,9 +143,9 @@ SYSTEM_NETWORK_PROTOCOLS =
; ;
SYSTEM_ADD_ONS_ACCELERANTS = [ FFilterByBuildFeatures SYSTEM_ADD_ONS_ACCELERANTS = [ FFilterByBuildFeatures
x86,x86_64 @{ x86,x86_64,riscv64 @{
vesa.accelerant vesa.accelerant
}@ # x86,x86_64 }@ # x86,x86_64,riscv64
] ; ] ;
SYSTEM_ADD_ONS_TRANSLATORS = SYSTEM_ADD_ONS_TRANSLATORS =
@ -171,9 +171,9 @@ SYSTEM_ADD_ONS_DRIVERS_AUDIO = ;
SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ;
SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = [ FFilterByBuildFeatures SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = [ FFilterByBuildFeatures
x86,x86_64 @{ x86,x86_64,riscv64 @{
vesa vesa
}@ # x86,x86_64 }@ # x86,x86_64,riscv64
] ; ] ;
SYSTEM_ADD_ONS_DRIVERS_MIDI = ; SYSTEM_ADD_ONS_DRIVERS_MIDI = ;
@ -217,6 +217,7 @@ SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
mmc mmc
scsi scsi
pci ps2@x86,x86_64 pci ps2@x86,x86_64
fdt@riscv64
random random
usb usb
virtio virtio

9
build/jam/packages/Haiku
View File

@ -44,7 +44,8 @@ AddFilesToPackage add-ons kernel busses random : virtio_rng ;
AddFilesToPackage add-ons kernel busses scsi : ahci virtio_scsi ; AddFilesToPackage add-ons kernel busses scsi : ahci virtio_scsi ;
AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci
<usb>xhci ; <usb>xhci ;
AddFilesToPackage add-ons kernel busses virtio : virtio_pci ; AddFilesToPackage add-ons kernel busses virtio : virtio_mmio@riscv64,arm,arm64
virtio_pci ;
AddFilesToPackage add-ons kernel console : vga_text ; AddFilesToPackage add-ons kernel console : vga_text ;
AddFilesToPackage add-ons kernel debugger AddFilesToPackage add-ons kernel debugger
: <kdebug>demangle <kdebug>disasm@x86,x86_64 <kdebug>hangman : <kdebug>demangle <kdebug>disasm@x86,x86_64 <kdebug>hangman
@ -73,6 +74,7 @@ AddNewDriversToPackage disk virtual : virtio_block ram_disk ;
AddNewDriversToPackage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ; AddNewDriversToPackage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
AddNewDriversToPackage sensor : $(SYSTEM_ADD_ONS_DRIVERS_SENSOR) ; AddNewDriversToPackage sensor : $(SYSTEM_ADD_ONS_DRIVERS_SENSOR) ;
AddNewDriversToPackage network : virtio_net ; AddNewDriversToPackage network : virtio_net ;
AddNewDriversToPackage input : virtio_input ;
#AddNewDriversToPackage display : display_adapter@x86 ; #AddNewDriversToPackage display : display_adapter@x86 ;
# legacy drivers # legacy drivers
@ -203,10 +205,11 @@ AddBootModuleSymlinksToPackage
nvme_disk@x86,x86_64 nvme_disk@x86,x86_64
openpic@ppc openpic@ppc
packagefs pci packagefs pci
fdt@riscv64,arm,arm64
scsi scsi_cd scsi_disk scsi_periph silicon_image_3112 highpoint_ide_pci scsi scsi_cd scsi_disk scsi_periph silicon_image_3112 highpoint_ide_pci
sdhci_pci sdhci_pci
usb usb_disk <usb>ehci <usb>ohci <usb>uhci <usb>xhci usb usb_disk <usb>ehci <usb>ohci <usb>uhci <usb>xhci
virtio virtio_block virtio_pci virtio_scsi virtio virtio_block virtio_mmio@riscv64,arm,arm64 virtio_pci virtio_scsi
; ;
# add-ons # add-ons
@ -239,7 +242,7 @@ AddSymlinkToPackage add-ons Tracker
: /boot/system/apps/DiskUsage : DiskUsage ; : /boot/system/apps/DiskUsage : DiskUsage ;
AddFilesToPackage add-ons input_server devices AddFilesToPackage add-ons input_server devices
: <input>keyboard <input>mouse <input>tablet <input>wacom ; : <input>keyboard <input>mouse <input>tablet <input>virtio <input>wacom ;
AddFilesToPackage add-ons input_server filters AddFilesToPackage add-ons input_server filters
: padblocker screen_saver shortcut_catcher switch_workspace ; : padblocker screen_saver shortcut_catcher switch_workspace ;
AddDirectoryToPackage add-ons input_server methods ; AddDirectoryToPackage add-ons input_server methods ;