From a481b1d18a6238b011638501e51465b239bc79e1 Mon Sep 17 00:00:00 2001 From: Nikunj A Dadhania Date: Thu, 8 Aug 2013 18:04:12 +0530 Subject: js2x: more fixes * Build fixes to include scsi files * Move usb-setup-hcidev out of board-qemu * Fix pci-bridge-probe to assign temporary ranges Signed-off-by: Nikunj A Dadhania --- board-js2x/slof/Makefile | 4 ++++ board-js2x/slof/OF.fs | 2 +- board-js2x/slof/pci-bridge_1022_7460.fs | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'board-js2x') diff --git a/board-js2x/slof/Makefile b/board-js2x/slof/Makefile index 00a52d9..1dd9be5 100644 --- a/board-js2x/slof/Makefile +++ b/board-js2x/slof/Makefile @@ -73,6 +73,10 @@ OF_FFS_FILES = \ $(SLOFCMNDIR)/fs/ide.fs \ $(SLOFCMNDIR)/fs/fbuffer.fs \ $(SLOFCMNDIR)/fs/generic-disk.fs \ + $(SLOFCMNDIR)/fs/scsi-disk.fs \ + $(SLOFCMNDIR)/fs/scsi-host-helpers.fs \ + $(SLOFCMNDIR)/fs/scsi-probe-helpers.fs \ + $(SLOFCMNDIR)/fs/scsi-support.fs \ $(SLOFCMNDIR)/fs/pci-device.fs \ $(SLOFCMNDIR)/fs/pci-bridge.fs \ $(SLOFCMNDIR)/fs/pci-properties.fs \ diff --git a/board-js2x/slof/OF.fs b/board-js2x/slof/OF.fs index 33a98b6..3e37735 100644 --- a/board-js2x/slof/OF.fs +++ b/board-js2x/slof/OF.fs @@ -444,7 +444,7 @@ enable-framebuffer-output 8b0 cp \ do not let the usb scan overwrite the atapi cdrom alias -pci-cdrom-num TO cdrom-alias-num +\ pci-cdrom-num TO cdrom-alias-num usb-scan : create-aliases ( -- ) diff --git a/board-js2x/slof/pci-bridge_1022_7460.fs b/board-js2x/slof/pci-bridge_1022_7460.fs index d6a73d3..87b5830 100644 --- a/board-js2x/slof/pci-bridge_1022_7460.fs +++ b/board-js2x/slof/pci-bridge_1022_7460.fs @@ -152,6 +152,7 @@ my-space pci-class-name type cr \ and scan the bus(es) beyond that Bridge : pci-bridge-probe-amd8111 ( addr -- ) dup pci-bridge-set-bases \ SetUp all Base Registers + dup pci-bridge-range-props \ Setup temporary "range pci-bus-number 1+ TO pci-bus-number \ increase number of busses found pci-device-vec-len 1+ TO pci-device-vec-len \ increase the device-slot vector depth dup \ stack config-addr for pci-bus! -- cgit v1.1