[OpenBIOS] [PATCH 3/7] Remove /chosen "memory" property from the default device tree.

Mark Cave-Ayland mark.cave-ayland at ilande.co.uk
Fri Apr 12 14:57:43 CEST 2013


Similar to the earlier commit for "mmu", do the same for /chosen "memory"
property. Hence all architectures that want the "pretty" memory properties
can provide suitable ihandles if required, and those that don't will not
fail with a NULL pointer dereference from a zero ihandle.

While we're here, correct the SPARC32 initialiser to point to the correct
/virtual-memory node for "mmu" so that once again we can get "pretty"
memory properties on SPARC32.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland at ilande.co.uk>
---
 openbios-devel/arch/sparc32/init.fs |    2 +-
 openbios-devel/forth/device/tree.fs |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/openbios-devel/arch/sparc32/init.fs b/openbios-devel/arch/sparc32/init.fs
index 7306eab..26ffa05 100644
--- a/openbios-devel/arch/sparc32/init.fs
+++ b/openbios-devel/arch/sparc32/init.fs
@@ -32,7 +32,7 @@
 \ preopen device nodes (and store the ihandles under /chosen)
 :noname
   " memory" " /memory" preopen
-  " mmu" " /cpus/@0" preopen
+  " mmu" " /virtual-memory" preopen
 ; SYSTEM-initializer
 
 device-end
diff --git a/openbios-devel/forth/device/tree.fs b/openbios-devel/forth/device/tree.fs
index 00d12ed..04f85b5 100644
--- a/openbios-devel/forth/device/tree.fs
+++ b/openbios-devel/forth/device/tree.fs
@@ -53,7 +53,6 @@ new-device
   0 encode-int " stdout" property
   \ " hda1:/boot/vmunix" encode-string " bootpath" property
   \ " -as" encode-string " bootargs" property
-  0 encode-int " memory" property
 finish-device
   
 \ END
-- 
1.7.10.4




More information about the OpenBIOS mailing list