Changeset 2800

Timestamp:

Jan 6, 2012 5:31:16 PM (17 months ago)

Author:

wmb

Message:

OLPC trac #11568 - ARM - added flattened device tree support.

Files:

• cpu/arm/linux.fth (modified) (3 diffs)
• cpu/arm/olpc/build-fw.fth (modified) (1 diff)
• ofw/core/fdt.fth (added)

cpu/arm/linux.fth

@@ -90 +90 @@
 ;
 
+0 value use-fdt?
+: use-fdt  ( -- )  true to use-fdt?  ;
 
 : linux-fixup  ( -- )
 [ifdef] linux-logo  linux-logo  [then]
-   args-buf cscount set-parameters          ( )
+   use-fdt? 0=  if
+      args-buf cscount set-parameters          ( )
+   then
    disable-interrupts
 
@@ -99 +103 @@
    0 to r0
    arm-linux-machine-type to r1
+[ifdef] flatten-device-tree
+   use-fdt?  if
+      flatten-device-tree to r2
+   else
+      linux-params to r2
+   then
+[else]
    linux-params to r2
+[then]
    linux-hook
 ;
@@ -115 +127 @@
 \  dup to linux-memtop
    to ramdisk-adr
+
+   ramdisk-adr " linux,initd-start"  chosen-int-property
+   ramdisk-adr /ramdisk +  " linux,initd-end"  chosen-int-property
 ;
 : $load-ramdisk  ( name$ -- )

cpu/arm/olpc/build-fw.fth

@@ -362 +362 @@
 fload ${BP}/cpu/arm/marvell/utmiphy.fth
 
+fload ${BP}/ofw/core/fdt.fth
 fload ${BP}/cpu/arm/linux.fth