x86: Fix up some missing prototypes

Some functions are missing prototypes. Fix those that are specific to x86.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass
2014-11-06 13:20:08 -07:00
parent 8b37c7694f
commit e1ffd81797
5 changed files with 14 additions and 8 deletions

View File

@@ -97,7 +97,7 @@ int board_eth_init(bd_t *bis)
#define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg)) #define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg))
#define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1) #define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1)
int board_final_cleanup(void) void board_final_cleanup(void)
{ {
/* Un-cache the ROM so the kernel has one /* Un-cache the ROM so the kernel has one
* more MTRR available. * more MTRR available.
@@ -119,8 +119,6 @@ int board_final_cleanup(void)
/* Issue SMI to Coreboot to lock down ME and registers */ /* Issue SMI to Coreboot to lock down ME and registers */
printf("Finalizing Coreboot\n"); printf("Finalizing Coreboot\n");
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
return 0;
} }
void panic_puts(const char *str) void panic_puts(const char *str)

View File

@@ -14,6 +14,7 @@
#include <asm/init_helpers.h> #include <asm/init_helpers.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/zimage.h>
#include <asm/arch/sysinfo.h> #include <asm/arch/sysinfo.h>
#include <asm/arch/tables.h> #include <asm/arch/tables.h>
@@ -99,7 +100,7 @@ int dram_init(void)
return calculate_relocation_address(); return calculate_relocation_address();
} }
int dram_init_banksize(void) void dram_init_banksize(void)
{ {
int i, j; int i, j;
@@ -116,5 +117,4 @@ int dram_init_banksize(void)
} }
} }
} }
return 0;
} }

View File

@@ -197,14 +197,13 @@ asm(".globl generate_gpf\n"
"generate_gpf:\n" "generate_gpf:\n"
"ljmp $0x70, $0x47114711\n"); "ljmp $0x70, $0x47114711\n");
void __reset_cpu(ulong addr) __weak void reset_cpu(ulong addr)
{ {
printf("Resetting using x86 Triple Fault\n"); printf("Resetting using x86 Triple Fault\n");
set_vector(13, generate_gpf); /* general protection fault handler */ set_vector(13, generate_gpf); /* general protection fault handler */
set_vector(8, generate_gpf); /* double fault handler */ set_vector(8, generate_gpf); /* double fault handler */
generate_gpf(); /* start the show */ generate_gpf(); /* start the show */
} }
void reset_cpu(ulong addr) __attribute__((weak, alias("__reset_cpu")));
int dcache_status(void) int dcache_status(void)
{ {

View File

@@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR;
"pushl $"#x"\n" \ "pushl $"#x"\n" \
"jmp irq_common_entry\n" "jmp irq_common_entry\n"
void dump_regs(struct irq_regs *regs) static void dump_regs(struct irq_regs *regs)
{ {
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L; unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
unsigned long d0, d1, d2, d3, d6, d7; unsigned long d0, d1, d2, d3, d6, d7;

View File

@@ -37,6 +37,15 @@ int cpu_init_interrupts(void);
/* board/.../... */ /* board/.../... */
int dram_init(void); int dram_init(void);
int cleanup_before_linux(void);
int x86_cleanup_before_linux(void);
void x86_enable_caches(void);
void x86_disable_caches(void);
int x86_init_cache(void);
void reset_cpu(ulong addr);
ulong board_get_usable_ram_top(ulong total_size);
void dram_init_banksize(void);
void setup_pcat_compatibility(void); void setup_pcat_compatibility(void);
void isa_unmap_rom(u32 addr); void isa_unmap_rom(u32 addr);