projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/wd/git/u-boot/custodians
[platform/kernel/u-boot.git]
/
board
/
tqc
/
tqm85xx
/
tqm85xx.c
diff --git
a/board/tqc/tqm85xx/tqm85xx.c
b/board/tqc/tqm85xx/tqm85xx.c
index
f1c2e58
..
5314d33
100644
(file)
--- a/
board/tqc/tqm85xx/tqm85xx.c
+++ b/
board/tqc/tqm85xx/tqm85xx.c
@@
-42,6
+42,7
@@
#include <flash.h>
#include <libfdt.h>
#include <fdt_support.h>
#include <flash.h>
#include <libfdt.h>
#include <fdt_support.h>
+#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
@@
-320,15
+321,15
@@
int misc_init_r (void)
/* Environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
/* Environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
/* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
/* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
#endif
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
#endif
@@
-464,7
+465,8
@@
void local_bus_init (void)
if (lbc_mhz < 66) {
lbc->lcrr = CFG_LBC_LCRR | LCRR_DBYP; /* DLL Bypass */
if (lbc_mhz < 66) {
lbc->lcrr = CFG_LBC_LCRR | LCRR_DBYP; /* DLL Bypass */
- lbc->ltedr = 0xa4c80000; /* DK: !!! */
+ lbc->ltedr = LTEDR_BMD | LTEDR_PARD | LTEDR_WPD | LTEDR_WARA |
+ LTEDR_RAWA | LTEDR_CSD; /* Disable all error checking */
} else if (lbc_mhz >= 133) {
lbc->lcrr = CFG_LBC_LCRR & (~LCRR_DBYP); /* DLL Enabled */
} else if (lbc_mhz >= 133) {
lbc->lcrr = CFG_LBC_LCRR & (~LCRR_DBYP); /* DLL Enabled */
@@
-742,3
+744,9
@@
int board_early_init_r (void)
return (0);
}
#endif /* CONFIG_BOARD_EARLY_INIT_R */
return (0);
}
#endif /* CONFIG_BOARD_EARLY_INIT_R */
+
+int board_eth_init(bd_t *bis)
+{
+ cpu_eth_init(bis); /* Intialize TSECs first */
+ return pci_eth_init(bis);
+}