浏览代码

ppc4xx: Remove obsolete or unused functions from some esd boards

This patch removes initdram() and testdram() from most esd 405 platforms.
Some boards also have an empty dummy implementation of
misc_init_f(). This is also removed.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Matthias Fuchs 16 年之前
父节点
当前提交
97b0734d65

+ 0 - 10
board/esd/apc405/apc405.c

@@ -423,16 +423,6 @@ int checkboard (void)
 	return 0;
 	return 0;
 }
 }
 
 
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr(memcfga, mem_mb0cf);
-	val = mfdcr(memcfgd);
-
-	return (4*1024*1024 << ((val & 0x000e0000) >> 17));
-}
-
 #ifdef CONFIG_IDE_RESET
 #ifdef CONFIG_IDE_RESET
 void ide_set_reset(int on)
 void ide_set_reset(int on)
 {
 {

+ 0 - 23
board/esd/ash405/ash405.c

@@ -82,15 +82,6 @@ int board_early_init_f (void)
 	return 0;
 	return 0;
 }
 }
 
 
-
-/* ------------------------------------------------------------------------- */
-
-int misc_init_f (void)
-{
-	return 0;  /* dummy implementation */
-}
-
-
 int misc_init_r (void)
 int misc_init_r (void)
 {
 {
 	volatile unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4);
 	volatile unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4);
@@ -205,20 +196,6 @@ int checkboard (void)
 	return 0;
 	return 0;
 }
 }
 
 
-/* ------------------------------------------------------------------------- */
-
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr(memcfga, mem_mb0cf);
-	val = mfdcr(memcfgd);
-
-	return (4*1024*1024 << ((val & 0x000e0000) >> 17));
-}
-
-/* ------------------------------------------------------------------------- */
-
 void reset_phy(void)
 void reset_phy(void)
 {
 {
 #ifdef CONFIG_LXT971_NO_SLEEP
 #ifdef CONFIG_LXT971_NO_SLEEP

+ 0 - 21
board/esd/cms700/cms700.c

@@ -77,15 +77,6 @@ int board_early_init_f (void)
 	return 0;
 	return 0;
 }
 }
 
 
-
-/* ------------------------------------------------------------------------- */
-
-int misc_init_f (void)
-{
-	return 0;  /* dummy implementation */
-}
-
-
 int misc_init_r (void)
 int misc_init_r (void)
 {
 {
 	/* adjust flash start and offset */
 	/* adjust flash start and offset */
@@ -141,18 +132,6 @@ int checkboard (void)
 
 
 /* ------------------------------------------------------------------------- */
 /* ------------------------------------------------------------------------- */
 
 
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr(memcfga, mem_mb0cf);
-	val = mfdcr(memcfgd);
-
-	return (4*1024*1024 << ((val & 0x000e0000) >> 17));
-}
-
-/* ------------------------------------------------------------------------- */
-
 #if defined(CFG_EEPROM_WREN)
 #if defined(CFG_EEPROM_WREN)
 /* Input: <dev_addr>  I2C address of EEPROM device to enable.
 /* Input: <dev_addr>  I2C address of EEPROM device to enable.
  *         <state>     -1: deliver current state
  *         <state>     -1: deliver current state

+ 0 - 21
board/esd/cpci2dp/cpci2dp.c

@@ -67,13 +67,6 @@ int board_early_init_f (void)
 	return 0;
 	return 0;
 }
 }
 
 
-
-int misc_init_f (void)
-{
-	return 0;  /* dummy implementation */
-}
-
-
 int misc_init_r (void)
 int misc_init_r (void)
 {
 {
 	unsigned long cntrl0Reg;
 	unsigned long cntrl0Reg;
@@ -115,20 +108,6 @@ int checkboard (void)
 	return 0;
 	return 0;
 }
 }
 
 
-/* ------------------------------------------------------------------------- */
-
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr(memcfga, mem_mb0cf);
-	val = mfdcr(memcfgd);
-
-	return (4*1024*1024 << ((val & 0x000e0000) >> 17));
-}
-
-/* ------------------------------------------------------------------------- */
-
 #if defined(CFG_EEPROM_WREN)
 #if defined(CFG_EEPROM_WREN)
 /* Input: <dev_addr>  I2C address of EEPROM device to enable.
 /* Input: <dev_addr>  I2C address of EEPROM device to enable.
  *	   <state>     -1: deliver current state
  *	   <state>     -1: deliver current state

+ 0 - 19
board/esd/cpci405/cpci405.c

@@ -255,11 +255,6 @@ int cpci405_version(void)
 	}
 	}
 }
 }
 
 
-int misc_init_f (void)
-{
-	return 0;  /* dummy implementation */
-}
-
 int misc_init_r (void)
 int misc_init_r (void)
 {
 {
 	unsigned long cntrl0Reg;
 	unsigned long cntrl0Reg;
@@ -493,18 +488,6 @@ int checkboard (void)
 	return 0;
 	return 0;
 }
 }
 
 
