Changeset 3310

Timestamp:

Sep 17, 2012 1:21:05 AM (8 months ago)

Author:

wmb

Message:

Linux support - align the ramdisk and flattened device tree addresses.
OLPC Trac #12107. The problem happened when secure-booting an initrd
whose size was not a multiple of 4.

Location:

cpu

Files:

• arm/linux.fth (modified) (2 diffs)
• x86/pc/linux.fth (modified) (1 diff)

cpu/arm/linux.fth

@@ -115 +115 @@
    use-fdt?  if
       make-usable-property
-      ramdisk-adr ?dup 0=  if  load-base  then  /fdt-max -  to linux-params
+      ramdisk-adr ?dup 0=  if  load-base  then
+      /fdt-max - 4 round-down  to linux-params
       linux-params /fdt-max flatten-device-tree
    else
@@ -131 +132 @@
 defer place-ramdisk
 : linux-place-ramdisk  ( adr len -- )
-   to /ramdisk                                    ( adr )
-
-   load-base  /ramdisk -                          ( adr new-ramdisk-adr )
+   aligned  to /ramdisk                           ( adr )
+
+   load-base  /ramdisk - 4 round-down             ( adr new-ramdisk-adr )
    tuck /ramdisk move                             ( new-ramdisk-adr )
 \  dup to linux-memtop

cpu/x86/pc/linux.fth

@@ -208 +208 @@
       ?dup  if  1+  else  h# 8000.0000  then      ( adr ramdisk-limit )
 
-      memory-limit  umin  /ramdisk -              ( adr new-ramdisk-adr )
+      memory-limit  umin  /ramdisk - 4 round-down ( adr new-ramdisk-adr )
       tuck /ramdisk move                          ( new-ramdisk-adr )
       dup