aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@linux.vnet.ibm.com>2015-03-11 15:43:44 +0100
committerAlexey Kardashevskiy <aik@ozlabs.ru>2015-03-12 18:25:35 +1100
commit18b1f6097643c3792b39370846a434b10ccb27bb (patch)
treeacd43c90f4fa2350dababed234bbc20b711b22f5
parente6c14049aee8ecfc0c3d105c296a48a1b9d274b1 (diff)
downloadSLOF-18b1f6097643c3792b39370846a434b10ccb27bb.zip
SLOF-18b1f6097643c3792b39370846a434b10ccb27bb.tar.gz
SLOF-18b1f6097643c3792b39370846a434b10ccb27bb.tar.bz2
Use device-type Forth word to set up the corresponding property
It's easier to use "device-type" instead of creating the corresponding properties manually. Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
-rw-r--r--board-js2x/slof/pci-device_1002_515e.fs2
-rw-r--r--board-js2x/slof/vga-display.fs2
-rw-r--r--board-qemu/slof/pci-device_1013_00b8.fs2
-rw-r--r--board-qemu/slof/pci-device_1234_1111.fs2
4 files changed, 4 insertions, 4 deletions
diff --git a/board-js2x/slof/pci-device_1002_515e.fs b/board-js2x/slof/pci-device_1002_515e.fs
index 9f7d8c2..39a02de 100644
--- a/board-js2x/slof/pci-device_1002_515e.fs
+++ b/board-js2x/slof/pci-device_1002_515e.fs
@@ -460,7 +460,7 @@ init2_array init2_length encode-array " ibm,init2" property
pllinit_array pllinit_length encode-array " ibm,pllinit" property
meminit_array meminit_length encode-array " ibm,meminit" property
0 0 encode-bytes " iso6429-1983-colors" property
-" display" encode-string " device_type" property
+s" display" device-type
/scanline encode-int " width" property
#scanlines encode-int " height" property
8 encode-int " depth" property
diff --git a/board-js2x/slof/vga-display.fs b/board-js2x/slof/vga-display.fs
index 0cc9bba..0295e88 100644
--- a/board-js2x/slof/vga-display.fs
+++ b/board-js2x/slof/vga-display.fs
@@ -20,7 +20,7 @@ value display_num ( str len )
s" ,Display-" $cat 41 display_num + char-cat \ add ", Display-A" or "-B" to name ( str len )
encode-string s" name" property \ store as name property
-s" display" encode-string s" device_type" property \ add "device_type" propert
+s" display" device-type
\ screen-info is set by pci-class_03.fs contains output of get_vbe_info bios-snk call
CASE screen-info c@ \ ( display-type )
diff --git a/board-qemu/slof/pci-device_1013_00b8.fs b/board-qemu/slof/pci-device_1013_00b8.fs
index 778f1e8..8c6b623 100644
--- a/board-qemu/slof/pci-device_1013_00b8.fs
+++ b/board-qemu/slof/pci-device_1013_00b8.fs
@@ -283,7 +283,7 @@ false VALUE is-installed?
disp-depth encode-int s" depth" property
s" ISO8859-1" encode-string s" character-set" property \ i hope this is ok...
\ add "device_type" property
- s" display" encode-string s" device_type" property
+ s" display" device-type
\ XXX We don't create an "address" property because Linux doesn't know what
\ to do with it for >32-bit
;
diff --git a/board-qemu/slof/pci-device_1234_1111.fs b/board-qemu/slof/pci-device_1234_1111.fs
index fde9d64..13246be 100644
--- a/board-qemu/slof/pci-device_1234_1111.fs
+++ b/board-qemu/slof/pci-device_1234_1111.fs
@@ -245,7 +245,7 @@ a CONSTANT VBE_DISPI_INDEX_NB
disp-depth encode-int s" depth" property
s" ISO8859-1" encode-string s" character-set" property \ i hope this is ok...
\ add "device_type" property
- s" display" encode-string s" device_type" property
+ s" display" device-type
s" qemu,std-vga" encode-string s" compatible" property
\ XXX We don't create an "address" property because Linux doesn't know what
\ to do with it for >32-bit