summaryrefslogtreecommitdiff
path: root/arch/i386/cpu/sc520/sc520.c
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-02-12 15:11:35 +1100
committerGraeme Russ <graeme.russ@gmail.com>2011-02-12 15:11:35 +1100
commit0ea76e92e989ce292f1eeadc0754b3ab9a50df16 (patch)
tree58a5d6f50479fe10dea06112462fb9ec97bce9f2 /arch/i386/cpu/sc520/sc520.c
parent4e33467d44620edf224aad03c2c7396fb4918696 (diff)
downloadu-boot-imx-0ea76e92e989ce292f1eeadc0754b3ab9a50df16.zip
u-boot-imx-0ea76e92e989ce292f1eeadc0754b3ab9a50df16.tar.gz
u-boot-imx-0ea76e92e989ce292f1eeadc0754b3ab9a50df16.tar.bz2
x86: Make cpu init functions weak
Diffstat (limited to 'arch/i386/cpu/sc520/sc520.c')
-rw-r--r--arch/i386/cpu/sc520/sc520.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/i386/cpu/sc520/sc520.c b/arch/i386/cpu/sc520/sc520.c
index 21037d2..b99408c 100644
--- a/arch/i386/cpu/sc520/sc520.c
+++ b/arch/i386/cpu/sc520/sc520.c
@@ -1,6 +1,6 @@
/*
* (C) Copyright 2002
- * Daniel Engström, Omicron Ceti AB <daniel@omicron.se>.
+ * Daniel Engstr�m, Omicron Ceti AB <daniel@omicron.se>.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -40,10 +40,8 @@ DECLARE_GLOBAL_DATA_PTR;
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,
* baud clock giving us a 1.8432 MHz reference
@@ -85,10 +83,7 @@ void init_sc520(void)
/* 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 %0, %%eax\n"
- "movl %%eax, %%cr0\n" : : "i" (nw_cd_rst) : "eax");
+ return x86_cpu_init_f();
}
unsigned long init_sc520_dram(void)