diff options
Diffstat (limited to 'board/esd')
| -rw-r--r-- | board/esd/apc405/apc405.c | 10 | ||||
| -rw-r--r-- | board/esd/ar405/u-boot.lds | 1 | ||||
| -rw-r--r-- | board/esd/ash405/ash405.c | 23 | ||||
| -rw-r--r-- | board/esd/canbt/u-boot.lds | 1 | ||||
| -rw-r--r-- | board/esd/cms700/cms700.c | 21 | ||||
| -rw-r--r-- | board/esd/cpci2dp/cpci2dp.c | 21 | ||||
| -rw-r--r-- | board/esd/cpci405/cpci405.c | 19 | ||||
| -rw-r--r-- | board/esd/cpciiser4/cpciiser4.c | 19 | ||||
| -rw-r--r-- | board/esd/dasa_sim/dasa_sim.c | 20 | ||||
| -rw-r--r-- | board/esd/dasa_sim/u-boot.lds | 1 | ||||
| -rw-r--r-- | board/esd/dp405/dp405.c | 36 | ||||
| -rw-r--r-- | board/esd/du405/du405.c | 15 | ||||
| -rw-r--r-- | board/esd/hh405/hh405.c | 17 | ||||
| -rw-r--r-- | board/esd/hub405/hub405.c | 18 | ||||
| -rw-r--r-- | board/esd/ocrtc/ocrtc.c | 32 | ||||
| -rw-r--r-- | board/esd/plu405/config.mk | 3 | ||||
| -rw-r--r-- | board/esd/plu405/plu405.c | 58 | ||||
| -rw-r--r-- | board/esd/plu405/u-boot.lds | 14 | ||||
| -rw-r--r-- | board/esd/pmc405/pmc405.c | 18 | ||||
| -rw-r--r-- | board/esd/voh405/voh405.c | 36 | ||||
| -rw-r--r-- | board/esd/vom405/u-boot.lds | 12 | ||||
| -rw-r--r-- | board/esd/vom405/vom405.c | 25 | ||||
| -rw-r--r-- | board/esd/wuh405/wuh405.c | 21 | 
23 files changed, 22 insertions, 419 deletions
| diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c index 83657c8d5..e629fd949 100644 --- a/board/esd/apc405/apc405.c +++ b/board/esd/apc405/apc405.c @@ -423,16 +423,6 @@ int checkboard (void)  	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  void ide_set_reset(int on)  { diff --git a/board/esd/ar405/u-boot.lds b/board/esd/ar405/u-boot.lds index b072bbb3e..89cd06734 100644 --- a/board/esd/ar405/u-boot.lds +++ b/board/esd/ar405/u-boot.lds @@ -79,7 +79,6 @@ SECTIONS      common/cmd_mem.o		(.text)      common/cmd_nvedit.o		(.text)      common/console.o		(.text) -    common/lists.o		(.text)      common/main.o		(.text)  /* diff --git a/board/esd/ash405/ash405.c b/board/esd/ash405/ash405.c index 25360a656..c3710ab48 100644 --- a/board/esd/ash405/ash405.c +++ b/board/esd/ash405/ash405.c @@ -82,15 +82,6 @@ int board_early_init_f (void)  	return 0;  } - -/* ------------------------------------------------------------------------- */ - -int misc_init_f (void) -{ -	return 0;  /* dummy implementation */ -} - -  int misc_init_r (void)  {  	volatile unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4); @@ -205,20 +196,6 @@ int checkboard (void)  	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)  {  #ifdef CONFIG_LXT971_NO_SLEEP diff --git a/board/esd/canbt/u-boot.lds b/board/esd/canbt/u-boot.lds index e66db5d23..71bac09f2 100644 --- a/board/esd/canbt/u-boot.lds +++ b/board/esd/canbt/u-boot.lds @@ -78,7 +78,6 @@ SECTIONS      common/cmd_mem.o		(.text)      common/cmd_nvedit.o		(.text)      common/console.o		(.text) -    common/lists.o		(.text)      common/main.o		(.text)      net/net.o			(.text) diff --git a/board/esd/cms700/cms700.c b/board/esd/cms700/cms700.c index ba27c030b..806c755c6 100644 --- a/board/esd/cms700/cms700.c +++ b/board/esd/cms700/cms700.c @@ -77,15 +77,6 @@ int board_early_init_f (void)  	return 0;  } - -/* ------------------------------------------------------------------------- */ - -int misc_init_f (void) -{ -	return 0;  /* dummy implementation */ -} - -  int misc_init_r (void)  {  	/* 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)  /* Input: <dev_addr>  I2C address of EEPROM device to enable.   *         <state>     -1: deliver current state diff --git a/board/esd/cpci2dp/cpci2dp.c b/board/esd/cpci2dp/cpci2dp.c index 54de0b806..8bc40d5a2 100644 --- a/board/esd/cpci2dp/cpci2dp.c +++ b/board/esd/cpci2dp/cpci2dp.c @@ -67,13 +67,6 @@ int board_early_init_f (void)  	return 0;  } - -int misc_init_f (void) -{ -	return 0;  /* dummy implementation */ -} - -  int misc_init_r (void)  {  	unsigned long cntrl0Reg; @@ -115,20 +108,6 @@ int checkboard (void)  	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)  /* Input: <dev_addr>  I2C address of EEPROM device to enable.   *	   <state>     -1: deliver current state diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c index b856705ff..005871cfe 100644 --- a/board/esd/cpci405/cpci405.c +++ b/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)  {  	unsigned long cntrl0Reg; @@ -493,18 +488,6 @@ int checkboard (void)  	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)  {  #ifdef CONFIG_LXT971_NO_SLEEP @@ -516,8 +499,6 @@ void reset_phy(void)  #endif  } -/* ------------------------------------------------------------------------- */ -  #ifdef CONFIG_CPCI405_VER2  #ifdef CONFIG_IDE_RESET diff --git a/board/esd/cpciiser4/cpciiser4.c b/board/esd/cpciiser4/cpciiser4.c index 204117edf..b5d25433f 100644 --- a/board/esd/cpciiser4/cpciiser4.c +++ b/board/esd/cpciiser4/cpciiser4.c @@ -183,22 +183,3 @@ int checkboard (void)  	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); -} - -/* ------------------------------------------------------------------------- */ diff --git a/board/esd/dasa_sim/dasa_sim.c b/board/esd/dasa_sim/dasa_sim.c index e061878b6..47d6bb3cc 100644 --- a/board/esd/dasa_sim/dasa_sim.c +++ b/board/esd/dasa_sim/dasa_sim.c @@ -204,27 +204,7 @@ int checkboard (void)  	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); -} - -/* ------------------------------------------------------------------------- */ - -int board_eth_init(bd_t *bis) -{ -	return pci_eth_init(bis); -} diff --git a/board/esd/dasa_sim/u-boot.lds b/board/esd/dasa_sim/u-boot.lds index 67d72f77f..6126b1603 100644 --- a/board/esd/dasa_sim/u-boot.lds +++ b/board/esd/dasa_sim/u-boot.lds @@ -78,7 +78,6 @@ SECTIONS      common/cmd_mem.o		(.text)      common/cmd_nvedit.o		(.text)      common/console.o		(.text) -    common/lists.o		(.text)      common/main.o		(.text)      board/esd/dasa_sim/flash.o	(.text) diff --git a/board/esd/dp405/dp405.c b/board/esd/dp405/dp405.c index bb3baa477..eb001dacb 100644 --- a/board/esd/dp405/dp405.c +++ b/board/esd/dp405/dp405.c @@ -74,15 +74,6 @@ int board_early_init_f (void)  	return 0;  } - -/* ------------------------------------------------------------------------- */ - -int misc_init_f (void) -{ -	return 0;  /* dummy implementation */ -} - -  int misc_init_r (void)  {  	/* adjust flash start and offset */ @@ -119,30 +110,3 @@ int checkboard (void)  	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); -} diff --git a/board/esd/du405/du405.c b/board/esd/du405/du405.c index 78ae4ba67..8a87d5549 100644 --- a/board/esd/du405/du405.c +++ b/board/esd/du405/du405.c @@ -198,18 +198,3 @@ int checkboard (void)  	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); -} diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c index 802491a31..9fc41c879 100644 --- a/board/esd/hh405/hh405.c +++ b/board/esd/hh405/hh405.c @@ -643,23 +643,6 @@ int checkboard (void)  	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  void ide_set_reset(int on)  { diff --git a/board/esd/hub405/hub405.c b/board/esd/hub405/hub405.c index 03b87c9df..38a6f7a4e 100644 --- a/board/esd/hub405/hub405.c +++ b/board/esd/hub405/hub405.c @@ -101,13 +101,6 @@ int board_early_init_f (void)  	return 0;  } - -int misc_init_f (void) -{ -	return 0;  /* dummy implementation */ -} - -  int misc_init_r (void)  {  	volatile unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4); @@ -227,14 +220,3 @@ int checkboard (void)  	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)); -} diff --git a/board/esd/ocrtc/ocrtc.c b/board/esd/ocrtc/ocrtc.c index 7b0edd595..35bfa95f2 100644 --- a/board/esd/ocrtc/ocrtc.c +++ b/board/esd/ocrtc/ocrtc.c @@ -62,13 +62,6 @@ int board_early_init_f (void)  	return 0;  } - -int misc_init_f (void) -{ -	return 0;					/* dummy implementation */ -} - -  /*   * Check Board Identity:   */ @@ -99,28 +92,3 @@ int checkboard (void)  	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); -} diff --git a/board/esd/plu405/config.mk b/board/esd/plu405/config.mk index 25b210579..0fb4efab8 100644 --- a/board/esd/plu405/config.mk +++ b/board/esd/plu405/config.mk @@ -25,5 +25,4 @@  # esd PLU405 boards  # -TEXT_BASE = 0xFFFC0000 -#TEXT_BASE = 0x00FC0000 +TEXT_BASE = 0xFFFA0000 diff --git a/board/esd/plu405/plu405.c b/board/esd/plu405/plu405.c index fc71e9a2a..3db9c0ad1 100644 --- a/board/esd/plu405/plu405.c +++ b/board/esd/plu405/plu405.c @@ -65,11 +65,9 @@ au_image_t au_image[] = {  int N_AU_IMAGES = (sizeof(au_image) / sizeof(au_image[0])); -  /* Prototypes */  int gunzip(void *, int, unsigned char *, unsigned long *); -  int board_early_init_f (void)  {  	/* @@ -89,24 +87,18 @@ int board_early_init_f (void)  	mtdcr(uiccr, 0x00000000);       /* set all to be non-critical*/  	mtdcr(uicpr, 0xFFFFFF99);       /* set int polarities */  	mtdcr(uictr, 0x10000000);       /* set int trigger levels */ -	mtdcr(uicvcr, 0x00000001);      /* set vect base=0,INT0 highest priority*/ +	mtdcr(uicvcr, 0x00000001);      /* set vect base=0,INT0 highest prio */  	mtdcr(uicsr, 0xFFFFFFFF);       /* clear all ints */  	/* -	 * EBC Configuration Register: set ready timeout to 512 ebc-clks -> ca. 15 us +	 * EBC Configuration Register: set ready timeout to +	 * 512 ebc-clks -> ca. 15 us  	 */  	mtebc (epcr, 0xa8400000); /* ebc always driven */  	return 0;  } - -int misc_init_f (void) -{ -	return 0;  /* dummy implementation */ -} - -  int misc_init_r (void)  {  	unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4); @@ -132,13 +124,16 @@ int misc_init_r (void)  		printf("\nFPGA: Booting failed ");  		switch (status) {  		case ERROR_FPGA_PRG_INIT_LOW: -			printf("(Timeout: INIT not low after asserting PROGRAM*)\n "); +			printf("(Timeout: INIT not low " +			       "after asserting PROGRAM*)\n");  			break;  		case ERROR_FPGA_PRG_INIT_HIGH: -			printf("(Timeout: INIT not high after deasserting PROGRAM*)\n "); +			printf("(Timeout: INIT not high " +			       "after deasserting PROGRAM*)\n");  			break;  		case ERROR_FPGA_PRG_DONE: -			printf("(Timeout: DONE not high after programming FPGA)\n "); +			printf("(Timeout: DONE not high " +			       "after programming FPGA)\n");  			break;  		} @@ -184,15 +179,16 @@ int misc_init_r (void)  	/*  	 * Reset external DUARTs  	 */ -	out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) | CFG_DUART_RST); /* set reset to high */ -	udelay(10); /* wait 10us */ -	out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) & ~CFG_DUART_RST); /* set reset to low */ -	udelay(1000); /* wait 1ms */ +	out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) | CFG_DUART_RST); +	udelay(10); +	out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) & ~CFG_DUART_RST); +	udelay(1000);  	/*  	 * Set NAND-FLASH GPIO signals to default  	 */ -	out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) & ~(CFG_NAND_CLE | CFG_NAND_ALE)); +	out_be32((void*)GPIO0_OR, +		 in_be32((void*)GPIO0_OR) & ~(CFG_NAND_CLE | CFG_NAND_ALE));  	out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) | CFG_NAND_CE);  	/* @@ -210,7 +206,6 @@ int misc_init_r (void)  	return (0);  } -  /*   * Check Board Identity:   */ @@ -231,18 +226,6 @@ int checkboard (void)  	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  void ide_set_reset(int on)  { @@ -260,7 +243,6 @@ void ide_set_reset(int on)  }  #endif /* CONFIG_IDE_RESET */ -  void reset_phy(void)  {  #ifdef CONFIG_LXT971_NO_SLEEP @@ -272,7 +254,6 @@ void reset_phy(void)  #endif  } -  #if defined(CFG_EEPROM_WREN)  /* Input: <dev_addr>  I2C address of EEPROM device to enable.   *         <state>     -1: deliver current state @@ -290,17 +271,20 @@ int eeprom_write_enable (unsigned dev_addr, int state)  		switch (state) {  		case 1:  			/* Enable write access, clear bit GPIO0. */ -			out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) & ~CFG_EEPROM_WP); +			out_be32((void*)GPIO0_OR, +				 in_be32((void*)GPIO0_OR) & ~CFG_EEPROM_WP);  			state = 0;  			break;  		case 0:  			/* Disable write access, set bit GPIO0. */ -			out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) | CFG_EEPROM_WP); +			out_be32((void*)GPIO0_OR, +				 in_be32((void*)GPIO0_OR) | CFG_EEPROM_WP);  			state = 0;  			break;  		default:  			/* Read current status back. */ -			state = (0 == (in_be32((void*)GPIO0_OR) & CFG_EEPROM_WP)); +			state = (0 == (in_be32((void*)GPIO0_OR) & +				       CFG_EEPROM_WP));  			break;  		}  	} diff --git a/board/esd/plu405/u-boot.lds b/board/esd/plu405/u-boot.lds index d70d37934..d52b51ae1 100644 --- a/board/esd/plu405/u-boot.lds +++ b/board/esd/plu405/u-boot.lds @@ -61,19 +61,6 @@ SECTIONS      /* the sector layout of our flash chips!	XXX FIXME XXX	*/      cpu/ppc4xx/start.o	(.text) -    cpu/ppc4xx/traps.o	(.text) -    cpu/ppc4xx/interrupts.o	(.text) -    cpu/ppc4xx/4xx_uart.o	(.text) -    cpu/ppc4xx/cpu_init.o	(.text) -    cpu/ppc4xx/speed.o	(.text) -    cpu/ppc4xx/4xx_enet.o	(.text) -    common/dlmalloc.o	(.text) -    lib_generic/crc32.o		(.text) -    lib_ppc/extable.o	(.text) -    lib_generic/zlib.o		(.text) - -/*    . = env_offset;*/ -/*    common/environment.o(.text)*/      *(.text)      *(.fixup) @@ -124,7 +111,6 @@ SECTIONS    .u_boot_cmd : { *(.u_boot_cmd) }    __u_boot_cmd_end = .; -    . = .;    __start___ex_table = .;    __ex_table : { *(__ex_table) } diff --git a/board/esd/pmc405/pmc405.c b/board/esd/pmc405/pmc405.c index 326d56035..90a212b8c 100644 --- a/board/esd/pmc405/pmc405.c +++ b/board/esd/pmc405/pmc405.c @@ -156,24 +156,6 @@ int checkboard (void)  }  /* ------------------------------------------------------------------------- */ - -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)  {  #ifdef CONFIG_LXT971_NO_SLEEP diff --git a/board/esd/voh405/voh405.c b/board/esd/voh405/voh405.c index 52534220a..115f8b4ab 100644 --- a/board/esd/voh405/voh405.c +++ b/board/esd/voh405/voh405.c @@ -104,13 +104,6 @@ int board_early_init_f (void)  	return 0;  } - -int misc_init_f (void) -{ -	return 0;  /* dummy implementation */ -} - -  int misc_init_r (void)  {  	unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4); @@ -303,35 +296,6 @@ int checkboard (void)  	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  void ide_set_reset(int on)  { diff --git a/board/esd/vom405/u-boot.lds b/board/esd/vom405/u-boot.lds index 21547ac27..5d07e4438 100644 --- a/board/esd/vom405/u-boot.lds +++ b/board/esd/vom405/u-boot.lds @@ -61,18 +61,6 @@ SECTIONS      /* the sector layout of our flash chips!	XXX FIXME XXX	*/      cpu/ppc4xx/start.o	(.text) -    cpu/ppc4xx/traps.o	(.text) -    cpu/ppc4xx/interrupts.o	(.text) -    cpu/ppc4xx/4xx_uart.o	(.text) -    cpu/ppc4xx/cpu_init.o	(.text) -    cpu/ppc4xx/speed.o	(.text) -    common/dlmalloc.o	(.text) -    lib_generic/crc32.o		(.text) -    lib_ppc/extable.o	(.text) -    lib_generic/zlib.o		(.text) - -/*    . = env_offset;*/ -/*    common/environment.o(.text)*/      *(.text)      *(.fixup) diff --git a/board/esd/vom405/vom405.c b/board/esd/vom405/vom405.c index af8efcff3..1b1479f43 100644 --- a/board/esd/vom405/vom405.c +++ b/board/esd/vom405/vom405.c @@ -37,7 +37,6 @@ const unsigned char fpgadata[] =  };  int filesize = sizeof(fpgadata); -  int board_early_init_f (void)  {  	/* @@ -76,9 +75,6 @@ int board_early_init_f (void)  	return 0;  } - -/* ------------------------------------------------------------------------- */ -  int misc_init_r (void)  {  	/* adjust flash start and offset */ @@ -88,11 +84,9 @@ int misc_init_r (void)  	return (0);  } -  /*   * Check Board Identity:   */ -  int checkboard (void)  {  	char str[64]; @@ -127,25 +121,6 @@ int checkboard (void)  	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)  {  #ifdef CONFIG_LXT971_NO_SLEEP diff --git a/board/esd/wuh405/wuh405.c b/board/esd/wuh405/wuh405.c index 0590fc78f..3a94fd86b 100644 --- a/board/esd/wuh405/wuh405.c +++ b/board/esd/wuh405/wuh405.c @@ -80,15 +80,6 @@ int board_early_init_f (void)  	return 0;  } - -/* ------------------------------------------------------------------------- */ - -int misc_init_f (void) -{ -	return 0;  /* dummy implementation */ -} - -  int misc_init_r (void)  {  	volatile unsigned char *duart0_mcr = (unsigned char *)((ulong)DUART0_BA + 4); @@ -202,15 +193,3 @@ int checkboard (void)  	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)); -} |