Changeset 3041

Timestamp:

Jul 7, 2012 4:20:04 AM (11 months ago)

Author:

wmb

Message:

OLPC ARM - move the flattened device tree and the initrd to the end of memory, ensuring that they don't collide with one another (OLPC trac #11998).

Location:

cpu/arm

Files:

• linux.fth (modified) (5 diffs)
• olpc/build-fw.fth (modified) (1 diff)

cpu/arm/linux.fth

@@ -10 +10 @@
 0 value linux-memtop
 
+defer mapped-limit
 defer memory-limit
 \ Find the end of the largest piece of memory
@@ -33 +34 @@
 ;
 ' (memory-limit) to memory-limit  \ Override by platform code if necessary
+' memory-limit to mapped-limit    \ Override by platform code if necessary
 
 \ see http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html
@@ -93 +95 @@
 : use-fdt  ( -- )  true to use-fdt?  ;
 
+h# 10000 constant /fdt-max
 : linux-fixup  ( -- )
 [ifdef] linux-logo  linux-logo  [then]
@@ -105 +108 @@
 [ifdef] flatten-device-tree
    use-fdt?  if
-      load-base h# 40000 - to linux-params
-      linux-params h# 40000 flatten-device-tree
+      ramdisk-adr ?dup 0=  if  mapped-limit  then  /fdt-max -  to linux-params
+      linux-params /fdt-max flatten-device-tree
    else
       args-buf cscount linux-params set-parameters
@@ -123 +126 @@
    to /ramdisk                                    ( adr )
 
-   dup memory-limit  umin  /ramdisk -             ( adr new-ramdisk-adr )
+   mapped-limit  /ramdisk -                       ( adr new-ramdisk-adr )
    tuck /ramdisk move                             ( new-ramdisk-adr )
 \  dup to linux-memtop

cpu/arm/olpc/build-fw.fth

@@ -491 +491 @@
 : olpc-memory-limit  ( -- adr )  extra-mem-va >physical  ;
 ' olpc-memory-limit to memory-limit
+: olpc-mapped-limit  ( -- adr )  dma-mem-va >physical  ;
+' olpc-mapped-limit to mapped-limit
 
 \+ olpc-cl2 d#  9999 to arm-linux-machine-type  \ XO-1.75