Merge branch 'master' of git://git.denx.de/u-boot-arm

4 files changed, 0 insertions, 87 deletions

diff --git a/board/fads/fads.c b/board/fads/fads.c
index 89dd9efe78..fdb46b1f35 100644
--- a/board/fads/fads.c
+++ b/board/fads/fads.c
@@ -210,11 +210,7 @@ static int _draminit (uint base, uint noMbytes, uint edo, uint delay)
 
 	switch (noMbytes) {
 	case 4:				/* 4 Mbyte uses only CS2 */
-#ifdef CONFIG_ADS
-		memctl->memc_mamr = 0xc0a21114;
-#else
 		memctl->memc_mamr = 0x13a01114;	/* PTA 0x13 AMA 010 */
-#endif
 		memctl->memc_or2 = 0xffc00800;	/* 4M */
 		break;
 
@@ -226,11 +222,7 @@ static int _draminit (uint base, uint noMbytes, uint edo, uint delay)
 		break;
 
 	case 16:			/* 16 Mbyte uses only CS2 */
-#ifdef CONFIG_ADS	/* XXX: why PTA=0x60 only in 16M case? - NTL */
-		memctl->memc_mamr = 0x60b21114;	/* PTA 0x60 AMA 011 */
-#else
 		memctl->memc_mamr = 0x13b01114;	/* PTA 0x13 AMA 011 */
-#endif
 		memctl->memc_or2 = 0xff000800;	/* 16M */
 		break;
 
@@ -674,42 +666,6 @@ int testdram (void)
  * Check Board Identity:
  */
 
-#if defined(CONFIG_FADS) && defined(CONFIG_SYS_DAUGHTERBOARD)
-static void checkdboard(void)
-{
-	/* get db type from BCSR 3 */
-	uint k = (*((uint *)BCSR3) >> 24) & 0x3f;
-
-	puts (" with db ");
-
-	switch(k) {
-	case 0x03 :
-		puts ("MPC823");
-		break;
-	case 0x20 :
-		puts ("MPC801");
-		break;
-	case 0x21 :
-		puts ("MPC850");
-		break;
-	case 0x22 :
-		puts ("MPC821, MPC860 / MPC860SAR / MPC860T");
-		break;
-	case 0x23 :
-		puts ("MPC860SAR");
-		break;
-	case 0x24 :
-	case 0x2A :
-		puts ("MPC860T");
-		break;
-	case 0x3F :
-		puts ("MPC850SAR");
-		break;
-	default : printf("0x%x", k);
-	}
-}
-#endif	/* defined(CONFIG_FADS) && defined(CONFIG_SYS_DAUGHTERBOARD) */
-
 int checkboard (void)
 {
 #if   defined(CONFIG_MPC86xADS)
@@ -732,27 +688,12 @@ int checkboard (void)
 	puts (" rev ");
 
 	switch (r) {
-#if defined(CONFIG_ADS)
-	case 0x00:
-		puts ("ENG - this board sucks, check the errata, not supported\n");
-		return -1;
-	case 0x01:
-		puts ("PILOT - warning, read errata \n");
-		break;
-	case 0x02:
-		puts ("A - warning, read errata \n");
-		break;
-	case 0x03:
-		puts ("B\n");
-		break;
-#else  /* FADS */
 	case 0x00:
 		puts ("ENG\n");
 		break;
 	case 0x01:
 		puts ("PILOT\n");
 		break;
-#endif /* CONFIG_ADS */
 	default:
 		printf ("unknown (0x%x)\n", r);
 		return -1;
@@ -865,12 +806,6 @@ int pcmcia_init(void)
 #endif
 	case 5:
 		printf("; using 5V");
-#ifdef CONFIG_ADS
-		/*
-		** Enable 5 volt Vcc.
-		*/
-		*((uint *)BCSR1) &= ~BCSR1_PCCVCCON;
-#endif
 #ifdef CONFIG_FADS
 		/*
 		** Enable 5 volt Vcc.
diff --git a/board/fads/fads.h b/board/fads/fads.h
index fa49080fb7..1be00b9048 100644
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -66,13 +66,8 @@
  * motherboard and FEC Ethernet on daughterboard. All new PQ1 chips have
  * got FEC so FEC is the default.
  */
-#ifndef CONFIG_ADS
 #undef	CONFIG_SCC1_ENET		/* Disable SCC1 ethernet */
 #define	CONFIG_FEC_ENET			/* Use FEC ethernet  */
-#else					/* Old ADS has not got FEC option */
-#define	CONFIG_SCC1_ENET		/* Use SCC1 ethernet */
-#undef	CONFIG_FEC_ENET			/* No FEC ethernet  */
-#endif /* !CONFIG_ADS */
 
 #if defined(CONFIG_SCC1_ENET) && defined(CONFIG_FEC_ENET)
 #error Both CONFIG_SCC1_ENET and CONFIG_FEC_ENET configured
diff --git a/board/fads/lamp.c b/board/fads/lamp.c
index 4e58291c06..ffcc2b3c41 100644
--- a/board/fads/lamp.c
+++ b/board/fads/lamp.c
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#ifndef CONFIG_ADS /* Old ADS has not got any user-controllable LED */
-
 #include <common.h>
 
 void
@@ -43,5 +41,3 @@ fast_blink(unsigned int n)
     signal_delay(0x00100000);
   }
 }
-
-#endif /* !CONFIG_ADS */
diff --git a/board/fads/pcmcia.c b/board/fads/pcmcia.c
index 99fe0b4fb9..996f032f64 100644
--- a/board/fads/pcmcia.c
+++ b/board/fads/pcmcia.c
@@ -14,11 +14,7 @@
 
 #ifdef	CONFIG_PCMCIA
 
-#ifdef	CONFIG_ADS
-#define	PCMCIA_BOARD_MSG "ADS"
-#else
 #define	PCMCIA_BOARD_MSG "FADS"
-#endif
 
 int pcmcia_voltage_set(int slot, int vcc, int vpp)
 {
@@ -33,9 +29,6 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp)
 
 	switch(vcc) {
 		case 0: reg = 0; break;
-#ifdef CONFIG_ADS
-	case 50: reg = BCSR1_PCCVCCON; break;
-#endif
 #ifdef CONFIG_FADS
 	case 33: reg = BCSR1_PCCVCC0 | BCSR1_PCCVCC1; break;
 	case 50: reg = BCSR1_PCCVCC1; break;
@@ -45,9 +38,6 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp)
 
 	/* first, turn off all power */
 
-#ifdef CONFIG_ADS
-	*((uint *)BCSR1) |= BCSR1_PCCVCCON;
-#endif
 #ifdef CONFIG_FADS
 	*((uint *)BCSR1) &= ~(BCSR1_PCCVCC0 | BCSR1_PCCVCC1);
 #endif
@@ -55,9 +45,6 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp)
 
 	/* enable new powersettings */
 
-#ifdef CONFIG_ADS
-	*((uint *)BCSR1) &= ~reg;
-#endif
 #ifdef CONFIG_FADS
 	*((uint *)BCSR1) |= reg;
 #endif