Changeset 3041


Ignore:
Timestamp:
Jul 7, 2012, 4:20:04 AM (2 years 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:
2 edited

Legend:

Unmodified
Added
Removed
  • cpu/arm/linux.fth

    r3023 r3041  
    10100 value linux-memtop 
    1111 
     12defer mapped-limit 
    1213defer memory-limit 
    1314\ Find the end of the largest piece of memory 
     
    3334; 
    3435' (memory-limit) to memory-limit  \ Override by platform code if necessary 
     36' memory-limit to mapped-limit    \ Override by platform code if necessary 
    3537 
    3638\ see http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html 
     
    9395: use-fdt  ( -- )  true to use-fdt?  ; 
    9496 
     97h# 10000 constant /fdt-max 
    9598: linux-fixup  ( -- ) 
    9699[ifdef] linux-logo  linux-logo  [then] 
     
    105108[ifdef] flatten-device-tree 
    106109   use-fdt?  if 
    107       load-base h# 40000 - to linux-params 
    108       linux-params h# 40000 flatten-device-tree 
     110      ramdisk-adr ?dup 0=  if  mapped-limit  then  /fdt-max - to linux-params 
     111      linux-params /fdt-max flatten-device-tree 
    109112   else 
    110113      args-buf cscount linux-params set-parameters 
     
    123126   to /ramdisk                                    ( adr ) 
    124127 
    125    dup memory-limit  umin  /ramdisk -             ( adr new-ramdisk-adr ) 
     128   mapped-limit  /ramdisk -                       ( adr new-ramdisk-adr ) 
    126129   tuck /ramdisk move                             ( new-ramdisk-adr ) 
    127130\  dup to linux-memtop 
  • cpu/arm/olpc/build-fw.fth

    r3040 r3041  
    491491: olpc-memory-limit  ( -- adr )  extra-mem-va >physical  ; 
    492492' olpc-memory-limit to memory-limit 
     493: olpc-mapped-limit  ( -- adr )  dma-mem-va >physical  ; 
     494' olpc-mapped-limit to mapped-limit 
    493495 
    494496\+ olpc-cl2 d#  9999 to arm-linux-machine-type  \ XO-1.75 
Note: See TracChangeset for help on using the changeset viewer.