are available in the git repository at:

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

A re-send, since I accidentally undid a bunch of changes before I sent the last pull request. This one has been build-tested.

Andy Fleming (1): socrates: Fix PCI clk fix patch

Anton Vorontsov (2): 83xx/85xx/86xx: factor out Freescale Localbus defines out of mpc83xx.h 83xx/85xx: further localbus cleanups

Becky Bruce (1): MPC85xx: Change traps.c to not reference non-addressable memory

Kumar Gala (9): 85xx: Only use PORPLLSR[DDR_Ratio] on platforms that define it 85xx: expose cpu identification 85xx: Add setting of cache props in the device tree. 85xx: Remove unused and unconfigured memory test code. MPC8544DS: Update config.h 85xx: remove dummy board_early_init_f FSL LAW: Keep track of LAW allocations 85xx/86xx: Move to dynamic mgmt of LAWs FSL LAW: Add new interface to use the last free LAW

Sergei Poselenov (7): Socrates: config file cleanup. Added the upmconfig() function for 85xx. Socrates: Added FPGA mapping. LAWs and TLBs cleanup. Socrates: added missed file with UPMA configuration data. NAND: Added support for 128-bit OOB, adapted Socrates: NAND support added. Changed the U-Boot base address and Socrates: Added FPGA base address update in FDT.

Wolfgang Grandegger (16): 83xx/85xx/86xx: add more MxMR local bus definitions TQM: move TQM boards to board/tqc PPC: add accessor macros to clear and set bits in one shot MPC85xx: Beautify boot output of L2 cache configuration NAND FSL UPM: driver re-write using the hwcontrol callback TQM85xx: Various coding style fixes TQM85xx: Fix CPM port pin configuration TQM85xx: Support for Spansion 'N' type flashes added TQM85xx: Fix chip select configuration for second FLASH bank TQM85xx: Bugfix in the SDRAM initialisation TQM85xx: Support for Intel 82527 compatible CAN controller TQM85xx: Support for Flat Device Tree TQM8548: Basic support for the TQM8548 modules TQM8548: PCI express support TQM85xx: NAND support via local bus UPMB TQM85xx: Change memory map to support Flash memory > 128 MiB

