minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 20:52:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

x86: Fix a few recently added bugs

Browse Source 
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
This commit is contained in:
Gabe Black 2011-11-16 23:32:50 +00:00 committed by Graeme Russ
parent 769db03a4a
commit 60a9b6bfdd
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/cpu/cpu.c
View File

@ -37,6 +37,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/processor-flags.h> #include <asm/processor-flags.h>
#include <asm/interrupt.h> #include <asm/interrupt.h>
#include <linux/compiler.h>
/* /*
* Constructor for a conventional segment GDT (or LDT) entry * Constructor for a conventional segment GDT (or LDT) entry

6
arch/x86/lib/board.c
View File

@ -220,6 +220,9 @@ static int do_elf_reloc_fixups(void)
Elf32_Addr *offset_ptr_rom; Elf32_Addr *offset_ptr_rom;
Elf32_Addr *offset_ptr_ram; Elf32_Addr *offset_ptr_ram;
/* The size of the region of u-boot that runs out of RAM. */
uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start;
do { do {
/* Get the location from the relocation entry */ /* Get the location from the relocation entry */
offset_ptr_rom = (Elf32_Addr *)re_src->r_offset; offset_ptr_rom = (Elf32_Addr *)re_src->r_offset;
@ -228,7 +231,8 @@ static int do_elf_reloc_fixups(void)
if (offset_ptr_rom >= (Elf32_Addr *)CONFIG_SYS_TEXT_BASE) { if (offset_ptr_rom >= (Elf32_Addr *)CONFIG_SYS_TEXT_BASE) {
/* Switch to the in-RAM version */ /* Switch to the in-RAM version */
offset_ptr_ram = offset_ptr_rom + gd->reloc_off; offset_ptr_ram = (Elf32_Addr *)((ulong)offset_ptr_rom +
gd->reloc_off);
/* Check that the target points into .text */ /* Check that the target points into .text */
if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE && if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE &&