[Fedora-livecd-list] 2 commits - tools/livecd-iso-to-disk.sh

[Jeremy Katz]

 tools/livecd-iso-to-disk.sh |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit a2f6bcec53e2c455cfcff76a4a297c31685034f1
Author: Jeremy Katz <katzj at redhat.com>
Date:   Wed Nov 12 12:31:19 2008 -0500

    Make initrd mem patch for OLPC conditional on firmware revision
    
    Make the olpc.fth patch for changing where the ramdisk gets loaded
    conditional on firmware revision since later firmwares already do
    this (Mitch Bradley, http://dev.laptop.org/ticket/8971#comment:2)

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index ab2e632..b11c0aa 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -547,14 +547,16 @@ if [ -n "$xo" ]; then
     if [ ! -d $USBMNT/boot ]; then mkdir -p $USBMNT/boot ; fi
     cat > $USBMNT/boot/olpc.fth <<EOF
 \ Boot script for USB boot
-patch 2drop erase claim-params
-: high-ramdisk  ( -- )
-   cv-load-ramdisk
-   h# 22c +lp l@ 1+   memory-limit  umin  /ramdisk - ffff.f000 and ( new-ramdisk-adr )
-   ramdisk-adr over  /ramdisk move                    ( new-ramdisk-adr )
-   to ramdisk-adr
-;
-' high-ramdisk to load-ramdisk
+hex  rom-pa fffc7 + 4 $number drop  h# 2e19 < [if]
+  patch 2drop erase claim-params
+  : high-ramdisk  ( -- )
+     cv-load-ramdisk
+     h# 22c +lp l@ 1+   memory-limit  umin  /ramdisk - ffff.f000 and ( new-ramdisk-adr )
+     ramdisk-adr over  /ramdisk move                    ( new-ramdisk-adr )
+     to ramdisk-adr
+  ;
+  ' high-ramdisk to load-ramdisk
+[then]
 
 : set-bootpath-dev  ( -- )
    " /chosen" find-package  if                       ( phandle )


commit 80dd9e607655230c9566c85288edfd44b810c09c
Author: Jeremy Katz <katzj at redhat.com>
Date:   Fri Nov 7 16:58:01 2008 -0500

    Align initrd properly (#467093)
    
    The initrd needs to be loaded aligned in memory to avoid a kernel warning

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index d3e81cc..ab2e632 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -550,7 +550,7 @@ if [ -n "$xo" ]; then
 patch 2drop erase claim-params
 : high-ramdisk  ( -- )
    cv-load-ramdisk
-   h# 22c +lp l@ 1+   memory-limit  umin  /ramdisk -  ( new-ramdisk-adr )
+   h# 22c +lp l@ 1+   memory-limit  umin  /ramdisk - ffff.f000 and ( new-ramdisk-adr )
    ramdisk-adr over  /ramdisk move                    ( new-ramdisk-adr )
    to ramdisk-adr
 ;