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

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

diff --git a/include/configs/km8360.h b/include/configs/km8360.h
index 7631ab6a65602edc13c04398a6b611be1b193d51..7d4b43068b51428c8b31c3b4a3bc9da8287aa155 100644 (file)
--- a/include/configs/km8360.h
+++ b/include/configs/km8360.h
@@ -3,10 +3,7 @@
  * Holger Brunck, Keymile GmbH Hannover, <holger.brunck@keymile.com>
  * Christian Herzig, Keymile AG Switzerland, <christian.herzig@keymile.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -24,7 +21,7 @@
 #define CONFIG_HOSTNAME                kmcoge5ne
 #define CONFIG_KM_BOARD_NAME   "kmcoge5ne"
 #define CONFIG_KM_DEF_NETDEV   "netdev=eth1\0"
-#define CONFIG_CMD_NAND
+#define CONFIG_NAND_ECC_BCH
 #define CONFIG_NAND_KMETER1
 #define CONFIG_SYS_MAX_NAND_DEVICE             1
 #define NAND_MAX_CHIPS                         1
@@ -32,16 +29,6 @@
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT      "ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP       "ubi1"
-#define MTDIDS_DEFAULT                 "nor0=boot,nand0=app"
-
-#define MTDPARTS_DEFAULT               "mtdparts="                     \
-       "boot:"                                                         \
-               "768k(u-boot),"                                         \
-               "128k(env),"                                            \
-               "128k(envred),"                                         \
-               "-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");"             \
-       "app:"                                                          \
-               "-(" CONFIG_KM_UBI_PARTITION_NAME_APP ");"
 #else
 #error ("Board not supported")
 #endif
@@ -52,8 +39,6 @@
 #define CONFIG_QE                      /* Has QE */
 #define CONFIG_MPC8360                 /* MPC8360 CPU specific */
 
-#define        CONFIG_SYS_TEXT_BASE    0xF0000000
-
 /* include common defines/options for all 83xx Keymile boards */
 #include "km/km83xx-common.h"
 
@@ -98,7 +83,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)
@@ -106,7 +91,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 (\
@@ -232,7 +217,6 @@
 
 #define CONFIG_SYS_DBAT5U      CONFIG_SYS_IBAT5U
 
-
 #ifdef CONFIG_KMCOGE5NE
 /* BFTIC3:  icache cacheable, but dcache-inhibit and guarded */
 #define CONFIG_SYS_IBAT6L (\
@@ -272,7 +256,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)