Merge branch 'master' of git://git.denx.de/u-boot-sunxi

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

diff --git a/include/configs/km8360.h b/include/configs/km8360.h
index 6fa4e63..feb8a9a 100644 (file)
--- a/include/configs/km8360.h
+++ b/include/configs/km8360.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2012
  * Holger Brunck, Keymile GmbH Hannover, <holger.brunck@keymile.com>
  * Christian Herzig, Keymile AG Switzerland, <christian.herzig@keymile.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -14,16 +13,14 @@
 #define CONFIG_SYS_KMBEC_FPGA_SIZE     64
 
 #if defined CONFIG_KMETER1
-#define CONFIG_HOSTNAME                kmeter1
+#define CONFIG_HOSTNAME                "kmeter1"
 #define CONFIG_KM_BOARD_NAME   "kmeter1"
 #define CONFIG_KM_DEF_NETDEV   "netdev=eth2\0"
 #elif defined CONFIG_KMCOGE5NE
-#define CONFIG_HOSTNAME                kmcoge5ne
+#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_BCH
 #define CONFIG_NAND_KMETER1
 #define CONFIG_SYS_MAX_NAND_DEVICE             1
 #define NAND_MAX_CHIPS                         1
@@ -31,16 +28,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
@@ -51,8 +38,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"
 
@@ -270,7 +255,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)