summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-08-29 09:49:09 -0500
committerJon Loeliger <jdl@freescale.com>2006-08-29 09:49:09 -0500
commit42868896df7eac02f67e2c52c6457c917b1542e9 (patch)
tree07505a8f85a75684de2e04722cb95e68c0c8d222 /cpu
parent34760e662ebebb4cdcdf35af6bd7f0fa4c517de3 (diff)
parentcd6d73d5b895a5935ac4fde0a356288142a584e0 (diff)
downloadu-boot-imx-42868896df7eac02f67e2c52c6457c917b1542e9.zip
u-boot-imx-42868896df7eac02f67e2c52c6457c917b1542e9.tar.gz
u-boot-imx-42868896df7eac02f67e2c52c6457c917b1542e9.tar.bz2
Merge branch 'mpc86xx'
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc86xx/spd_sdram.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpu/mpc86xx/spd_sdram.c b/cpu/mpc86xx/spd_sdram.c
index a4b9d54..44b0d41 100644
--- a/cpu/mpc86xx/spd_sdram.c
+++ b/cpu/mpc86xx/spd_sdram.c
@@ -834,7 +834,7 @@ spd_init(unsigned char i2c_address, unsigned int ddr_num,
debug("DDR: err_sbe = 0x%08x\n", ddr->err_sbe);
#endif
- asm("sync;isync");
+ asm volatile("sync;isync");
udelay(500);
/*
@@ -1032,7 +1032,7 @@ unsigned int enable_ddr(unsigned int ddr_num)
*/
if (config == 0x02) {
ddr->err_disable = 0x00000000;
- asm("sync;isync;");
+ asm volatile("sync;isync;");
ddr->err_sbe = 0x00ff0000;
ddr->err_int_en = 0x0000000d;
sdram_cfg_1 |= 0x20000000; /* ECC_EN */
@@ -1325,7 +1325,7 @@ ddr_enable_ecc(unsigned int dram_size)
*/
debug("DMA DDR: err_disable = 0x%08x\n", ddr1->err_disable);
ddr1->err_disable = 0x00000000;
- asm("sync;isync;msync");
+ asm volatile("sync;isync");
debug("DMA DDR: err_disable = 0x%08x\n", ddr1->err_disable);
}