GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-26 00:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: Make cpu init functions weak

Browse source
This commit is contained in:
Graeme Russ 2011-02-12 15:11:35 +11:00
parent 4e33467d44
commit 0ea76e92e9
4 changed files with 17 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/i386/cpu/cpu.c
View file

@ -87,7 +87,7 @@ static void reload_gdt(void)
} }
int cpu_init_f(void) int x86_cpu_init_f(void)
{ {
const u32 em_rst = ~X86_CR0_EM; const u32 em_rst = ~X86_CR0_EM;
const u32 mp_ne_set = X86_CR0_MP | X86_CR0_NE; const u32 mp_ne_set = X86_CR0_MP | X86_CR0_NE;
@ -102,15 +102,25 @@ int cpu_init_f(void)
return 0; return 0;
} }
int cpu_init_f(void) __attribute__((weak, alias("x86_cpu_init_f")));
int cpu_init_r(void) int x86_cpu_init_r(void)
{ {
const u32 nw_cd_rst = ~(X86_CR0_NW | X86_CR0_CD);
/* turn on the cache and disable write through */
asm("movl %%cr0, %%eax\n"
"andl %0, %%eax\n"
"movl %%eax, %%cr0\n"
"wbinvd\n" : : "i" (nw_cd_rst) : "eax");
reload_gdt(); reload_gdt();
/* Initialize core interrupt and exception functionality of CPU */ /* Initialize core interrupt and exception functionality of CPU */
cpu_init_interrupts (); cpu_init_interrupts ();
return 0; return 0;
} }
int cpu_init_r(void) __attribute__((weak, alias("x86_cpu_init_r")));
int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {

11
arch/i386/cpu/sc520/sc520.c
View file

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2002 * (C) Copyright 2002
* Daniel Engström, Omicron Ceti AB <daniel@omicron.se>. * Daniel Engstr<EFBFBD>m, Omicron Ceti AB <daniel@omicron.se>.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.
@ -40,10 +40,8 @@ DECLARE_GLOBAL_DATA_PTR;
volatile sc520_mmcr_t *sc520_mmcr = (sc520_mmcr_t *)0xfffef000; volatile sc520_mmcr_t *sc520_mmcr = (sc520_mmcr_t *)0xfffef000;
void init_sc520(void) int cpu_init_f(void)
{ {
const u32 nw_cd_rst = ~(X86_CR0_NW | X86_CR0_CD);
/* /*
* Set the UARTxCTL register at it's slower, * Set the UARTxCTL register at it's slower,
* baud clock giving us a 1.8432 MHz reference * baud clock giving us a 1.8432 MHz reference
@ -85,10 +83,7 @@ void init_sc520(void)
/* turn on the SDRAM write buffer */ /* turn on the SDRAM write buffer */
writeb(0x11, &sc520_mmcr->dbctl); writeb(0x11, &sc520_mmcr->dbctl);
/* turn on the cache and disable write through */ return x86_cpu_init_f();
asm("movl %%cr0, %%eax\n"
"andl %0, %%eax\n"
"movl %%eax, %%cr0\n" : : "i" (nw_cd_rst) : "eax");
} }
unsigned long init_sc520_dram(void) unsigned long init_sc520_dram(void)

2
arch/i386/include/asm/u-boot-i386.h
View file

@ -25,7 +25,9 @@
#define _U_BOOT_I386_H_ 1 #define _U_BOOT_I386_H_ 1
/* cpu/.../cpu.c */ /* cpu/.../cpu.c */
int x86_cpu_init_r(void);
int cpu_init_r(void); int cpu_init_r(void);
int x86_cpu_init_f(void);
int cpu_init_f(void); int cpu_init_f(void);
/* cpu/.../timer.c */ /* cpu/.../timer.c */

22
board/eNET/eNET.c
View file

@ -48,33 +48,11 @@ unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN;
static void enet_timer_isr(void); static void enet_timer_isr(void);
static void enet_toggle_run_led(void); static void enet_toggle_run_led(void);
void init_sc520_enet (void)
{
/* Set CPU Speed to 100MHz */
writeb(0x01, &sc520_mmcr->cpuctl);
/* wait at least one millisecond */
asm("movl $0x2000,%%ecx\n"
"0: pushl %%ecx\n"
"popl %%ecx\n"
"loop 0b\n": : : "ecx");
/* turn on the SDRAM write buffer */
writeb(0x11, &sc520_mmcr->dbctl);
/* turn on the cache and disable write through */
asm("movl %%cr0, %%eax\n"
"andl $0x9fffffff, %%eax\n"
"movl %%eax, %%cr0\n" : : : "eax");
}
/* /*
* Miscellaneous platform dependent initializations * Miscellaneous platform dependent initializations
*/ */
int board_early_init_f(void) int board_early_init_f(void)
{ {
init_sc520_enet();
writeb(0x01, &sc520_mmcr->gpcsrt); /* GP Chip Select Recovery Time */ writeb(0x01, &sc520_mmcr->gpcsrt); /* GP Chip Select Recovery Time */
writeb(0x07, &sc520_mmcr->gpcspw); /* GP Chip Select Pulse Width */ writeb(0x07, &sc520_mmcr->gpcspw); /* GP Chip Select Pulse Width */
writeb(0x00, &sc520_mmcr->gpcsoff); /* GP Chip Select Offset */ writeb(0x00, &sc520_mmcr->gpcsoff); /* GP Chip Select Offset */