Merge branch 'next' of ../next

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

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index f0592a8..0a4ba29 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -31,12 +31,11 @@
  */
 #define CONFIG_E300            1
 #define CONFIG_MPC83xx         1
-#define CONFIG_MPC831X         1
+#define CONFIG_MPC831x         1
 #define CONFIG_MPC8313         1
 #define CONFIG_MPC8313ERDB     1
 
 #define CONFIG_PCI
-#define CONFIG_83XX_GENERIC_PCI
 
 #define CONFIG_MISC_INIT_R
 
@@ -211,13 +210,14 @@
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 /* CONFIG_SYS_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */
-#define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 kB for Mon */
+#define CONFIG_SYS_MONITOR_LEN         (384 * 1024)    /* Reserve 384 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN          (512 * 1024)    /* Reserved for malloc */
 
 /*
  * Local Bus LCRR and LBCR regs
  */
-#define CONFIG_SYS_LCRR        LCRR_EADC_1 | LCRR_CLKDIV_4
+#define CONFIG_SYS_LCRR_EADC   LCRR_EADC_1
+#define CONFIG_SYS_LCRR_CLKDIV LCRR_CLKDIV_4
 #define CONFIG_SYS_LBC_LBCR    ( 0x00040000 /* TODO */ \
                        | (0xFF << LBCR_BMT_SHIFT) \
                        | 0xF ) /* 0x0004ff0f */
@@ -242,6 +242,7 @@
 #define CONFIG_SYS_NAND_U_BOOT_START 0x00100100
 #define CONFIG_SYS_NAND_U_BOOT_OFFS  16384
 #define CONFIG_SYS_NAND_U_BOOT_RELOC 0x00010000
+#define CONFIG_SYS_NAND_U_BOOT_RELOC_SP (CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000)
 
 #define CONFIG_SYS_NAND_BR_PRELIM      ( CONFIG_SYS_NAND_BASE \
                                | (2<<BR_DECC_SHIFT)    /* Use HW ECC */ \
@@ -594,7 +595,7 @@
 #define CONFIG_UBOOTPATH       u-boot.bin      /* U-Boot image on TFTP server */
 #define CONFIG_FDTFILE         mpc8313erdb.dtb
 
-#define CONFIG_LOADADDR                500000  /* default location for tftp and bootm */
+#define CONFIG_LOADADDR                800000  /* default location for tftp and bootm */
 #define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
 #define CONFIG_BAUDRATE                115200
 
@@ -611,7 +612,7 @@
                "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
                "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
                "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
-       "fdtaddr=400000\0"                                              \
+       "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "console=ttyS0\0"                                               \
        "setbootargs=setenv bootargs "                                  \