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

The following changes since commit 74ac5facb988fc488a707db228b177ead63a6541: Wolfgang Denk (1): Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
are found in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git
Andy Fleming (2): Merge branch 'kumar' Merge branch 'denx'
Anton Vorontsov (2): MPC8568E-MDS: reset UCCs to use them reliably MPC8568E-MDS: set up QE pario for UART1
Joe Hamman (2): mpc85xx: Add support for SBC8548 (updated) mpc85xx: Add support for SBC8548 (updated)
Kumar Gala (3): Use FSL Book-E MMU macros from Linux Kernel Reworked FSL Book-E TLB macros to be more readable 85xx: Remove cache config from configs.h
Timur Tabi (1): 85xx: add ability to upload QE firmware
robert lazarski (2): mpc85xx: Add support for ATUM8548 (updated) mpc85xx: Add support for ATUM8548 (updated)
MAINTAINERS | 5 + MAKEALL | 2 + Makefile | 6 + board/atum8548/Makefile | 56 +++ board/atum8548/atum8548.c | 420 ++++++++++++++++++++++ board/atum8548/config.mk | 33 ++ board/atum8548/init.S | 235 +++++++++++++ board/atum8548/u-boot.lds | 147 ++++++++ board/freescale/mpc8540ads/init.S | 145 ++++----- board/freescale/mpc8541cds/init.S | 124 +++---- board/freescale/mpc8544ds/init.S | 117 +++---- board/freescale/mpc8548cds/init.S | 109 +++---- board/freescale/mpc8555cds/init.S | 124 +++---- board/freescale/mpc8560ads/init.S | 144 ++++----- board/freescale/mpc8568mds/bcsr.c | 21 ++ board/freescale/mpc8568mds/bcsr.h | 9 + board/freescale/mpc8568mds/init.S | 104 +++--- board/freescale/mpc8568mds/mpc8568mds.c | 10 + board/mpc8540eval/init.S | 132 ++++---- board/pm854/init.S | 124 +++---- board/pm856/init.S | 124 +++---- board/sbc8548/Makefile | 55 +++ board/sbc8548/config.mk | 32 ++ board/sbc8548/init.S | 241 +++++++++++++ board/sbc8548/sbc8548.c | 569 ++++++++++++++++++++++++++++++ board/sbc8548/u-boot.lds | 149 ++++++++ board/sbc8560/init.S | 94 +++--- board/stxgp3/init.S | 144 ++++----- board/stxssa/init.S | 110 +++---- board/tqm85xx/init.S | 124 +++---- common/fdt_support.c | 48 +++ cpu/mpc85xx/fdt.c | 1 + cpu/mpc85xx/spd_sdram.c | 23 +- cpu/mpc85xx/start.S | 9 +- doc/README.atum8548 | 29 ++ doc/README.sbc8548 | 27 ++ drivers/qe/qe.c | 219 ++++++++++++ drivers/qe/qe.h | 56 +++ include/asm-ppc/cache.h | 10 +- include/asm-ppc/immap_qe.h | 33 ++- include/asm-ppc/mmu.h | 113 ++++--- include/asm-ppc/processor.h | 4 + include/configs/ATUM8548.h | 465 +++++++++++++++++++++++++ include/configs/MPC8540ADS.h | 7 - include/configs/MPC8540EVAL.h | 7 - include/configs/MPC8541CDS.h | 7 - include/configs/MPC8544DS.h | 7 - include/configs/MPC8548CDS.h | 7 - include/configs/MPC8555CDS.h | 7 - include/configs/MPC8560ADS.h | 7 - include/configs/MPC8568MDS.h | 7 - include/configs/MPC8641HPCN.h | 7 - include/configs/PM854.h | 7 - include/configs/PM856.h | 7 - include/configs/SBC8540.h | 7 - include/configs/TQM85xx.h | 7 - include/configs/sbc8548.h | 576 +++++++++++++++++++++++++++++++ include/configs/sbc8560.h | 7 - include/configs/stxgp3.h | 7 - include/configs/stxssa.h | 7 - include/e500.h | 94 ----- include/fdt_support.h | 1 + 62 files changed, 4320 insertions(+), 1209 deletions(-) create mode 100644 board/atum8548/Makefile create mode 100644 board/atum8548/atum8548.c create mode 100644 board/atum8548/config.mk create mode 100644 board/atum8548/init.S create mode 100644 board/atum8548/u-boot.lds create mode 100644 board/sbc8548/Makefile create mode 100644 board/sbc8548/config.mk create mode 100644 board/sbc8548/init.S create mode 100644 board/sbc8548/sbc8548.c create mode 100644 board/sbc8548/u-boot.lds create mode 100644 doc/README.atum8548 create mode 100644 doc/README.sbc8548 create mode 100644 include/configs/ATUM8548.h create mode 100644 include/configs/sbc8548.h

Dear Andy,
in message Pine.LNX.4.61.0801091112540.1264@ld0175-tx32.am.freescale.net you wrote:
The following changes since commit 74ac5facb988fc488a707db228b177ead63a6541: Wolfgang Denk (1): Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
are found in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git
Andy Fleming (2): Merge branch 'kumar' Merge branch 'denx'
Anton Vorontsov (2): MPC8568E-MDS: reset UCCs to use them reliably MPC8568E-MDS: set up QE pario for UART1
Joe Hamman (2): mpc85xx: Add support for SBC8548 (updated) mpc85xx: Add support for SBC8548 (updated)
Kumar Gala (3): Use FSL Book-E MMU macros from Linux Kernel Reworked FSL Book-E TLB macros to be more readable 85xx: Remove cache config from configs.h
Timur Tabi (1): 85xx: add ability to upload QE firmware
robert lazarski (2): mpc85xx: Add support for ATUM8548 (updated) mpc85xx: Add support for ATUM8548 (updated)
Sorry, can you please rebase your repo against current U-Boot? I get a merge conflict for include/fdt_support.h ...
Auto-merged MAINTAINERS Auto-merged MAKEALL Auto-merged Makefile Auto-merged common/fdt_support.c Auto-merged include/fdt_support.h CONFLICT (content): Merge conflict in include/fdt_support.h Automatic merge failed; fix conflicts and then commit the result.
Best regards,
Wolfgang Denk

Wolfgang Denk wrote:
Dear Andy,
in message Pine.LNX.4.61.0801091112540.1264@ld0175-tx32.am.freescale.net you wrote:
The following changes since commit 74ac5facb988fc488a707db228b177ead63a6541: Wolfgang Denk (1): Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
[snip]
Sorry, can you please rebase your repo against current U-Boot? I get a merge conflict for include/fdt_support.h ...
Auto-merged MAINTAINERS Auto-merged MAKEALL Auto-merged Makefile Auto-merged common/fdt_support.c Auto-merged include/fdt_support.h CONFLICT (content): Merge conflict in include/fdt_support.h Automatic merge failed; fix conflicts and then commit the result.
This may be my fault if you are seeing the same thing as me. It looks like I goofed up git when I redid a patch to delete the erroneous embedded space (search for ^I ^I) in: + err = fdt_setprop(fdt, nodeoffset, + "linux,initrd-start", &tmp, sizeof(tmp));
The solution is to simply keep the line without the space, delete the other line and the git merge marker lines.
Sorry for gumming up the merge, gvb
participants (3)
-
Andy Fleming
-
gvb.uboot
-
Wolfgang Denk