Use root.fs on qemu as well

We had lots of duplication of code between root.fs and fdt.fs

The reason we didn't use root.fs in the first place is that it tried
to create the root node and the chosen node which we already have via
the fdt.

Instead, modify root.fs to check for their presence and only "extend"
them in that case.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

2 files changed, 5 insertions, 41 deletions

diff --git a/board-qemu/slof/OF.fs b/board-qemu/slof/OF.fs
index d2cfdf4..c0f734b 100644
--- a/board-qemu/slof/OF.fs
+++ b/board-qemu/slof/OF.fs
@@ -109,10 +109,14 @@ d# 512000000 VALUE tb-frequency   \ default value - needed for "ms" to work
 
 #include <scsi-loader.fs>
 
-360 cp
+340 cp
 
 #include "fdt.fs"
 
+360 cp
+
+#include <root.fs>
+
 370 cp
 
 \ Grab rtas from qemu
diff --git a/board-qemu/slof/fdt.fs b/board-qemu/slof/fdt.fs
index c296ec6..497f416 100644
--- a/board-qemu/slof/fdt.fs
+++ b/board-qemu/slof/fdt.fs
@@ -361,43 +361,3 @@ fdt-claim-reserve
 ;
 s" /" find-node fdt-fix-phandles
 
-
-\ Remaining bits from root.fs
-
-defer (client-exec)
-defer client-exec
-
-\ defined in slof/fs/client.fs
-defer callback
-defer continue-client
-
-: set-chosen ( prop len name len -- )
-  s" /chosen" find-node set-property ;
-
-: get-chosen ( name len -- [ prop len ] success )
-  s" /chosen" find-node get-property 0= ;
-
-" /" find-device
-
-new-device
-  s" aliases" device-name
-finish-device
-
-new-device
-  s" options" device-name
-finish-device
-
-new-device
-  s" openprom" device-name
-  s" BootROM" device-type
-finish-device
-
-new-device 
-#include <packages.fs>
-finish-device
-
-: open true ;
-: close ;
-
-device-end
-