summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@openbios.org>2005-12-03 23:12:07 +0000
committerStefan Reinauer <stepan@openbios.org>2005-12-03 23:12:07 +0000
commitbd25fe979bee6a2912b671b7f811192c51c5f95f (patch)
tree0e8ca64a79d6d0043efd45a98a1cfd36df568bda /src
parent4bd0de0b2ecb0d59fb0703df71062c61e7c34cf6 (diff)
applied 1202_ldscript.diff from issue 45. This fixes images smaller than 64k
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2126 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/init/ldscript.lb3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/i386/init/ldscript.lb b/src/arch/i386/init/ldscript.lb
index 1e712a3117..e647fb42fe 100644
--- a/src/arch/i386/init/ldscript.lb
+++ b/src/arch/i386/init/ldscript.lb
@@ -43,7 +43,8 @@ SECTIONS
_eram = . ;
}
- . = _ROMBASE + ROM_IMAGE_SIZE - 0x10000;
+ _x = .;
+ . = (_x < (_ROMBASE - 0x10000 + ROM_IMAGE_SIZE)) ? (_ROMBASE - 0x10000 + ROM_IMAGE_SIZE) : _x;
/* This section might be better named .setup */
.rom . : {