Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging

[karo-tx-uboot.git] / drivers / block / sym53c8xx.c

diff --git a/drivers/block/sym53c8xx.c b/drivers/block/sym53c8xx.c
index 44e998b55644ca9b1a671a7f152f2d85b46eb1df..564aa9838b429f69aa4cd1d4f52031326c446e60 100644 (file)
--- a/drivers/block/sym53c8xx.c
+++ b/drivers/block/sym53c8xx.c
@@ -426,7 +426,7 @@ void scsi_bus_reset(void)
 {
        unsigned char t;
        int i;
-       int end = CFG_SCSI_SPIN_UP_TIME*1000;
+       int end = CONFIG_SYS_SCSI_SPIN_UP_TIME*1000;
 
        t=scsi_read_byte(SCNTL1);
        scsi_write_byte(SCNTL1,(t | CRST));
@@ -453,11 +453,9 @@ void scsi_int_enable(void)
 
 void scsi_write_dsp(unsigned long start)
 {
-       unsigned long val;
 #ifdef SCSI_SINGLE_STEP
        unsigned char t;
 #endif
-       val = start;
        out32r(scsi_mem_addr + DSP,start);
 #ifdef SCSI_SINGLE_STEP
        t=scsi_read_byte(DCNTL);
@@ -836,10 +834,10 @@ void scsi_chip_init(void)
        scsi_write_byte(SCNTL0,0xC0); /* full arbitration no start, no message, parity disabled, master */
        scsi_write_byte(SCNTL1,0x00);
        scsi_write_byte(SCNTL2,0x00);
-#ifndef CFG_SCSI_SYM53C8XX_CCF    /* config value for none 40 mhz clocks */
+#ifndef CONFIG_SYS_SCSI_SYM53C8XX_CCF    /* config value for none 40 MHz clocks */
        scsi_write_byte(SCNTL3,0x13); /* synchronous clock 40/4=10MHz, asynchronous 40MHz */
 #else
-       scsi_write_byte(SCNTL3,CFG_SCSI_SYM53C8XX_CCF); /* config value for none 40 mhz clocks */
+       scsi_write_byte(SCNTL3,CONFIG_SYS_SCSI_SYM53C8XX_CCF); /* config value for none 40 MHz clocks */
 #endif
        scsi_write_byte(SCID,0x47); /* ID=7, enable reselection */
        scsi_write_byte(SXFER,0x00); /* synchronous transfer period 10MHz, asynchronous */