-/* ------------------------------------------------------------------------- */
-
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr(memcfga, mem_mb0cf);
-	val = mfdcr(memcfgd);
-
-	return (4*1024*1024 << ((val & 0x000e0000) >> 17));
-}
-
 void reset_phy(void)
 void reset_phy(void)
 {
 {
 #ifdef CONFIG_LXT971_NO_SLEEP
 #ifdef CONFIG_LXT971_NO_SLEEP
@@ -516,8 +499,6 @@ void reset_phy(void)
 #endif
 #endif
 }
 }
 
 
-/* ------------------------------------------------------------------------- */
-
 #ifdef CONFIG_CPCI405_VER2
 #ifdef CONFIG_CPCI405_VER2
 #ifdef CONFIG_IDE_RESET
 #ifdef CONFIG_IDE_RESET
 
 

+ 0 - 19
board/esd/cpciiser4/cpciiser4.c

@@ -183,22 +183,3 @@ int checkboard (void)
 
 
 	return 0;
 	return 0;
 }
 }
-
-/* ------------------------------------------------------------------------- */
-
-phys_size_t initdram (int board_type)
-{
-	return (16 * 1024 * 1024);
-}
-
-/* ------------------------------------------------------------------------- */
-
-int testdram (void)
-{
-	/* TODO: XXX XXX XXX */
-	printf ("test: 16 MB - ok\n");
-
-	return (0);
-}
-
-/* ------------------------------------------------------------------------- */

+ 0 - 20
board/esd/dasa_sim/dasa_sim.c

@@ -202,23 +202,3 @@ int checkboard (void)
 
 
 	return 0;
 	return 0;
 }
 }
-
-
-/* ------------------------------------------------------------------------- */
-
-phys_size_t initdram (int board_type)
-{
-	return (16 * 1024 * 1024);
-}
-
-/* ------------------------------------------------------------------------- */
-
-int testdram (void)
-{
-	/* TODO: XXX XXX XXX */
-	printf ("test: 16 MB - ok\n");
-
-	return (0);
-}
-
-/* ------------------------------------------------------------------------- */

+ 0 - 36
board/esd/dp405/dp405.c

@@ -74,15 +74,6 @@ int board_early_init_f (void)
 	return 0;
 	return 0;
 }
 }
 
 
-
-/* ------------------------------------------------------------------------- */
-
-int misc_init_f (void)
-{
-	return 0;  /* dummy implementation */
-}
-
-
 int misc_init_r (void)
 int misc_init_r (void)
 {
 {
 	/* adjust flash start and offset */
 	/* adjust flash start and offset */
@@ -119,30 +110,3 @@ int checkboard (void)
 
 
 	return 0;
 	return 0;
 }
 }
-
-/* ------------------------------------------------------------------------- */
-
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr(memcfga, mem_mb0cf);
-	val = mfdcr(memcfgd);
-
-#if 0
-	printf("\nmb0cf=%x\n", val); /* test-only */
-	printf("strap=%x\n", mfdcr(strap)); /* test-only */
-#endif
-
-	return (4*1024*1024 << ((val & 0x000e0000) >> 17));
-}
-
-/* ------------------------------------------------------------------------- */
-
-int testdram (void)
-{
-	/* TODO: XXX XXX XXX */
-	printf ("test: 16 MB - ok\n");
-
-	return (0);
-}

+ 0 - 15
board/esd/du405/du405.c

@@ -198,18 +198,3 @@ int checkboard (void)
 
 
 	return 0;
 	return 0;
 }
 }
-
-
-phys_size_t initdram (int board_type)
-{
-	return (16 * 1024 * 1024);
-}
-
-
-int testdram (void)
-{
-	/* TODO: XXX XXX XXX */
-	printf ("test: 16 MB - ok\n");
-
-	return (0);
-}

+ 0 - 17
board/esd/hh405/hh405.c

@@ -643,23 +643,6 @@ int checkboard (void)
 	return 0;
 	return 0;
 }
 }
 
 
-
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr(memcfga, mem_mb0cf);
-	val = mfdcr(memcfgd);
-
-#if 0
-	printf("\nmb0cf=%x\n", val); /* test-only */
-	printf("strap=%x\n", mfdcr(strap)); /* test-only */
-#endif
-
-	return (4*1024*1024 << ((val & 0x000e0000) >> 17));
-}
-
-
 #ifdef CONFIG_IDE_RESET
 #ifdef CONFIG_IDE_RESET
 void ide_set_reset(int on)
 void ide_set_reset(int on)
 {
 {

+ 0 - 18
board/esd/hub405/hub405.c

@@ -101,13 +101,6 @@ int board_early_init_f (void)
 	return 0;
 	return 0;
 }
 }
 
 
