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

[platform/kernel/u-boot.git] / include / configs / km / km8321-common.h

diff --git a/include/configs/km/km8321-common.h b/include/configs/km/km8321-common.h
index 580b72f..5bc546c 100644 (file)
--- a/include/configs/km/km8321-common.h
+++ b/include/configs/km/km8321-common.h
@@ -17,10 +17,7 @@
  * (C) Copyright 2010-2011
  * Thomas Reufer, KEYMILE Ltd, thomas.reufer@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_KM8321_COMMON_H
@@ -38,8 +35,6 @@
 /* include common defines/options for all 83xx Keymile boards */
 #include "km83xx-common.h"
 
-#define CONFIG_MISC_INIT_R
-
 /*
  * System IO Config
  */
@@ -67,6 +62,12 @@
        HRCWH_BIG_ENDIAN | \
        HRCWH_LALE_NORMAL)
 
+#define CONFIG_SYS_DDRCDR (\
+       DDRCDR_EN | \
+       DDRCDR_PZ_MAXZ | \
+       DDRCDR_NZ_MAXZ | \
+       DDRCDR_M_ODR)
+
 #define CONFIG_SYS_DDR_CS0_BNDS                0x0000007f
 #define CONFIG_SYS_DDR_SDRAM_CFG       (SDRAM_CFG_SDRAM_TYPE_DDR2 | \
                                         SDRAM_CFG_32_BE | \
@@ -115,7 +116,7 @@
 #define CONFIG_SYS_DDR_TIMING_3        0x00000000
 
 #define CONFIG_SYS_KMBEC_FPGA_BASE     0xE8000000
-#define        CONFIG_SYS_KMBEC_FPGA_SIZE      128
+#define CONFIG_SYS_KMBEC_FPGA_SIZE     128
 
 /* EEprom support */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1