[U-Boot] Please pull u-boot-mpc85xx.git

Kumar Gala
2011-01-14T07:51:33Z

The following changes since commit c6b734f5aea2ba75caaa1929f7e649ecda8d2f31:

Merge branch 'master' of git://git.denx.de/u-boot-sh (2011-01-12 23:59:53 +0100)

are available in the git repository at:

git://git.denx.de/u-boot-mpc85xx master

Becky Bruce (9):
socrates: rename sdram_setup fixed_sdram()
mpc8569mds: Remove unnecessary CONFIG_SYS_LBC_SDRAM_BASE definition
MPC8568/MPC8569: Remove CONFIG_DDR_DLL define
tqm85xx: create fixed_sdram() to do sdram setup
mpc85xx/tlb.c: Allow platforms to specify wimge bits
mpc85xx boards: initdram() cleanup/bugfix
mpc85xx: rename sdram_init() lbc_sdram_init()
85xx boards: Rename CONFIG_DDR_DLL to CONFIG_SYS_FSL_ERRATUM_DDR_MSYNC_IN
MPC8xxx DDR: align informational prints

Chenhui Zhao (1):
fsl_esdhc: Fix esdhc disabled problem on some platforms

Jerry Huang (1):
fsl_esdhc: Add the workaround for erratum ESDHC111 (enable on P4080)

Kumar Gala (46):
powerpc/85xx: Removed support for ATUM8548 board
powerpc/85xx: Removed support for MPC8540EVAL board
powerpc/85xx: Remove support for PM854/PM856 boards
powerpc/85xx: Add support for booting from NAND on MPC8572DS
powerpc/85xx: Replace CONFIG_SYS_HAS_SERDES with a weak function
powerpc/85xx: Create a SERDES section in Makefile
powerpc/86xx: Add SERDES support on MPC8641 & MPC8610
powerpc/85xx: Add is_serdes_configured() support for P2020 SERDES
powerpc/85xx: Add is_serdes_configured() support for MPC8572 SERDES
powerpc/85xx: Add is_serdes_configured() support for MPC8548 SERDES
powerpc/85xx: Add is_serdes_configured() support for MPC8568 SERDES
powerpc/85xx: Add is_serdes_configured() support for MPC8569 SERDES
powerpc/85xx: Add is_serdes_configured() support for MPC8544 SERDES
powerpc/85xx: Add is_serdes_configured() support for P1021 SERDES
powerpc/8xxx: Replace is_fsl_pci_cfg with is_serdes_configured
powerpc/85xx: Cleanup SGMII detection and reporting
powerpc/85xx: Fix bug in dcache_disable
powerpc/fsl-pci: Determine pci_controller based on cfg addr for dts fixup
powerpc/fsl-pci: Add generic code to setup PCIe controllers
powerpc/85xx: Rework MPC8572DS pci_init_board to use common FSL PCIe code
powerpc/85xx: Rework P2020DS pci_init_board to use common FSL PCIe code
powerpc/85xx: Rework MPC8544DS pci_init_board to use common FSL PCIe code
powerpc/85xx: Rework MPC8536DS pci_init_board to use common FSL PCIe code
powerpc/86xx: Rework MPC8641HPCN pci_init_board to use common FSL PCIe code
powerpc/85xx: Rework MPC8548CDS pci_init_board to use common FSL PCIe code
powerpc/8xxx: Rework XES boards pci_init_board to use common FSL PCIe code
powerpc/85xx: Rework TQM boards pci_init_board to use common FSL PCIe code
powerpc/85xx: Rework MPC8568MDS pci_init_board to use common FSL PCIe code
powerpc/85xx: Rework MPC8569MDS pci_init_board to use common FSL PCIe code
powerpc/85xx: Rework P1_P2_RDB pci_init_board to use common FSL PCIe code
powerpc/86xx: Rework MPC8610HPCD pci_init_board to use common FSL PCIe code
powerpc/86xx: Rework SBC8641 pci_init_board to use common FSL PCIe code
powerpc/85xx: Rework SBC8548 pci_init_board to use common FSL PCIe code
powerpc/85xx: Rework corenet_ds pci_init_board to use common FSL PCIe code
powerpc/8xxx: Refactor SRIO initialization into common code
powerpc/85xx: Convert MPC8548CDS to use common SRIO init code
powerpc/85xx: Convert MPC8568MDS to use common SRIO init code
powerpc/85xx: Convert MPC8569MDS to use common SRIO init code
powerpc/86xx: Enable common SRIO init code
powerpc/86xx: Convert MPC8641HPCN to use common SRIO init code
powerpc/86xx: Convert SBC8641 to use common SRIO init code
powerpc/8xxx: Move fsl_is_spd() into generic 8xxx ddr code
powerpc/85xx: Bump up the CONFIG_SYS_BOOTM_LEN to 16M on FSL 85xx boards
powerpc/85xx: Add the workaround for erratum CPC-A002 (enable on P4080)
powerpc/85xx: Add the workaround for erratum CPC-A003 (enable on P4080)
powerpc/85xx: Add the workaround for erratum ELBC-A001 (enable on P4080)

