summaryrefslogtreecommitdiff
path: root/lib_i386
diff options
context:
space:
mode:
Diffstat (limited to 'lib_i386')
-rw-r--r--lib_i386/board.c157
-rw-r--r--lib_i386/interrupts.c4
-rw-r--r--lib_i386/timer.c2
3 files changed, 93 insertions, 70 deletions
diff --git a/lib_i386/board.c b/lib_i386/board.c
index 44fa0e3..f3b6348 100644
--- a/lib_i386/board.c
+++ b/lib_i386/board.c
@@ -38,6 +38,7 @@
#include <net.h>
#include <ide.h>
#include <asm/u-boot-i386.h>
+#include <elf.h>
#ifdef CONFIG_BITBANGMII
#include <miiphy.h>
@@ -45,41 +46,16 @@
DECLARE_GLOBAL_DATA_PTR;
-extern long _i386boot_start;
-extern long _i386boot_end;
-extern long _i386boot_romdata_start;
-extern long _i386boot_romdata_dest;
-extern long _i386boot_romdata_size;
-extern long _i386boot_bss_start;
-extern long _i386boot_bss_size;
-
-/* The symbols defined by the linker script becomes pointers
- * which is somewhat inconveient ... */
-ulong i386boot_start = (ulong)&_i386boot_start; /* code start (in flash) defined in start.S */
-ulong i386boot_end = (ulong)&_i386boot_end; /* code end (in flash) */
-ulong i386boot_romdata_start = (ulong)&_i386boot_romdata_start; /* datasegment in flash (also code+rodata end) */
-ulong i386boot_romdata_dest = (ulong)&_i386boot_romdata_dest; /* data location segment in ram */
-ulong i386boot_romdata_size = (ulong)&_i386boot_romdata_size; /* size of data segment */
-ulong i386boot_bss_start = (ulong)&_i386boot_bss_start; /* bss start */
-ulong i386boot_bss_size = (ulong)&_i386boot_bss_size; /* bss size */
-
+/* Exports from the Linker Script */
+extern ulong _i386boot_text_start;
+extern ulong _i386boot_rel_dyn_start;
+extern ulong _i386boot_rel_dyn_end;
+extern ulong _i386boot_bss_start;
+extern ulong _i386boot_bss_size;
+void ram_bootstrap (void *);
const char version_string[] =
U_BOOT_VERSION" (" U_BOOT_DATE " - " U_BOOT_TIME ")";
-static int heap_init(void)
-{
- /* start malloc area right after the stack */
- ulong start = i386boot_bss_start + i386boot_bss_size +
- CONFIG_SYS_STACK_SIZE;
-
- /* 4-byte aligned */
- start = (start+3)&~3;
-
- mem_malloc_init(start, CONFIG_SYS_MALLOC_LEN);
-
- return 0;
-}
-
/************************************************************************
* Init Utilities *
************************************************************************
@@ -103,6 +79,7 @@ static int display_banner (void)
{
printf ("\n\n%s\n\n", version_string);
+/*
printf ("U-Boot code: %08lX -> %08lX data: %08lX -> %08lX\n"
" BSS: %08lX -> %08lX stack: %08lX -> %08lX\n",
i386boot_start, i386boot_romdata_start-1,
@@ -111,6 +88,7 @@ static int display_banner (void)
i386boot_bss_start+i386boot_bss_size,
i386boot_bss_start+i386boot_bss_size+CONFIG_SYS_STACK_SIZE-1);
+*/
return (0);
}
@@ -142,7 +120,6 @@ static void display_flash_config (ulong size)
print_size (size, "\n");
}
-
/*
* Breath some life into the board...
*
@@ -154,6 +131,7 @@ static void display_flash_config (ulong size)
* can relocate the monitor code to RAM.
*/
+
/*
* All attempts to come up with a "common" initialization sequence
* that works for all boards and architectures failed: some of the
@@ -169,13 +147,12 @@ static void display_flash_config (ulong size)
typedef int (init_fnc_t) (void);
init_fnc_t *init_sequence[] = {
- cpu_init, /* basic cpu dependent setup */
- board_init, /* basic board dependent setup */
+ serial_init,
+ cpu_init_r, /* basic cpu dependent setup */
+ board_early_init_r, /* basic board dependent setup */
dram_init, /* configure available RAM banks */
- heap_init, /* dependant on dram_init */
interrupt_init, /* set up exceptions */
timer_init,
- serial_init,
env_init, /* initialize environment */
init_baudrate, /* initialze baudrate settings */
serial_init, /* serial communications setup */
@@ -187,21 +164,86 @@ init_fnc_t *init_sequence[] = {
gd_t *gd;
-void start_i386boot (void)
+/*
+ * Load U-Boot into RAM, initialize BSS, perform relocation adjustments
+ */
+void board_init_f (ulong stack_limit)
+{
+ void *text_start = &_i386boot_text_start;
+ void *u_boot_cmd_end = &__u_boot_cmd_end;
+ Elf32_Rel *rel_dyn_start = (Elf32_Rel *)&_i386boot_rel_dyn_start;
+ Elf32_Rel *rel_dyn_end = (Elf32_Rel *)&_i386boot_rel_dyn_end;
+ void *bss_start = &_i386boot_bss_start;
+ void *bss_size = &_i386boot_bss_size;
+
+ size_t uboot_size;
+ void *ram_start;
+ ulong rel_offset;
+ Elf32_Rel *re;
+
+ void (*start_func)(void *);
+
+ /* compiler optimization barrier needed for GCC >= 3.4 */
+ __asm__ __volatile__("": : :"memory");
+
+ uboot_size = (size_t)u_boot_cmd_end - (size_t)text_start;
+ ram_start = (void *)stack_limit - (uboot_size + (ulong)bss_size);
+ rel_offset = text_start - ram_start;
+ start_func = ram_bootstrap - rel_offset;
+
+ /* First stage CPU initialization */
+ if (cpu_init_f() != 0)
+ hang();
+
+ /* First stage Board initialization */
+ if (board_early_init_f() != 0)
+ hang();
+
+ /* Copy U-Boot into RAM */
+ memcpy(ram_start, text_start, (size_t)uboot_size);
+
+ /* Clear BSS */
+ memset(bss_start - rel_offset, 0, (size_t)bss_size);
+
+ /* Perform relocation adjustments */
+ for (re = rel_dyn_start; re < rel_dyn_end; re++)
+ {
+ if (re->r_offset >= TEXT_BASE)
+ if (*(ulong *)re->r_offset >= TEXT_BASE)
+ *(ulong *)(re->r_offset - rel_offset) -= (Elf32_Addr)rel_offset;
+ }
+
+ start_func(ram_start);
+
+ /* NOTREACHED - relocate_code() does not return */
+ while(1);
+}
+
+/*
+ * All attempts to jump straight from board_init_f() to board_init_r()
+ * have failed, hence this special 'bootstrap' function.
+ */
+void ram_bootstrap (void *ram_start)
+{
+ static gd_t gd_data;
+
+ /* compiler optimization barrier needed for GCC >= 3.4 */
+ __asm__ __volatile__("": : :"memory");
+
+ board_init_r(&gd_data, (ulong)ram_start);
+}
+
+void board_init_r(gd_t *id, ulong ram_start)
{
char *s;
int i;
ulong size;
- static gd_t gd_data;
static bd_t bd_data;
init_fnc_t **init_fnc_ptr;
-#ifndef CONFIG_SKIP_RELOCATE_UBOOT
- cmd_tbl_t *p;
-#endif
show_boot_progress(0x21);
- gd = &gd_data;
+ gd = id;
/* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("": : :"memory");
@@ -212,10 +254,11 @@ void start_i386boot (void)
gd->baudrate = CONFIG_BAUDRATE;
-#ifndef CONFIG_SKIP_RELOCATE_UBOOT
- /* Need to set relocation offset here for interrupt initialization */
- gd->reloc_off = CONFIG_SYS_BL_START_RAM - TEXT_BASE;
-#endif
+ gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
+
+ mem_malloc_init((((ulong)ram_start - CONFIG_SYS_MALLOC_LEN)+3)&~3,
+ CONFIG_SYS_MALLOC_LEN);
+
for (init_fnc_ptr = init_sequence, i=0; *init_fnc_ptr; ++init_fnc_ptr, i++) {
show_boot_progress(0xa130|i);
@@ -225,26 +268,6 @@ void start_i386boot (void)
}
show_boot_progress(0x23);
-#ifndef CONFIG_SKIP_RELOCATE_UBOOT
- for (p = &__u_boot_cmd_start; p != &__u_boot_cmd_end; p++) {
- ulong addr;
- addr = (ulong) (p->cmd) + gd->reloc_off;
- p->cmd = (int (*)(struct cmd_tbl_s *, int, int, char *[]))addr;
- addr = (ulong)(p->name) + gd->reloc_off;
- p->name = (char *)addr;
-
- if (p->usage != NULL) {
- addr = (ulong)(p->usage) + gd->reloc_off;
- p->usage = (char *)addr;
- }
- #ifdef CONFIG_SYS_LONGHELP
- if (p->help != NULL) {
- addr = (ulong)(p->help) + gd->reloc_off;
- p->help = (char *)addr;
- }
- #endif
- }
-#endif
/* configure available FLASH banks */
size = flash_init();
display_flash_config(size);
diff --git a/lib_i386/interrupts.c b/lib_i386/interrupts.c
index efbad72..51def59 100644
--- a/lib_i386/interrupts.c
+++ b/lib_i386/interrupts.c
@@ -70,12 +70,12 @@ void irq_install_handler(int irq, interrupt_handler_t *handler, void *arg)
if (irq_handlers[irq].handler != NULL)
printf("irq_install_handler: 0x%08lx replacing 0x%08lx\n",
- (ulong) handler + gd->reloc_off,
+ (ulong) handler,
(ulong) irq_handlers[irq].handler);
status = disable_interrupts ();
- irq_handlers[irq].handler = handler + gd->reloc_off;
+ irq_handlers[irq].handler = handler;
irq_handlers[irq].arg = arg;
irq_handlers[irq].count = 0;
diff --git a/lib_i386/timer.c b/lib_i386/timer.c
index 58a0212..5cb1f54 100644
--- a/lib_i386/timer.c
+++ b/lib_i386/timer.c
@@ -51,7 +51,7 @@ int register_timer_isr (timer_fnc_t *isr_func)
if (new_func == NULL)
return 1;
- new_func->isr_func = isr_func + gd->reloc_off;
+ new_func->isr_func = isr_func;
new_func->next = NULL;
/*
generated by cgit v1.1 at 2024-12-18 12:53:29 +0000