diff options
Diffstat (limited to 'src/cpu/x86/16bit')
| -rw-r--r-- | src/cpu/x86/16bit/reset16.inc | 5 | ||||
| -rw-r--r-- | src/cpu/x86/16bit/reset16.lds | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/cpu/x86/16bit/reset16.inc b/src/cpu/x86/16bit/reset16.inc index d36c94085e..1be0e3a94c 100644 --- a/src/cpu/x86/16bit/reset16.inc +++ b/src/cpu/x86/16bit/reset16.inc @@ -2,8 +2,6 @@ .code16 .globl reset_vector reset_vector: -#if _ROMBASE >= 0xffff0000 - /* jmp _start */ .byte 0xe9 .int _start - ( . + 2 ) /* Note: The above jump is hand coded to work around bugs in binutils. @@ -12,9 +10,6 @@ reset_vector: * instead of the weird 16 bit relocations that binutils does not * handle consistenly between versions because they are used so rarely. */ -#else -# error _ROMBASE is an unsupported value -#endif . = 0x8; .code32 jmp protected_start diff --git a/src/cpu/x86/16bit/reset16.lds b/src/cpu/x86/16bit/reset16.lds index 80f2fc0c6f..d01f094b3c 100644 --- a/src/cpu/x86/16bit/reset16.lds +++ b/src/cpu/x86/16bit/reset16.lds @@ -4,7 +4,8 @@ */ SECTIONS { - _ROMTOP = (_ROMBASE >= 0xffff0000)? 0xfffffff0 : 0xffff0; + /* Trigger an error if I have an unuseable start address */ + _ROMTOP = (_start >= 0xffff0000) ? 0xfffffff0 : 0xffffffff8; . = _ROMTOP; .reset . : { *(.reset) @@ -12,3 +13,4 @@ SECTIONS { BYTE(0x00); } } + |