Fix merge problems

[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..ae3c245 100644 (file)
--- a/board/tqc/tqm85xx/tqm85xx.c
+++ b/board/tqc/tqm85xx/tqm85xx.c
@@ -464,7 +464,8 @@ void local_bus_init (void)
 
        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 */