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

[u-boot] / include / configs / km / km8309-common.h

diff --git a/include/configs/km/km8309-common.h b/include/configs/km/km8309-common.h
index b36e892cbebf14f2c7fe018284699531b279bd83..d21b500d7442f3fb552190f8ff11e25baac0085c 100644 (file)
--- a/include/configs/km/km8309-common.h
+++ b/include/configs/km/km8309-common.h
@@ -4,25 +4,23 @@
  *
  * Based on km8321-common.h, see respective copyright notice for credits
  *
- * 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_KM8309_COMMON_H
 #define __CONFIG_KM8309_COMMON_H
 
+#define CONFIG_DISPLAY_BOARDINFO
+
 /*
  * High Level Configuration Options
  */
 #define CONFIG_E300            1       /* E300 family */
 #define CONFIG_QE              1       /* Has QE */
-#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC830x         1       /* MPC830x family */
 #define CONFIG_MPC8309         1       /* MPC8309 CPU specific */
 
-#define CONFIG_KM_DEF_ARCH     "arch=ppc_8xx\0"
+#define CONFIG_KM_DEF_ARCH     "arch=ppc_82xx\0"
 #define CONFIG_CMD_DIAG                1
 
 /* include common defines/options for all 83xx Keymile boards */
@@ -30,10 +28,10 @@
 
 /* QE microcode/firmware address */
 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
-/* at end of uboot partition, before env */
-#define CONFIG_SYS_QE_FMAN_FW_ADDR   0xF00B0000
-
-#define CONFIG_MISC_INIT_R
+/* between the u-boot partition and env */
+#ifndef CONFIG_SYS_QE_FW_ADDR
+#define CONFIG_SYS_QE_FW_ADDR   0xF00C0000
+#endif
 
 /*
  * System IO Config
@@ -102,6 +100,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 | \