Convert CONFIG_CMD_DIAG to Kconfig

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

diff --git a/include/configs/km/km8309-common.h b/include/configs/km/km8309-common.h
index 47355ab..f9fed79 100644 (file)
--- a/include/configs/km/km8309-common.h
+++ b/include/configs/km/km8309-common.h
@@ -15,20 +15,20 @@
  */
 #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_82xx\0"
-#define CONFIG_CMD_DIAG                1
 
 /* include common defines/options for all 83xx Keymile boards */
 #include "km83xx-common.h"
 
 /* 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
+/* between the u-boot partition and env */
+#ifndef CONFIG_SYS_QE_FW_ADDR
+#define CONFIG_SYS_QE_FW_ADDR   0xF00C0000
+#endif
 
 /*
  * System IO Config
@@ -97,6 +97,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 | \