Merge branch 'next' of ../custodians into next

[u-boot] / include / configs / XPEDITE5170.h

diff --git a/include/configs/XPEDITE5170.h b/include/configs/XPEDITE5170.h
index 242466ae12048dce561b1fa480a25f442ee71c17..8770a8dab99e13d876baf7e0eea97d504e3d6c23 100644 (file)
--- a/include/configs/XPEDITE5170.h
+++ b/include/configs/XPEDITE5170.h
@@ -36,7 +36,6 @@
 #define CONFIG_SYS_BOARD_NAME  "XPedite5170"
 #define CONFIG_LINUX_RESET_VEC 0x100   /* Reset vector used by Linux */
 #define CONFIG_BOARD_EARLY_INIT_R      /* Call board_pre_init */
-#define CONFIG_RELOC_FIXUP_WORKS       /* Fully relocate to SDRAM */
 #define CONFIG_HIGH_BATS       1       /* High BATs supported and enabled */
 #define CONFIG_ALTIVEC         1
 
@@ -98,8 +97,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR
 #define CONFIG_SYS_CCSRBAR_PHYS_HIGH   0x0
 #define CONFIG_SYS_IMMR                        CONFIG_SYS_CCSRBAR
-#define CONFIG_SYS_PCIE1_ADDR          (CONFIG_SYS_CCSRBAR + 0x8000)
-#define CONFIG_SYS_PCIE2_ADDR          (CONFIG_SYS_CCSRBAR + 0x9000)
 
 /*
  * Diagnostics
@@ -122,7 +119,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  * 0xf800_0000 0xffff_ffff     NOR Flash 1             128M non-cacheable
  */
 
-#define CONFIG_SYS_LBC_LCRR            (LCRR_CLKDIV_2 | LCRR_EADC_3)
+#define CONFIG_SYS_LBC_LCRR            (LCRR_CLKDIV_4 | LCRR_EADC_3)
 
 /*
  * NAND flash configuration
@@ -240,9 +237,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_OF_BOARD_SETUP          1
 #define CONFIG_OF_STDOUT_VIA_ALIAS     1
 
-#define CONFIG_SYS_64BIT_VSPRINTF      1
-#define CONFIG_SYS_64BIT_STRTOUL       1
-
 /*
  * I2C
  */