Changeset 2851

Timestamp:

Feb 4, 2012 12:16:53 AM (16 months ago)

Author:

wmb

Message:

Flattened device tree fixes from debugging session.

Files:

• cpu/arm/linux.fth (modified) (4 diffs)
• ofw/core/fdt.fth (modified) (3 diffs)

cpu/arm/linux.fth

@@ -49 +49 @@
 defer ofw-tag, ' noop to ofw-tag,  \ Define externally if appropriate
 
-: set-parameters  ( cmdline$ -- )
-   linux-params to tag-adr
+: set-parameters  ( cmdline$ adr -- )
+   to tag-adr
 
    5           tag-l,    \ size   
@@ -95 +95 @@
 : linux-fixup  ( -- )
 [ifdef] linux-logo  linux-logo  [then]
-   use-fdt? 0=  if
-      args-buf cscount set-parameters          ( )
-   then
+\   use-fdt? 0=  if
+\      args-buf cscount set-parameters          ( )
+\   then
    disable-interrupts
 
@@ -105 +105 @@
 [ifdef] flatten-device-tree
    use-fdt?  if
-      flatten-device-tree to r2
+      linux-params h# 40000 flatten-device-tree
    else
-      linux-params to r2
-   then
-[else]
+      args-buf cscount linux-params set-parameters
+   then
+[then]
    linux-params to r2
-[then]
    linux-hook
 ;
@@ -128 +127 @@
    to ramdisk-adr
 
-   ramdisk-adr " linux,initd-start"  chosen-int-property
-   ramdisk-adr /ramdisk +  " linux,initd-end"  chosen-int-property
+   ramdisk-adr " linux,initrd-start"  chosen-int-property
+   ramdisk-adr /ramdisk +  " linux,initrd-end"  chosen-int-property
 ;
 : $load-ramdisk  ( name$ -- )

ofw/core/fdt.fth

@@ -11 +11 @@
 0 value fdt-strings-ptr
 0 value fdt-strings-end
-h# 40000 value /fdt
+0 value /fdt
 
 0 value the-node
 
 : fdt-remaining  ( -- n )  fdt-end fdt-ptr -  ;
-: ?fdt-enough  ( n -- )
-   
-;
 
 : +fdt  ( n -- ptr )
@@ -102 +99 @@
 ;
 
-: flatten-device-tree  ( -- adr )
-   /fdt alloc-mem /fdt-align round-up to fdt
-   fdt /fdt erase
+: flatten-device-tree  ( adr len -- )
+   to /fdt  to fdt
    fdt to fdt-ptr
    fdt /fdt + to fdt-end
@@ -167 +163 @@
    fdt
 ;
+
+: fdt@  ( offset -- l )  fdt + be-l@  ;
+: +fdt-ptr  ( n -- )  fdt-ptr + 4 round-up to fdt-ptr  ;
+: fdt@@  ( -- l )  fdt-ptr be-l@  /l +fdt-ptr  ;
+
+: fdt@$  ( -- adr len )
+   fdt-ptr cscount   ( adr len )
+   dup 1+ +fdt-ptr
+;
+: .fdt-value  ( value$ name$ -- )
+   " compatible"  $=  if  show-strings  exit  then
+
+   \ Test for unprintable characters
+   2dup -null text?  if   
+      to-display-column  -null  type  exit  
+   then   ( adr,len )
+
+   dup /n /mod  swap 0=  if         ( adr len #ints )
+      .ints   exit                  ( -- )
+   then                             ( adr,len #ints )
+   drop                             ( adr,len )
+
+   to-display-column  h# 10 min  cdump                             ( )
+;
+: .fdt-property  ( -- )
+   [ also hidden ] indent [ previous ]
+   fdt@@                                    ( value-length )
+   fdt@@ fdt-strings + cscount  2dup type   ( value-length name$ )
+   2>r  fdt-ptr over  2r>  .fdt-value       ( value-length )
+   +fdt-ptr                                 ( )
+;
+: .fdt-node  ( -- )
+   [ also hidden ] indent [ previous ]
+   fdt@$ type cr
+;
+
+: dump-fdt  ( -- )
+   0 fdt@ h# d00dfeed <> abort" FDT magic mismatch"
+   fdt  h# 0c fdt@ +  to fdt-strings
+   fdt h# 80 + to fdt-ptr
+   begin
+      fdt@@ case
+         1 of  .fdt-node 2 lmargin +!  endof
+         2 of  -2 lmargin +!  endof
+         3 of  .fdt-property  endof
+         9 of  exit  endof
+         ( -- ) ." Bogus DT tag " . cr exit
+      endcase
+   again
+;
+
 previous