Li Yang (1):
powerpc/85xx: Add SRIO support to P2020DS

Paul Gortmaker (1):
MPC8xxx: Update maintainer entry for Wind River sbc8xxx boards

Peter Tyser (1):
fsl_pci: Update PCIe boot ouput

Piergiorgio Beruto (1):
powerpc/85xx: Fix wrong SVR value for MPC8567 and MPC8567E processors

Roy Zang (2):
fsl_esdhc: Add the workaround for erratum ESDHC135 (enable on P4080)
fsl_esdhc: Add the workaround for erratum ESDHC136 (enable on P4080)

MAINTAINERS | 17 +-
README | 18 +
arch/powerpc/cpu/mpc85xx/Makefile | 18 +-
arch/powerpc/cpu/mpc85xx/cmd_errata.c | 24 +-
arch/powerpc/cpu/mpc85xx/cpu.c | 52 ++
arch/powerpc/cpu/mpc85xx/cpu_init.c | 29 +-
arch/powerpc/cpu/mpc85xx/fdt.c | 7 +-
arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c | 95 +++
arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c | 65 ++
arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c | 65 ++
arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c | 74 ++
arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c | 81 +++
arch/powerpc/cpu/mpc85xx/p1021_serdes.c | 64 ++
arch/powerpc/cpu/mpc85xx/p2020_serdes.c | 73 ++
arch/powerpc/cpu/mpc85xx/start.S | 4 +-
arch/powerpc/cpu/mpc85xx/tlb.c | 6 +-
arch/powerpc/cpu/mpc86xx/Makefile | 2 +
arch/powerpc/cpu/mpc86xx/cpu_init.c | 11 +-
arch/powerpc/cpu/mpc86xx/fdt.c | 7 +-
arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c | 85 +++
arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c | 94 +++
arch/powerpc/cpu/mpc8xxx/Makefile | 2 +-
arch/powerpc/cpu/mpc8xxx/ddr/main.c | 5 +-
arch/powerpc/cpu/mpc8xxx/ddr/options.c | 22 +-
arch/powerpc/cpu/mpc8xxx/fdt.c | 23 +-
arch/powerpc/cpu/mpc8xxx/fsl_lbc.c | 17 +-
arch/powerpc/cpu/mpc8xxx/pci_cfg.c | 204 ------
arch/powerpc/cpu/mpc8xxx/srio.c | 86 +++
arch/powerpc/include/asm/fsl_ddr_sdram.h | 16 +-
arch/powerpc/include/asm/fsl_law.h | 1 +
arch/powerpc/include/asm/fsl_lbc.h | 8 +-
arch/powerpc/include/asm/fsl_pci.h | 57 +--
arch/powerpc/include/asm/immap_85xx.h | 4 +-
arch/powerpc/include/asm/immap_86xx.h | 4 +-
arch/powerpc/include/asm/processor.h | 4 +-
board/atum8548/Makefile | 57 --
board/atum8548/atum8548.c | 297 --------
board/atum8548/ddr.c | 83 ---
board/atum8548/law.c | 61 --
board/atum8548/tlb.c | 90 ---
board/freescale/corenet_ds/corenet_ds.c | 44 --
board/freescale/corenet_ds/ddr.c | 18 +-
board/freescale/corenet_ds/pci.c | 118 +---
board/freescale/mpc8536ds/mpc8536ds.c | 160 +----
board/freescale/mpc8540ads/mpc8540ads.c | 61 +--
board/freescale/mpc8540ads/tlb.c | 19 -
board/freescale/mpc8541cds/mpc8541cds.c | 52 +--
board/freescale/mpc8544ds/law.c | 10 +-
board/freescale/mpc8544ds/mpc8544ds.c | 139 +---
board/freescale/mpc8548cds/law.c | 13 +-
board/freescale/mpc8548cds/mpc8548cds.c | 91 +--
board/freescale/mpc8548cds/tlb.c | 9 +-
board/freescale/mpc8555cds/mpc8555cds.c | 54 +--
board/freescale/mpc8560ads/mpc8560ads.c | 61 +--
board/freescale/mpc8560ads/tlb.c | 19 -
board/freescale/mpc8568mds/law.c | 7 +-
board/freescale/mpc8568mds/mpc8568mds.c | 95 +--
board/freescale/mpc8569mds/law.c | 5 +-
board/freescale/mpc8569mds/mpc8569mds.c | 76 +--
board/freescale/mpc8572ds/config.mk | 8 +-
board/freescale/mpc8572ds/law.c | 8 +-
board/freescale/mpc8572ds/mpc8572ds.c | 143 +----
board/freescale/mpc8572ds/tlb.c | 14 +-
board/freescale/mpc8610hpcd/law.c | 8 +-
board/freescale/mpc8610hpcd/mpc8610hpcd.c | 79 +--
board/freescale/mpc8641hpcn/law.c | 10 +-
board/freescale/mpc8641hpcn/mpc8641hpcn.c | 51 +--
board/freescale/p1022ds/p1022ds.c | 80 +--
board/freescale/p1_p2_rdb/ddr.c | 15 +-
board/freescale/p1_p2_rdb/law.c | 6 +-
board/freescale/p1_p2_rdb/p1_p2_rdb.c | 8 +-
board/freescale/p1_p2_rdb/pci.c | 65 +--
board/freescale/p2020ds/law.c | 8 +-
board/freescale/p2020ds/p2020ds.c | 154 +----
board/mpc8540eval/Makefile | 54 --
board/mpc8540eval/ddr.c | 73 --
board/mpc8540eval/flash.c | 894 ------------------------
board/mpc8540eval/law.c | 54 --
board/mpc8540eval/mpc8540eval.c | 230 ------
board/mpc8540eval/tlb.c | 78 --
board/pm854/Makefile | 53 --
board/pm854/ddr.c | 73 --
board/pm854/law.c | 58 --
board/pm854/pm854.c | 298 --------
board/pm854/tlb.c | 117 ---
board/pm856/Makefile | 53 --
board/pm856/ddr.c | 73 --
board/pm856/law.c | 58 --
board/pm856/pm856.c | 453 ------------
board/pm856/tlb.c | 117 ---
board/sbc8548/law.c | 8 -
board/sbc8548/sbc8548.c | 99 +---
board/sbc8548/tlb.c | 34 +-
board/sbc8560/sbc8560.c | 93 +---
board/sbc8641d/law.c | 5 -
board/sbc8641d/sbc8641d.c | 66 +--
board/socrates/sdram.c | 15 +-
board/stx/stxgp3/stxgp3.c | 32 -
board/stx/stxssa/stxssa.c | 33 -
board/tqc/tqm85xx/law.c | 9 +-
board/tqc/tqm85xx/sdram.c | 70 +--
board/tqc/tqm85xx/tlb.c | 47 --
board/tqc/tqm85xx/tqm85xx.c | 44 +-
board/xes/common/Makefile | 2 -
board/xes/common/fsl_8xxx_ddr.c | 46 --
board/xes/common/fsl_8xxx_pci.c | 113 +---
board/xes/xpedite517x/law.c | 8 -
board/xes/xpedite517x/xpedite517x.c | 13 +
board/xes/xpedite520x/law.c | 8 -
board/xes/xpedite537x/law.c | 12 -
board/xes/xpedite550x/law.c | 12 -
boards.cfg | 9 +-
doc/README.atum8548 | 29 -
doc/README.mpc85xxads | 4 +-
drivers/mmc/fsl_esdhc.c | 29 +-
drivers/pci/fsl_pci_init.c | 183 +++++-
drivers/pci/pci.c | 12 +
include/configs/ATUM8548.h | 443 ------------
include/configs/MPC837XEMDS.h | 1 +
include/configs/MPC837XERDB.h | 1 +
include/configs/MPC8536DS.h | 8 +-
include/configs/MPC8540ADS.h | 3 +-
include/configs/MPC8540EVAL.h | 362 ----------
include/configs/MPC8541CDS.h | 3 +-
include/configs/MPC8544DS.h | 6 +-
include/configs/MPC8548CDS.h | 19 +-
include/configs/MPC8555CDS.h | 3 +-
include/configs/MPC8560ADS.h | 3 +-
include/configs/MPC8568MDS.h | 15 +-
include/configs/MPC8569MDS.h | 25 +-
include/configs/MPC8572DS.h | 122 +++-
include/configs/MPC8610HPCD.h | 4 +-
include/configs/MPC8641HPCN.h | 31 +-
include/configs/P1022DS.h | 4 +-
include/configs/P1_P2_RDB.h | 6 +-
include/configs/P2020DS.h | 28 +-
include/configs/P4080DS.h | 9 +-
include/configs/PM854.h | 426 -----------
include/configs/PM856.h | 429 ------------
include/configs/SBC8540.h | 2 +-
include/configs/TQM85xx.h | 6 +-
include/configs/corenet_ds.h | 21 +-
include/configs/sbc8560.h | 2 +-
include/configs/sbc8641d.h | 15 +-
include/configs/stxgp3.h | 2 +-
include/configs/stxssa.h | 1 -
include/pci.h | 1 +
nand_spl/board/freescale/mpc8572ds/Makefile | 133 ++++
nand_spl/board/freescale/mpc8572ds/nand_boot.c | 82 +++
149 files changed, 2041 insertions(+), 7586 deletions(-)
create mode 100644 arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
create mode 100644 arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
create mode 100644 arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
create mode 100644 arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
create mode 100644 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
create mode 100644 arch/powerpc/cpu/mpc85xx/p1021_serdes.c
create mode 100644 arch/powerpc/cpu/mpc85xx/p2020_serdes.c
create mode 100644 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
create mode 100644 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
delete mode 100644 arch/powerpc/cpu/mpc8xxx/pci_cfg.c
create mode 100644 arch/powerpc/cpu/mpc8xxx/srio.c
delete mode 100644 board/atum8548/Makefile
delete mode 100644 board/atum8548/atum8548.c
delete mode 100644 board/atum8548/ddr.c
delete mode 100644 board/atum8548/law.c
delete mode 100644 board/atum8548/tlb.c
delete mode 100644 board/mpc8540eval/Makefile
delete mode 100644 board/mpc8540eval/ddr.c
delete mode 100644 board/mpc8540eval/flash.c
delete mode 100644 board/mpc8540eval/law.c
delete mode 100644 board/mpc8540eval/mpc8540eval.c
delete mode 100644 board/mpc8540eval/tlb.c
delete mode 100644 board/pm854/Makefile
delete mode 100644 board/pm854/ddr.c
delete mode 100644 board/pm854/law.c
delete mode 100644 board/pm854/pm854.c
delete mode 100644 board/pm854/tlb.c
delete mode 100644 board/pm856/Makefile
delete mode 100644 board/pm856/ddr.c
delete mode 100644 board/pm856/law.c
delete mode 100644 board/pm856/pm856.c
delete mode 100644 board/pm856/tlb.c
delete mode 100644 board/xes/common/fsl_8xxx_ddr.c
delete mode 100644 doc/README.atum8548
delete mode 100644 include/configs/ATUM8548.h
delete mode 100644 include/configs/MPC8540EVAL.h
delete mode 100644 include/configs/PM854.h
delete mode 100644 include/configs/PM856.h
create mode 100644 nand_spl/board/freescale/mpc8572ds/Makefile
create mode 100644 nand_spl/board/freescale/mpc8572ds/nand_boot.c