diff options
| author | Tom Rini <trini@ti.com> | 2012-10-17 08:57:13 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-17 08:57:13 -0700 |
| commit | d1ff690612415470a681787c029803952142043d (patch) | |
| tree | 09a7a42be56797aa57abefc8f464bffa1ecb16da /board | |
| parent | ff04f6d1224d8952b566b8671222151495883073 (diff) | |
| parent | 6b2eba1b7cd661fc6b2b0e0d4d039d1c299e2e07 (diff) | |
| download | talos-obmc-uboot-d1ff690612415470a681787c029803952142043d.tar.gz talos-obmc-uboot-d1ff690612415470a681787c029803952142043d.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'board')
| -rw-r--r-- | board/qemu-mips/config.mk | 10 | ||||
| -rw-r--r-- | board/qemu-mips/u-boot.lds | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/board/qemu-mips/config.mk b/board/qemu-mips/config.mk deleted file mode 100644 index 27cd34ac36..0000000000 --- a/board/qemu-mips/config.mk +++ /dev/null @@ -1,10 +0,0 @@ -# -# Qemu -M mips system emulator -# See http://fabrice.bellard.free.fr/qemu -# - -# ROM version -CONFIG_SYS_TEXT_BASE = 0xbfc00000 - -# RAM version -#CONFIG_SYS_TEXT_BASE = 0x80001000 diff --git a/board/qemu-mips/u-boot.lds b/board/qemu-mips/u-boot.lds index 9460b2010c..4d9580f817 100644 --- a/board/qemu-mips/u-boot.lds +++ b/board/qemu-mips/u-boot.lds @@ -24,7 +24,11 @@ /* OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-bigmips") */ +#if defined(CONFIG_64BIT) +OUTPUT_FORMAT("elf64-tradbigmips", "elf64-tradbigmips", "elf64-tradlittlemips") +#else OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips") +#endif OUTPUT_ARCH(mips) ENTRY(_start) SECTIONS @@ -63,7 +67,11 @@ SECTIONS } uboot_end_data = .; +#if defined(CONFIG_64BIT) + num_got_entries = (__got_end - __got_start) >> 3; +#else num_got_entries = (__got_end - __got_start) >> 2; +#endif . = ALIGN(4); .sbss : { *(.sbss*) } |
