Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[karo-tx-uboot.git] / board / cpc45 / cpc45.c

diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c
index 16ead75def07b65eb11ebc841a1bf5b676ab5922..f182e79fd9d9ddb51d4596d44fff3684064bab65 100644 (file)
--- a/board/cpc45/cpc45.c
+++ b/board/cpc45/cpc45.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2001
  * Rob Taylor, Flying Pig Systems. robt@flyingpig.com.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -72,7 +56,7 @@ phys_size_t initdram (int board_type)
        uint8_t mber = 0;
        unsigned int tmp;
 
-       i2c_init(CFG_I2C_SPEED, CFG_I2C_SLAVE);
+       i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 
        if (i2c_reg_read (0x50, 2) != 0x04)
                return 0;       /* Memory type */
@@ -89,7 +73,7 @@ phys_size_t initdram (int board_type)
        CONFIG_READ_WORD(MCCR2, mccr2);
        mccr2 &= 0xffff0000;
 
-       start = CFG_SDRAM_BASE;
+       start = CONFIG_SYS_SDRAM_BASE;
        end = start + (1 << (col + row + 3) ) * bank - 1;
 
        for (i = 0; i < m; i++) {
@@ -243,8 +227,8 @@ int sysControlDisplay (int digit,   /* number of digit 0..7 */
 
 #if defined(CONFIG_CMD_PCMCIA)
 
-#ifdef CFG_PCMCIA_MEM_ADDR
-volatile unsigned char *pcmcia_mem = (unsigned char*)CFG_PCMCIA_MEM_ADDR;
+#ifdef CONFIG_SYS_PCMCIA_MEM_ADDR
+volatile unsigned char *pcmcia_mem = (unsigned char*)CONFIG_SYS_PCMCIA_MEM_ADDR;
 #endif
 
 int pcmcia_init(void)
@@ -260,21 +244,6 @@ int pcmcia_init(void)
 
 #endif
 
-# ifdef CONFIG_IDE_LED
-void ide_led (uchar led, uchar status)
-{
-       u_char  val;
-       /* We have one PCMCIA slot and use LED H4 for the IDE Interface */
-       val = readb(BCSR_BASE + 0x04);
-       if (status) {                           /* led on */
-               val |= B_CTRL_LED0;
-       } else {
-               val &= ~B_CTRL_LED0;
-       }
-       writeb(val, BCSR_BASE + 0x04);
-}
-# endif
-
 int board_eth_init(bd_t *bis)
 {
        return pci_eth_init(bis);