i386: Final Relocation

[oweals/u-boot.git] / cpu / i386 / cpu.c

diff --git a/cpu/i386/cpu.c b/cpu/i386/cpu.c
index b9af5f89d532c11356b2f31f9bfe1a78e9604e98..3010519e7461347e73d5e399992e4b5b15e813c8 100644 (file)
--- a/cpu/i386/cpu.c
+++ b/cpu/i386/cpu.c
@@ -37,7 +37,7 @@
 #include <command.h>
 #include <asm/interrupt.h>
 
-int cpu_init(void)
+int cpu_init_f(void)
 {
        /* initialize FPU, reset EM, set MP and NE */
        asm ("fninit\n" \
@@ -49,6 +49,13 @@ int cpu_init(void)
        return 0;
 }
 
+int cpu_init_r(void)
+{
+       /* Initialize core interrupt and exception functionality of CPU */
+       cpu_init_interrupts ();
+       return 0;
+}
+
 int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        printf ("resetting ...\n");
@@ -70,6 +77,8 @@ void __attribute__ ((regparm(0))) generate_gpf(void);
 
 /* segment 0x70 is an arbitrary segment which does not exist */
 asm(".globl generate_gpf\n"
+    ".hidden generate_gpf\n"
+    ".type generate_gpf, @function\n"
     "generate_gpf:\n"
     "ljmp   $0x70, $0x47114711\n");