summaryrefslogtreecommitdiff
path: root/board/esd
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-12-31 09:32:47 +0000
committerwdenk <wdenk>2004-12-31 09:32:47 +0000
commite2ffd59b4d93c9149de1caaa087371b0cfc512c9 (patch)
tree86cfb6e30bec1686253b0542d76f57c5d62d183a /board/esd
parent400ab719c6025c176c50bcdff342384222d7424b (diff)
downloadu-boot-imx-e2ffd59b4d93c9149de1caaa087371b0cfc512c9.zip
u-boot-imx-e2ffd59b4d93c9149de1caaa087371b0cfc512c9.tar.gz
u-boot-imx-e2ffd59b4d93c9149de1caaa087371b0cfc512c9.tar.bz2
* Code cleanup, mostly for GCC-3.3.x
* Cleanup confusing use of CONFIG_ETH*ADDR - ust his only to pre-define a MAC address; use CONFIG_HAS_ETH* to enable support for additional ethernet addresses. * Cleanup drivers/i82365.c - avoid duplication of code * Fix bogus "cannot span across banks" flash error message * Add support for CompactFlash for the CPC45 Board.
Diffstat (limited to 'board/esd')
-rw-r--r--board/esd/cpci750/cpci750.c24
-rw-r--r--board/esd/cpci750/local.h2
-rw-r--r--board/esd/pci405/pci405.c2
3 files changed, 15 insertions, 13 deletions
diff --git a/board/esd/cpci750/cpci750.c b/board/esd/cpci750/cpci750.c
index 56c12d7..68f121d 100644
--- a/board/esd/cpci750/cpci750.c
+++ b/board/esd/cpci750/cpci750.c
@@ -494,18 +494,18 @@ static void move64 (unsigned long long *src, unsigned long long *dest)
#if defined (CFG_DRAM_TEST_DATA)
unsigned long long pattern[] = {
- 0xaaaaaaaaaaaaaaaa,
- 0xcccccccccccccccc,
- 0xf0f0f0f0f0f0f0f0,
- 0xff00ff00ff00ff00,
- 0xffff0000ffff0000,
- 0xffffffff00000000,
- 0x00000000ffffffff,
- 0x0000ffff0000ffff,
- 0x00ff00ff00ff00ff,
- 0x0f0f0f0f0f0f0f0f,
- 0x3333333333333333,
- 0x5555555555555555
+ 0xaaaaaaaaaaaaaaaaLL,
+ 0xccccccccccccccccLL,
+ 0xf0f0f0f0f0f0f0f0LL,
+ 0xff00ff00ff00ff00LL,
+ 0xffff0000ffff0000LL,
+ 0xffffffff00000000LL,
+ 0x00000000ffffffffLL,
+ 0x0000ffff0000ffffLL,
+ 0x00ff00ff00ff00ffLL,
+ 0x0f0f0f0f0f0f0f0fLL,
+ 0x3333333333333333LL,
+ 0x5555555555555555LL,
};
/*********************************************************************/
diff --git a/board/esd/cpci750/local.h b/board/esd/cpci750/local.h
index 47ab31e..bca0e1f 100644
--- a/board/esd/cpci750/local.h
+++ b/board/esd/cpci750/local.h
@@ -76,7 +76,9 @@
#define CONFIG_ETHADDR 64:36:00:00:00:01
/* next two ethernet hwaddrs */
+#define CONFIG_HAS_ETH1
#define CONFIG_ETH1ADDR 86:06:2d:7e:c6:54
+#define CONFIG_HAS_ETH2
#define CONFIG_ETH2ADDR 86:06:2d:7e:c6:55
#define CONFIG_ENV_OVERWRITE
diff --git a/board/esd/pci405/pci405.c b/board/esd/pci405/pci405.c
index 80d6dbb..cb458eb 100644
--- a/board/esd/pci405/pci405.c
+++ b/board/esd/pci405/pci405.c
@@ -306,7 +306,7 @@ int misc_init_r (void)
/* mtspr(ccr0, (mfspr(ccr0) & 0xff8fffff) | 0x00100000); */
mtspr(ccr0, (mfspr(ccr0) & 0xff8fffff) | 0x00000000);
#endif
- /* printf("CCR0=%08x\n", mfspr(ccr0));*/ /* test-only */
+/* printf("CCR0=%08x\n", mfspr(ccr0)); */ /* test-only */
#endif
free(dst);