On Mon, Oct 22, 2012 at 05:36:15PM -0500, Andy Fleming wrote: > Merge branch 'master' of git://git.denx.de/u-boot-arm (2012-10-19 18:23:38 > -0700) > > are available in the git repository at: > > > git://www.denx.de/git/u-boot-mpc85xx.git master > > for you to fetch changes up to 23028d69e950023a3cb605751dbcb1e314be8b36: > > 85xx: Protect timeout_save variable with ifdefs (2012-10-22 17:28:18 -0500) > > ---------------------------------------------------------------- > Andy Fleming (2): > powerpc/mpc85xx: Add T4 device definitions > 85xx: Protect timeout_save variable with ifdefs > > Chris Packham (1): > mpc85xx: make gpio_direction_output respect value > > Haiying Wang (2): > mpc85xx/portals: Add qman and bman ip_cfg field into portal info > poweprc/85xx: add QMan frequency info and fdt fixup. > > Kumar Gala (1): > powerpc/85xx: Add determining and report IFC frequency > > Laurentiu Tudor (2): > powerpc/85xx: introduce SET_PCI_LIODN_BASE, for setting PCI LIODNs > powerpc/p5040ds: add per pci endpoint liodn offset list > > Liu Gang (2): > powerpc/srio: Workaround for srio erratrm a004034 > powerpc/boot: Change the compile macro for SRIO & PCIE boot master > module > > Mark Marshall (1): > powerpc mpc85xx: Only clear TSR:WIS in watchdog_reset. > > Minghuan Lian (1): > fsl_pci: use 'Header Type' field to judge PCIE mode > > Mingkai Hu (1): > phylib: Enable SMSC LAN87xx PHY support > > Prabhakar Kushwaha (1): > board/freescale/common:QIXIS:Fix magic number usage > > Roy Zang (1): > fm/mEMAC: add mEMAC frame work > > Shaohui Xie (1): > powerpc/espi: remove write command length check > > Shaveta Leekha (1): > board/freescale/common: VSC3316/VSC3308 initialization code > > Shengzhou Liu (1): > powerpc/board: add present2 register definition for QIXIS > > Timur Tabi (4): > powerpc/mpc85xx: fix Unicode characters in release.S > powerpc/85xx: define SRIO LIODN functions only if SRIO is defined > powerpc/85xx: move SRIO configuration out of corenet_ds.h > powerpc/85xx: Add P5040 processor support > > York Sun (25): > driver/pci: Fix compiling error > powerpc/DPAA: Fix compiling error > powerpc/mpc85xx: Introduce new macros to add and delete TLB entries > powerpc/mpc85xx: Enable L2 at the beginning of U-boot for E6500 > powerpc/mpc85xx: change RCW MEM_PLL_PLAT for Chassis generation 2 > powerpc/mpc85xx: check number of cores > powerpc/mpc85xx: Fix core cluster PLL calculation for Chassis > generation 2 > powerpc/mpc85xx: expand SERDES reference clock select bit > powerpc/e6500: Move QCSP registers for QMan v3 > powerpc/mpc85xx: Add RCW bits and registers for SerDes for corenet2 > powerpc/corenet2: Add SerDes for corenet2 > powerpc/corenet2: fix mismatch DDR sync bit from RCW > powerpc/mpc85xx: Add T4240 SoC > powerpc/mpc85xx: Add B4860 and variant SoCs > powerpc/mpc8xxx: Update DDR registers > powerpc/mpc8xxx: Fix DDR driver handling quad-rank DIMMs and address > calculation > powerpc/mpc8xxx: Fix DDR initialization waiting for D_INIT > powerpc/mpc85xx: software workaround for DDR erratum A-004468 > powerpc/mpc85xx: Add workaround for DDR erratum A004934 > powerpc/mpc8xxx: Add auto select bank interleaving mode > powerpc/mpc8xxx: Fix DDR SPD failed message > powerpc/mpc85xx: Remove R6 from spin table > powerpc/mpc85xx: Rewrite spin table to comply with ePAPR v1.1 > powerpc/mpc85xx: Add CONFIG_DDR_CLK_FREQ for corenet platform > powerpc/t4qds: Add T4QDS board > > Zang Roy-R61911 (1): > P4080/esdhc: make the P4080 ESDHC13 errata workaround conditional > > ramneek mehresh (1): > powerpc/mpc8xxx: Fix USB device-tree fixup > > shaohui xie (1): > powerpc/fm: fix TBI PHY address settings > > README | 6 + > arch/powerpc/cpu/mpc85xx/Makefile | 12 +- > arch/powerpc/cpu/mpc85xx/b4860_ids.c | 141 ++++ > arch/powerpc/cpu/mpc85xx/b4860_serdes.c | 162 ++++ > arch/powerpc/cpu/mpc85xx/cmd_errata.c | 14 +- > arch/powerpc/cpu/mpc85xx/cpu.c | 42 +- > arch/powerpc/cpu/mpc85xx/cpu_init.c | 62 +- > arch/powerpc/cpu/mpc85xx/ddr-gen3.c | 91 +- > arch/powerpc/cpu/mpc85xx/fdt.c | 34 +- > arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 203 +++++ > arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h | 26 + > arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 70 ++ > arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h | 3 - > arch/powerpc/cpu/mpc85xx/liodn.c | 60 ++ > arch/powerpc/cpu/mpc85xx/mp.c | 155 +++- > arch/powerpc/cpu/mpc85xx/mp.h | 5 +- > arch/powerpc/cpu/mpc85xx/p5040_ids.c | 127 +++ > arch/powerpc/cpu/mpc85xx/p5040_serdes.c | 117 +++ > arch/powerpc/cpu/mpc85xx/portals.c | 13 +- > arch/powerpc/cpu/mpc85xx/release.S | 219 ++--- > arch/powerpc/cpu/mpc85xx/speed.c | 163 +++- > arch/powerpc/cpu/mpc85xx/start.S | 346 ++++---- > arch/powerpc/cpu/mpc85xx/t4240_ids.c | 203 +++++ > arch/powerpc/cpu/mpc85xx/t4240_serdes.c | 237 ++++++ > arch/powerpc/cpu/mpc85xx/tlb.c | 2 +- > arch/powerpc/cpu/mpc86xx/fdt.c | 2 +- > arch/powerpc/cpu/mpc86xx/mp.c | 9 +- > arch/powerpc/cpu/mpc8xxx/cpu.c | 11 + > arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c | 84 +- > arch/powerpc/cpu/mpc8xxx/ddr/interactive.c | 12 +- > .../cpu/mpc8xxx/ddr/lc_common_dimm_params.c | 16 +- > arch/powerpc/cpu/mpc8xxx/ddr/main.c | 26 +- > arch/powerpc/cpu/mpc8xxx/ddr/options.c | 45 +- > arch/powerpc/cpu/mpc8xxx/ddr/util.c | 22 + > arch/powerpc/cpu/mpc8xxx/fdt.c | 50 +- > arch/powerpc/cpu/mpc8xxx/srio.c | 216 ++++- > arch/powerpc/include/asm/config_mpc85xx.h | 103 ++- > arch/powerpc/include/asm/fsl_ddr_sdram.h | 34 + > arch/powerpc/include/asm/fsl_fman.h | 17 + > arch/powerpc/include/asm/fsl_liodn.h | 15 +- > arch/powerpc/include/asm/fsl_memac.h | 271 ++++++ > arch/powerpc/include/asm/fsl_portals.h | 5 +- > arch/powerpc/include/asm/fsl_serdes.h | 42 + > arch/powerpc/include/asm/immap_85xx.h | 367 +++++++- > arch/powerpc/include/asm/mp.h | 2 +- > arch/powerpc/include/asm/mpc85xx_gpio.h | 5 +- > arch/powerpc/include/asm/processor.h | 11 + > arch/powerpc/lib/board.c | 4 +- > board/freescale/common/Makefile | 1 + > board/freescale/common/qixis.c | 15 +- > board/freescale/common/qixis.h | 8 +- > board/freescale/common/vsc3316_3308.c | 184 ++++ > board/freescale/common/vsc3316_3308.h | 34 + > board/freescale/t4qds/Makefile | 54 ++ > board/freescale/t4qds/ddr.c | 186 +++++ > board/freescale/t4qds/eth.c | 495 +++++++++++ > board/freescale/t4qds/law.c | 47 ++ > board/freescale/t4qds/pci.c | 39 + > board/freescale/t4qds/t4240qds_qixis.h | 56 ++ > board/freescale/t4qds/t4qds.c | 395 +++++++++ > board/freescale/t4qds/t4qds.h | 37 + > board/freescale/t4qds/tlb.c | 136 +++ > boards.cfg | 3 + > doc/README.VSC3316-3308 | 43 + > doc/README.fsl-ddr | 5 + > doc/README.mpc85xx-spin-table | 26 + > doc/README.t4240qds | 98 +++ > drivers/net/fm/Makefile | 6 + > drivers/net/fm/eth.c | 39 +- > drivers/net/fm/init.c | 18 + > drivers/net/fm/memac.c | 132 +++ > drivers/net/fm/memac_phy.c | 150 ++++ > drivers/net/fm/t4240.c | 128 +++ > drivers/pci/fsl_pci_init.c | 65 +- > drivers/spi/fsl_espi.c | 6 +- > include/config_phylib_all_drivers.h | 1 + > include/configs/P3041DS.h | 4 + > include/configs/P4080DS.h | 4 + > include/configs/P5020DS.h | 4 + > include/configs/T4240QDS.h | 35 + > include/configs/corenet_ds.h | 4 - > include/configs/t4qds.h | 875 > ++++++++++++++++++++ > include/e500.h | 3 + > include/fm_eth.h | 53 +- > include/fsl_mdio.h | 6 +- > 85 files changed, 6764 insertions(+), 513 deletions(-) > create mode 100644 arch/powerpc/cpu/mpc85xx/b4860_ids.c > create mode 100644 arch/powerpc/cpu/mpc85xx/b4860_serdes.c > create mode 100644 arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c > create mode 100644 arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h > create mode 100644 arch/powerpc/cpu/mpc85xx/p5040_ids.c > create mode 100644 arch/powerpc/cpu/mpc85xx/p5040_serdes.c > create mode 100644 arch/powerpc/cpu/mpc85xx/t4240_ids.c > create mode 100644 arch/powerpc/cpu/mpc85xx/t4240_serdes.c > create mode 100644 arch/powerpc/include/asm/fsl_memac.h > create mode 100644 board/freescale/common/vsc3316_3308.c > create mode 100644 board/freescale/common/vsc3316_3308.h > create mode 100644 board/freescale/t4qds/Makefile > create mode 100644 board/freescale/t4qds/ddr.c > create mode 100644 board/freescale/t4qds/eth.c > create mode 100644 board/freescale/t4qds/law.c > create mode 100644 board/freescale/t4qds/pci.c > create mode 100644 board/freescale/t4qds/t4240qds_qixis.h > create mode 100644 board/freescale/t4qds/t4qds.c > create mode 100644 board/freescale/t4qds/t4qds.h > create mode 100644 board/freescale/t4qds/tlb.c > create mode 100644 doc/README.VSC3316-3308 > create mode 100644 doc/README.mpc85xx-spin-table > create mode 100644 doc/README.t4240qds > create mode 100644 drivers/net/fm/memac.c > create mode 100644 drivers/net/fm/memac_phy.c > create mode 100644 drivers/net/fm/t4240.c > create mode 100644 include/configs/T4240QDS.h > create mode 100644 include/configs/t4qds.h
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