-
-int misc_init_f (void)
-{
-	return 0;  /* dummy implementation */
-}
-
-
 int misc_init_r (void)
 int misc_init_r (void)
 {
 {
 	volatile unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4);
 	volatile unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4);
@@ -227,14 +220,3 @@ int checkboard (void)
 
 
 	return 0;
 	return 0;
 }
 }
-
-
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr(memcfga, mem_mb0cf);
-	val = mfdcr(memcfgd);
-
-	return (4*1024*1024 << ((val & 0x000e0000) >> 17));
-}

+ 0 - 32
board/esd/ocrtc/ocrtc.c

@@ -62,13 +62,6 @@ int board_early_init_f (void)
 	return 0;
 	return 0;
 }
 }
 
 
-
-int misc_init_f (void)
-{
-	return 0;					/* dummy implementation */
-}
-
-
 /*
 /*
  * Check Board Identity:
  * Check Board Identity:
  */
  */
@@ -99,28 +92,3 @@ int checkboard (void)
 
 
 	return (0);
 	return (0);
 }
 }
-
-
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr (memcfga, mem_mb0cf);
-	val = mfdcr (memcfgd);
-
-#if 0
-	printf ("\nmb0cf=%x\n", val);	/* test-only */
-	printf ("strap=%x\n", mfdcr (strap));	/* test-only */
-#endif
-
-	return (4 * 1024 * 1024 << ((val & 0x000e0000) >> 17));
-}
-
-
-int testdram (void)
-{
-	/* TODO: XXX XXX XXX */
-	printf ("test: 16 MB - ok\n");
-
-	return (0);
-}

+ 0 - 18
board/esd/pmc405/pmc405.c

@@ -155,24 +155,6 @@ int checkboard (void)
 	return 0;
 	return 0;
 }
 }
 
 
-/* ------------------------------------------------------------------------- */
-
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr(memcfga, mem_mb0cf);
-	val = mfdcr(memcfgd);
-
-#if 0
-	printf("\nmb0cf=%x\n", val); /* test-only */
-	printf("strap=%x\n", mfdcr(strap)); /* test-only */
-#endif
-
-	return (4*1024*1024 << ((val & 0x000e0000) >> 17));
-}
-
-
 /* ------------------------------------------------------------------------- */
 /* ------------------------------------------------------------------------- */
 void reset_phy(void)
 void reset_phy(void)
 {
 {

+ 0 - 36
board/esd/voh405/voh405.c

@@ -104,13 +104,6 @@ int board_early_init_f (void)
 	return 0;
 	return 0;
 }
 }
 
 
-
-int misc_init_f (void)
-{
-	return 0;  /* dummy implementation */
-}
-
-
 int misc_init_r (void)
 int misc_init_r (void)
 {
 {
 	unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4);
 	unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4);
@@ -303,35 +296,6 @@ int checkboard (void)
 	return 0;
 	return 0;
 }
 }
 
 
-/* ------------------------------------------------------------------------- */
-
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr(memcfga, mem_mb0cf);
-	val = mfdcr(memcfgd);
-
-#if 0
-	printf("\nmb0cf=%x\n", val); /* test-only */
-	printf("strap=%x\n", mfdcr(strap)); /* test-only */
-#endif
-
-	return (4*1024*1024 << ((val & 0x000e0000) >> 17));
-}
-
-/* ------------------------------------------------------------------------- */
-
-int testdram (void)
-{
-	/* TODO: XXX XXX XXX */
-	printf ("test: 16 MB - ok\n");
-
-	return (0);
-}
-
-/* ------------------------------------------------------------------------- */
-
 #ifdef CONFIG_IDE_RESET
 #ifdef CONFIG_IDE_RESET
 void ide_set_reset(int on)
 void ide_set_reset(int on)
 {
 {

+ 0 - 21
board/esd/wuh405/wuh405.c

@@ -80,15 +80,6 @@ int board_early_init_f (void)
 	return 0;
 	return 0;
 }
 }
 
 
-
-/* ------------------------------------------------------------------------- */
-
-int misc_init_f (void)
-{
-	return 0;  /* dummy implementation */
-}
-
-
 int misc_init_r (void)
 int misc_init_r (void)
 {
 {
 	volatile unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4);
 	volatile unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4);
@@ -202,15 +193,3 @@ int checkboard (void)
 
 
 	return 0;
 	return 0;
 }
 }
-
-/* ------------------------------------------------------------------------- */
-
-phys_size_t initdram (int board_type)
-{
-	unsigned long val;
-
-	mtdcr(memcfga, mem_mb0cf);
-	val = mfdcr(memcfgd);
-
-	return (4*1024*1024 << ((val & 0x000e0000) >> 17));
-}