MAKEALL | 1 + Makefile | 34 +- board/atum8548/law.c | 14 +- board/freescale/mpc8540ads/law.c | 10 +- board/freescale/mpc8540ads/mpc8540ads.c | 42 -- board/freescale/mpc8541cds/law.c | 10 +- board/freescale/mpc8541cds/mpc8541cds.c | 44 -- board/freescale/mpc8544ds/law.c | 16 +- board/freescale/mpc8544ds/mpc8544ds.c | 44 -- board/freescale/mpc8548cds/law.c | 16 +- board/freescale/mpc8548cds/mpc8548cds.c | 44 -- board/freescale/mpc8555cds/law.c | 10 +- board/freescale/mpc8555cds/mpc8555cds.c | 44 -- board/freescale/mpc8560ads/law.c | 10 +- board/freescale/mpc8560ads/mpc8560ads.c | 42 -- board/freescale/mpc8568mds/law.c | 12 +- board/freescale/mpc8568mds/mpc8568mds.c | 39 -- board/freescale/mpc8610hpcd/law.c | 18 +- board/freescale/mpc8641hpcn/law.c | 18 +- board/mpc8540eval/law.c | 6 +- board/pm854/law.c | 10 +- board/pm856/law.c | 10 +- board/sbc8548/law.c | 8 +- board/sbc8560/law.c | 6 +- board/sbc8641d/law.c | 18 +- board/socrates/Makefile | 2 +- board/socrates/config.mk | 3 +- board/socrates/law.c | 21 +- board/socrates/nand.c | 218 ++++++++ board/socrates/socrates.c | 22 +- board/socrates/tlb.c | 25 +- board/socrates/upm_table.h | 55 ++ board/stxgp3/law.c | 10 +- board/stxssa/law.c | 12 +- board/{ => tqc}/tqm5200/Makefile | 0 board/{ => tqc}/tqm5200/cam5200_flash.c | 0 board/{ => tqc}/tqm5200/cmd_stk52xx.c | 0 board/{ => tqc}/tqm5200/cmd_tb5200.c | 0 board/{ => tqc}/tqm5200/config.mk | 0 board/{ => tqc}/tqm5200/mt48lc16m16a2-75.h | 0 board/{ => tqc}/tqm5200/tqm5200.c | 0 board/{ => tqc}/tqm8260/Makefile | 0 board/{ => tqc}/tqm8260/config.mk | 0 board/{ => tqc}/tqm8260/flash.c | 0 board/{ => tqc}/tqm8260/tqm8260.c | 0 board/{ => tqc}/tqm8272/Makefile | 0 board/{ => tqc}/tqm8272/config.mk | 0 board/{ => tqc}/tqm8272/tqm8272.c | 0 board/{ => tqc}/tqm834x/Makefile | 0 board/{ => tqc}/tqm834x/config.mk | 0 board/{ => tqc}/tqm834x/pci.c | 0 board/{ => tqc}/tqm834x/tqm834x.c | 0 board/{ => tqc}/tqm85xx/Makefile | 8 +- board/{ => tqc}/tqm85xx/config.mk | 0 board/tqc/tqm85xx/law.c | 86 +++ board/tqc/tqm85xx/nand.c | 469 ++++++++++++++++ board/tqc/tqm85xx/sdram.c | 371 +++++++++++++ board/tqc/tqm85xx/tlb.c | 248 +++++++++ board/tqc/tqm85xx/tqm85xx.c | 744 ++++++++++++++++++++++++++ board/{ => tqc}/tqm85xx/u-boot.lds | 0 board/{ => tqc}/tqm8xx/Makefile | 0 board/{ => tqc}/tqm8xx/config.mk | 0 board/{ => tqc}/tqm8xx/flash.c | 0 board/{ => tqc}/tqm8xx/load_sernum_ethaddr.c | 0 board/{ => tqc}/tqm8xx/tqm8xx.c | 0 board/{ => tqc}/tqm8xx/u-boot.lds | 0 board/{ => tqc}/tqm8xx/u-boot.lds.debug | 0 board/tqm85xx/law.c | 54 -- board/tqm85xx/sdram.c | 223 -------- board/tqm85xx/tlb.c | 114 ---- board/tqm85xx/tqm85xx.c | 419 --------------- cpu/mpc85xx/cpu.c | 152 ++++-- cpu/mpc85xx/cpu_init.c | 39 +- cpu/mpc85xx/fdt.c | 128 +++++ cpu/mpc85xx/spd_sdram.c | 2 +- cpu/mpc85xx/traps.c | 8 +- cpu/mpc86xx/cpu_init.c | 3 - cpu/mpc86xx/spd_sdram.c | 6 +- drivers/input/ps2ser.c | 31 +- drivers/misc/fsl_law.c | 65 ++- drivers/mtd/nand/fsl_upm.c | 128 ++--- drivers/mtd/nand/nand_base.c | 46 ++- include/asm-ppc/fsl_law.h | 5 + include/asm-ppc/fsl_lbc.h | 301 +++++++++++ include/asm-ppc/global_data.h | 3 + include/asm-ppc/io.h | 36 ++ include/asm-ppc/processor.h | 11 + include/configs/MPC8315ERDB.h | 2 +- include/configs/MPC8349EMDS.h | 2 +- include/configs/MPC8349ITX.h | 4 +- include/configs/MPC8360EMDS.h | 2 +- include/configs/MPC8360ERDK.h | 2 +- include/configs/MPC837XEMDS.h | 2 +- include/configs/MPC8540ADS.h | 3 - include/configs/MPC8541CDS.h | 3 - include/configs/MPC8544DS.h | 6 +- include/configs/MPC8548CDS.h | 3 - include/configs/MPC8555CDS.h | 3 - include/configs/MPC8560ADS.h | 4 +- include/configs/MPC8568MDS.h | 1 - include/configs/SBC8540.h | 1 + include/configs/TQM834x.h | 2 +- include/configs/TQM85xx.h | 380 +++++++++++--- include/configs/sbc8560.h | 1 + include/configs/socrates.h | 29 +- include/configs/stxgp3.h | 1 + include/configs/stxssa.h | 1 + include/linux/mtd/fsl_upm.h | 1 - include/linux/mtd/mtd-abi.h | 2 +- include/mpc83xx.h | 234 +-------- include/mpc85xx.h | 37 +-- include/mpc86xx.h | 2 + lib_ppc/board.c | 3 +- 113 files changed, 3493 insertions(+), 1832 deletions(-) create mode 100644 board/socrates/nand.c create mode 100644 board/socrates/upm_table.h rename board/{ => tqc}/tqm5200/Makefile (100%) rename board/{ => tqc}/tqm5200/cam5200_flash.c (100%) rename board/{ => tqc}/tqm5200/cmd_stk52xx.c (100%) rename board/{ => tqc}/tqm5200/cmd_tb5200.c (100%) rename board/{ => tqc}/tqm5200/config.mk (100%) rename board/{ => tqc}/tqm5200/mt48lc16m16a2-75.h (100%) rename board/{ => tqc}/tqm5200/tqm5200.c (100%) rename board/{ => tqc}/tqm8260/Makefile (100%) rename board/{ => tqc}/tqm8260/config.mk (100%) rename board/{ => tqc}/tqm8260/flash.c (100%) rename board/{ => tqc}/tqm8260/tqm8260.c (100%) rename board/{ => tqc}/tqm8272/Makefile (100%) rename board/{ => tqc}/tqm8272/config.mk (100%) rename board/{ => tqc}/tqm8272/tqm8272.c (100%) rename board/{ => tqc}/tqm834x/Makefile (100%) rename board/{ => tqc}/tqm834x/config.mk (100%) rename board/{ => tqc}/tqm834x/pci.c (100%) rename board/{ => tqc}/tqm834x/tqm834x.c (100%) rename board/{ => tqc}/tqm85xx/Makefile (91%) rename board/{ => tqc}/tqm85xx/config.mk (100%) create mode 100644 board/tqc/tqm85xx/law.c create mode 100644 board/tqc/tqm85xx/nand.c create mode 100644 board/tqc/tqm85xx/sdram.c create mode 100644 board/tqc/tqm85xx/tlb.c create mode 100644 board/tqc/tqm85xx/tqm85xx.c rename board/{ => tqc}/tqm85xx/u-boot.lds (100%) rename board/{ => tqc}/tqm8xx/Makefile (100%) rename board/{ => tqc}/tqm8xx/config.mk (100%) rename board/{ => tqc}/tqm8xx/flash.c (100%) rename board/{ => tqc}/tqm8xx/load_sernum_ethaddr.c (100%) rename board/{ => tqc}/tqm8xx/tqm8xx.c (100%) rename board/{ => tqc}/tqm8xx/u-boot.lds (100%) rename board/{ => tqc}/tqm8xx/u-boot.lds.debug (100%) delete mode 100644 board/tqm85xx/law.c delete mode 100644 board/tqm85xx/sdram.c delete mode 100644 board/tqm85xx/tlb.c delete mode 100644 board/tqm85xx/tqm85xx.c create mode 100644 include/asm-ppc/fsl_lbc.h