Author: quozl
Date: Wed Feb 13 08:36:31 2013
New Revision: 3544
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3544
Log:
mkdropin - again fix calculation of ending address for reserved area skip, by adding the pad to 4-byte boundary. A build using builder.dic from before svn 3540 had the reserved header exactly at reserved-start. See also svn 1980. Regenerated ARM builder using koji2.laptop.org.
Modified:
cpu/arm/build/builder.dic
forth/lib/mkdropin.fth
Modified: cpu/arm/build/builder.dic
==============================================================================
Binary file (source and/or target). No diff available.
Modified: forth/lib/mkdropin.fth
==============================================================================
--- forth/lib/mkdropin.fth Tue Feb 12 06:19:52 2013 (r3543)
+++ forth/lib/mkdropin.fth Wed Feb 13 08:36:31 2013 (r3544)
@@ -130,13 +130,13 @@
dup 4 round-up swap ?do 1 ofd @ fputc loop ( )
;
: write-dropin ( adr len expanded-len name-str -- )
- 2>r >r ( adr len r: name$ expanded-len )
+ 2>r >r ( adr len r: name$ expanded-len )
- \ Calculate expected ending position
- dup ofd @ ftell h# 20 + + ( adr len pos )
+ \ Calculate expected ending file position
+ ofd @ ftell over 4 round-up + h# 20 + ( adr len pos )
\ Encroaches upon manufacturing data area? If so, enumerate as a dropin.
- reserved-start h# 20 - reserved-end within if
+ reserved-start reserved-end within if
\ Calculate size of a dropin covering reserved area
reserved-end ofd @ ftell - h# 20 - ( adr len reslen )
\ Allocate memory for it
Author: quozl
Date: Mon Feb 11 05:18:54 2013
New Revision: 3540
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3540
Log:
mkdropin - fix calculation of ending address for reserved area skip, occasionally a reserved area began with trailing bytes of the dropin header.
Modified:
forth/lib/mkdropin.fth
Modified: forth/lib/mkdropin.fth
==============================================================================
--- forth/lib/mkdropin.fth Fri Feb 8 22:19:56 2013 (r3539)
+++ forth/lib/mkdropin.fth Mon Feb 11 05:18:54 2013 (r3540)
@@ -133,7 +133,7 @@
2>r >r ( adr len r: name$ expanded-len )
\ Calculate expected ending position
- dup ofd @ ftell + ( adr len pos )
+ dup ofd @ ftell h# 20 + + ( adr len pos )
\ Encroaches upon manufacturing data area? If so, enumerate as a dropin.
reserved-start h# 20 - reserved-end within if