Merge git://git.denx.de/u-boot-net

[oweals/u-boot.git] / include / configs / km8360.h

diff --git a/include/configs/km8360.h b/include/configs/km8360.h
index 04cde46cc561f40b3b30d58f7670b5fdb0537d0a..3104a8f05c4a14c21cd14326df2d2d938e3b5cd1 100644 (file)
--- a/include/configs/km8360.h
+++ b/include/configs/km8360.h
@@ -9,9 +9,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_DISPLAY_BOARDINFO
-
 /* KMBEC FPGA (PRIO) */
 #define CONFIG_SYS_KMBEC_FPGA_BASE     0xE8000000
 #define CONFIG_SYS_KMBEC_FPGA_SIZE     64
@@ -100,7 +97,7 @@
 #define CONFIG_SYS_DDR_CS0_CONFIG (\
        CSCONFIG_EN | \
        CSCONFIG_AP | \
-       CSCONFIG_ODT_RD_ONLY_CURRENT | \
+       CSCONFIG_ODT_WR_ONLY_CURRENT | \
        CSCONFIG_BANK_BIT_3 | \
        CSCONFIG_ROW_BIT_13 | \
        CSCONFIG_COL_BIT_10)
@@ -108,7 +105,7 @@
 #define CONFIG_SYS_DDR_CS0_CONFIG      (CSCONFIG_EN | CSCONFIG_AP | \
                                         CSCONFIG_ROW_BIT_13 | \
                                         CSCONFIG_COL_BIT_10 | \
-                                        CSCONFIG_ODT_RD_ONLY_CURRENT)
+                                        CSCONFIG_ODT_WR_ONLY_CURRENT)
 #endif
 
 #define CONFIG_SYS_DDR_CLK_CNTL (\
@@ -234,7 +231,6 @@
 
 #define CONFIG_SYS_DBAT5U      CONFIG_SYS_IBAT5U
 
-
 #ifdef CONFIG_KMCOGE5NE
 /* BFTIC3:  icache cacheable, but dcache-inhibit and guarded */
 #define CONFIG_SYS_IBAT6L (\
@@ -274,7 +270,6 @@
 #define CPM_POST_WORD_ADDR  CONFIG_SYS_MEMTEST_END
 #define CONFIG_TESTPIN_REG  gprt3      /* for kmcoge5ne */
 #define CONFIG_TESTPIN_MASK 0x20       /* for kmcoge5ne */
-#define CONFIG_CMD_DIAG        /* so that testpin is inquired for POST test */
 
 #else
 #define CONFIG_SYS_IBAT6L      (0)