diff options
author | Wolfgang Denk <wd@denx.de> | 2008-09-03 22:55:55 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-09-03 22:55:55 +0200 |
commit | 4615fc22e539a2f7dae971701c05f09e21c1ca25 (patch) | |
tree | 21521ea036a6339414051ba8fc37106fbcdcc1d3 /board/esd/vom405/vom405.c | |
parent | 16116ddd0d0158f4e91c91dc979b845b6e98a99d (diff) | |
parent | 7deb3b3ecd0e81ef09bb68aa0ec2346f4ae0a405 (diff) | |
download | u-boot-imx-4615fc22e539a2f7dae971701c05f09e21c1ca25.zip u-boot-imx-4615fc22e539a2f7dae971701c05f09e21c1ca25.tar.gz u-boot-imx-4615fc22e539a2f7dae971701c05f09e21c1ca25.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Conflicts:
board/esd/dasa_sim/dasa_sim.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/esd/vom405/vom405.c')
-rw-r--r-- | board/esd/vom405/vom405.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/board/esd/vom405/vom405.c b/board/esd/vom405/vom405.c index af8efcf..1b1479f 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 |