Dear Michael Zaidman,
In message 630a18874b3365b814e6d28288770f2d9b437dfa.1273498052.git.michael.zaidman@gmail.com you wrote:
Combine previously submitted POST cleanup patch series into single patch. Fix plain POST support introduced recently for mpc812x arch.
Please remove this part from the commit message (or replace it by a better desccription).
- Revives POST for blackfin arch;
- Removes redundant code: arch/blackfin/lib/post.c board/ssv/common/post.c arch/powerpc/cpu/ppc4xx/commproc.c arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage;
Signed-off-by: Michael Zaidman michael.zaidman@gmail.com Acked-by: Detlev Zundel dzu@denx.de Tested-by: Anatolij Gustschin agust@denx.de
List of the maintainers of the affected by patch boards: Cc: Stephan Linz linz@li-pro.net Cc: Travis Sawyer travis.sawyer@sandburst.com Cc: Denis Peter d.peter@mpl.ch Cc: Matthias Fuchs matthias.fuchs@esd-electronics.com Cc: Peter Tyser ptyser@xes-inc.com Cc: Stefan Roese sr@denx.de Cc: Mike Frysinger vapier@gentoo.org Cc: Niklaus Giger niklaus.giger@netstal.com Cc: Larry Johnson lrj@acm.org Cc: Feng Kan fkan@amcc.com
arch/blackfin/lib/Makefile | 2 +- arch/blackfin/lib/board.c | 1 - arch/blackfin/lib/post.c | 421 ----------------------------------- arch/powerpc/cpu/mpc512x/Makefile | 1 - arch/powerpc/cpu/mpc512x/common.c | 25 -- arch/powerpc/cpu/mpc8260/commproc.c | 20 -- arch/powerpc/cpu/mpc85xx/commproc.c | 20 -- arch/powerpc/cpu/mpc8xx/commproc.c | 20 -- arch/powerpc/cpu/ppc4xx/Makefile | 1 - arch/powerpc/cpu/ppc4xx/commproc.c | 53 ----- board/barco/barco.c | 9 - board/bc3450/bc3450.c | 20 -- board/bf537-stamp/Makefile | 2 +- board/bf537-stamp/post.c | 14 -- board/cm5200/cm5200.c | 16 -- board/ssv/common/post.c | 44 ---- board/tqc/tqm5200/tqm5200.c | 19 -- board/xes/xpedite1000/xpedite1000.c | 16 -- include/common.h | 5 +- include/configs/ADNPESC1.h | 3 +- include/configs/KAREF.h | 3 +- include/configs/METROBOX.h | 3 +- include/configs/MIP405.h | 4 - include/configs/PMC440.h | 3 +- include/configs/TB5200.h | 2 +- include/configs/XPEDITE1000.h | 3 +- include/configs/alpr.h | 3 +- include/configs/barco.h | 2 + include/configs/bf537-stamp.h | 1 + include/configs/bfin_adi_common.h | 1 + include/configs/hcu4.h | 3 +- include/configs/hcu5.h | 5 +- include/configs/hmi1001.h | 6 +- include/configs/icon.h | 3 +- include/configs/inka4x0.h | 6 +- include/configs/katmai.h | 3 +- include/configs/kilauea.h | 3 +- include/configs/korat.h | 3 +- include/configs/lwmon5.h | 2 +- include/configs/makalu.h | 3 +- include/configs/mcu25.h | 3 +- include/configs/mpc5121-common.h | 3 +- include/configs/ocotea.h | 3 +- include/configs/redwood.h | 3 +- include/configs/sequoia.h | 3 +- include/configs/taishan.h | 3 +- include/configs/yucca.h | 3 +- include/configs/zeus.h | 7 +- include/post.h | 57 +++++- post/Makefile | 3 +- 50 files changed, 103 insertions(+), 759 deletions(-) delete mode 100644 arch/blackfin/lib/post.c delete mode 100644 arch/powerpc/cpu/mpc512x/common.c delete mode 100644 arch/powerpc/cpu/ppc4xx/commproc.c delete mode 100644 board/ssv/common/post.c
This doesn't apply any more:
Applying: POST cleanup. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... CONFLICT (rename/delete): Rename board/ssv/common/post.c->tools/gen_eth_addr.c in HEAD and deleted in POST cleanup. Removing arch/blackfin/lib/post.c Auto-merging arch/powerpc/cpu/mpc512x/Makefile Removing arch/powerpc/cpu/mpc512x/common.c Removing arch/powerpc/cpu/ppc4xx/commproc.c CONFLICT (delete/modify): include/configs/ADNPESC1.h deleted in HEAD and modified in POST cleanup.. Version POST cleanup. of include/configs/ADNPESC1.h left in tree. Auto-merging include/configs/icon.h Failed to merge in the changes. Patch failed at 0001 POST cleanup. When you have resolved this problem run "git am -i -3 --resolved". If you would prefer to skip this patch, instead run "git am -i -3 --skip". To restore the original branch and stop patching run "git am -i -3 --abort".
Please rebase against "next" branch and resubmit. Sorry for the inconvenience.
Best regards,
Wolfgang Denk