Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Conflicts:
drivers/usb/host/ehci-pci.c
Signed-off-by: 
Wolfgang Denk <wd@denx.de>
Showing
- README 22 additions, 0 deletionsREADME
- arch/powerpc/cpu/mpc85xx/Makefile 13 additions, 1 deletionarch/powerpc/cpu/mpc85xx/Makefile
- arch/powerpc/cpu/mpc85xx/cpu.c 6 additions, 1 deletionarch/powerpc/cpu/mpc85xx/cpu.c
- arch/powerpc/cpu/mpc85xx/cpu_init.c 26 additions, 6 deletionsarch/powerpc/cpu/mpc85xx/cpu_init.c
- arch/powerpc/cpu/mpc85xx/fdt.c 12 additions, 0 deletionsarch/powerpc/cpu/mpc85xx/fdt.c
- arch/powerpc/cpu/mpc85xx/p1010_serdes.c 75 additions, 0 deletionsarch/powerpc/cpu/mpc85xx/p1010_serdes.c
- arch/powerpc/cpu/mpc85xx/p1023_serdes.c 53 additions, 0 deletionsarch/powerpc/cpu/mpc85xx/p1023_serdes.c
- arch/powerpc/cpu/mpc85xx/p3041_ids.c 5 additions, 5 deletionsarch/powerpc/cpu/mpc85xx/p3041_ids.c
- arch/powerpc/cpu/mpc85xx/p4080_ids.c 4 additions, 4 deletionsarch/powerpc/cpu/mpc85xx/p4080_ids.c
- arch/powerpc/cpu/mpc85xx/p5020_ids.c 5 additions, 5 deletionsarch/powerpc/cpu/mpc85xx/p5020_ids.c
- arch/powerpc/cpu/mpc85xx/portals.c 23 additions, 9 deletionsarch/powerpc/cpu/mpc85xx/portals.c
- arch/powerpc/cpu/mpc85xx/speed.c 37 additions, 11 deletionsarch/powerpc/cpu/mpc85xx/speed.c
- arch/powerpc/cpu/mpc85xx/tlb.c 2 additions, 2 deletionsarch/powerpc/cpu/mpc85xx/tlb.c
- arch/powerpc/cpu/mpc8xxx/Makefile 1 addition, 0 deletionsarch/powerpc/cpu/mpc8xxx/Makefile
- arch/powerpc/cpu/mpc8xxx/cpu.c 13 additions, 1 deletionarch/powerpc/cpu/mpc8xxx/cpu.c
- arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c 2 additions, 2 deletionsarch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c
- arch/powerpc/cpu/mpc8xxx/ddr/ddr.h 0 additions, 1 deletionarch/powerpc/cpu/mpc8xxx/ddr/ddr.h
- arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c 13 additions, 10 deletionsarch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
- arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c 20 additions, 23 deletionsarch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
- arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c 7 additions, 4 deletionsarch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
Loading
Please register or sign in to comment