aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2016-10-12 12:44:08 +0200
committerAlexey Kardashevskiy <aik@ozlabs.ru>2016-10-17 11:02:16 +1100
commitc7a2362f3f5d249052f57d97d0efeb729d77bdb2 (patch)
tree4a124d6c0fb1e6a291665265d071b7afdae2acf3
parent87404ee220a370a133b417bca2224dd5a651ba3c (diff)
downloadSLOF-c7a2362f3f5d249052f57d97d0efeb729d77bdb2.zip
SLOF-c7a2362f3f5d249052f57d97d0efeb729d77bdb2.tar.gz
SLOF-c7a2362f3f5d249052f57d97d0efeb729d77bdb2.tar.bz2
obp-tftp: Remove the ciregs-buffer
When a secondary boot loader like Yaboot tries to load additional files like the kernel image via TFTP, SLOF internally started the net-snk as a second client to do the TFTP transfer. So there were suddenly two clients using the Open Firmware client interface at the same time. Thus the obp-tftp code had to save the client interface registers from yaboot before jumping into the net-snk client, and restore them afterwards. Since we're now not using net-snk for the network loading anymore, we also don't need to buffer the register contents of the client anymore. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
-rw-r--r--slof/fs/packages/obp-tftp.fs11
1 files changed, 0 insertions, 11 deletions
diff --git a/slof/fs/packages/obp-tftp.fs b/slof/fs/packages/obp-tftp.fs
index 2e6bcfc..63171d0 100644
--- a/slof/fs/packages/obp-tftp.fs
+++ b/slof/fs/packages/obp-tftp.fs
@@ -14,18 +14,11 @@ s" obp-tftp" device-name
VARIABLE huge-tftp-load 1 huge-tftp-load !
-INSTANCE VARIABLE ciregs-buffer
-
: open ( -- okay? )
- ciregs-size alloc-mem ciregs-buffer !
true
;
: load ( addr -- size )
-
- \ Save old client interface register
- ciregs ciregs-buffer @ ciregs-size move
-
s" bootargs" get-chosen 0= IF 0 0 THEN >r >r
s" bootpath" get-chosen 0= IF 0 0 THEN >r >r
@@ -42,9 +35,6 @@ INSTANCE VARIABLE ciregs-buffer
my-args
net-load dup 0< IF drop 0 THEN
- \ Restore to old client interface register
- ciregs-buffer @ ciregs ciregs-size move
-
\ Recover buffer address of BOOTP-REPLY packet
r>
@@ -59,7 +49,6 @@ INSTANCE VARIABLE ciregs-buffer
;
: close ( -- )
- ciregs-buffer @ ciregs-size free-mem
;
: ping ( -- )