X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fcpc45%2Fcpc45.c;h=22008066e6b723ecc22868603be601c135379b61;hb=5c6db120fc184bae7a344a4e5da83b21164b59a6;hp=79eb47317621dfa3f2a39f7246822e8a36b7d717;hpb=375c2c9e57ea5b8d678475379378f4774aa9cb88;p=u-boot

diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c
index 79eb473176..22008066e6 100644
--- a/board/cpc45/cpc45.c
+++ b/board/cpc45/cpc45.c
@@ -27,6 +27,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <i2c.h>
+#include <netdev.h>
 
 int sysControlDisplay(int digit, uchar ascii_code);
 extern void Plx9030Init(void);
@@ -61,7 +62,7 @@ int checkboard(void)
 	return 0;
 }
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
 	int m, row, col, bank, i, ref;
 	unsigned long start, end;
@@ -71,7 +72,7 @@ long int 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 */
@@ -88,7 +89,7 @@ long int 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++) {
@@ -242,8 +243,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)
@@ -259,17 +260,7 @@ int pcmcia_init(void)
 
 #endif
 
-# ifdef CONFIG_IDE_LED
-void ide_led (uchar led, uchar status)
+int board_eth_init(bd_t *bis)
 {
-	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);
+	return pci_eth_init(bis);
 }
-# endif