From: Wolfgang Denk Date: Thu, 9 Aug 2012 19:04:05 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx X-Git-Tag: v2012.10-rc1~398 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1d56f63dab2d9b1ea60601f5f3ae22d8664d8aa5;p=u-boot Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx * 'master' of git://git.denx.de/u-boot-mpc85xx: powerpc/85xx: use CONFIG_SYS_FSL_PCIE_COMPAT macro when setting the PCI LIODNs powerpc/mpc85xx: Ignore E bit for BSC9130/1 powerpc/sgmii: To support PHY link state auto detect in SGMII mode powerpc/85xx: improve definition of BR_PHYS_ADDR macro powerpc/p2041: configure the CPLD lane_mux according to RCW powerpc/ddr: fix fsl_ddr_get_dimm_params compile error powerpc/corenet: fix compile error when CONFIG_SYS_NO_FLASH is defined powerpc/mpc8xxx: fix workaround for errata DDR111 and DDR134 for DDR over 4GB powerpc/p1022ds: fix DIU/LBC switching with NAND enabled powerpc/p1022ds: add support for SPI and SD boot Signed-off-by: Wolfgang Denk --- 1d56f63dab2d9b1ea60601f5f3ae22d8664d8aa5