[U-Boot-Users] Pull request: u-boot-ixp
Please pull u-boot-ixp
The following changes since commit 74ac5facb988fc488a707db228b177ead63a6541: Wolfgang Denk (1): Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
are available in the git repository at:
git://denx.de/git/u-boot-ixp.git master
Jean-Christophe PLAGNIOL-VILLARD (4): Add missing file in gitignore and comments IXP: Add full baud-rate support for ixp42x, ixp45x and ixp46x ARM: support board-specific ethernet PHY init Allow CONFIG_AUTO_COMPLETE and command history CONFIG_CMDLINE_EDITING at the sametime
Michael Schwingen (1): PATCH: load ixp42x NPE firmware from separate flash block, remove dead code
.gitignore | 32 ++++++++++++++++++++++++++++++-- common/main.c | 26 ++++++++++++++++++++++++-- cpu/ixp/npe/IxNpeDl.c | 2 ++ cpu/ixp/npe/IxNpeDlImageMgr.c | 12 ++++++++---- cpu/ixp/serial.c | 24 ++++++++++-------------- include/.gitignore | 1 + lib_arm/board.c | 4 ++++ 7 files changed, 79 insertions(+), 22 deletions(-)
Best Regards, J.
Dear Jean-Christophe,
in message 20080108212200.GD674@game.jcrosoft.org you wrote:
The following changes since commit 74ac5facb988fc488a707db228b177ead63a6541: Wolfgang Denk (1): Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
are available in the git repository at:
git://denx.de/git/u-boot-ixp.git master
Sorry, but I just had to reject some of the patches you merged.
I apologize for not catching this earlier.
Jean-Christophe PLAGNIOL-VILLARD (4): Add missing file in gitignore and comments IXP: Add full baud-rate support for ixp42x, ixp45x and ixp46x ARM: support board-specific ethernet PHY init Allow CONFIG_AUTO_COMPLETE and command history CONFIG_CMDLINE_EDITING at the sametime
I merged those.
Michael Schwingen (1): PATCH: load ixp42x NPE firmware from separate flash block, remove dead code
This was the one I skipped, as it *adds* dead code (in "#if 0" / "#endif" constructs) instead of removing it as the subject promises.
Best regards,
Wolfgang Denk
On 11:56 Wed 09 Jan , Wolfgang Denk wrote:
Dear Jean-Christophe,
in message 20080108212200.GD674@game.jcrosoft.org you wrote:
The following changes since commit 74ac5facb988fc488a707db228b177ead63a6541: Wolfgang Denk (1): Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
are available in the git repository at:
git://denx.de/git/u-boot-ixp.git master
Sorry, but I just had to reject some of the patches you merged.
I apologize for not catching this earlier.
Jean-Christophe PLAGNIOL-VILLARD (4): Add missing file in gitignore and comments IXP: Add full baud-rate support for ixp42x, ixp45x and ixp46x ARM: support board-specific ethernet PHY init Allow CONFIG_AUTO_COMPLETE and command history CONFIG_CMDLINE_EDITING at the sametime
I merged those.
Michael Schwingen (1): PATCH: load ixp42x NPE firmware from separate flash block, remove dead code
This was the one I skipped, as it *adds* dead code (in "#if 0" / "#endif" constructs) instead of removing it as the subject promises.
I will fix this and add an other patch to allow to load the NPE firmware from flash and ram
Best Regards, J.
The following changes since commit f188896c2f1594fe749fdb99bbc8c54023cfab3a: Wolfgang Denk (1): Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
are available in the git repository at:
git://www.denx.de/git/u-boot-ixp.git master
Jean-Christophe PLAGNIOL-VILLARD (2): IXP: add dynamic microcode addr ARM: remove useless function board_post_init
Michael Schwingen (7): load ixp42x NPE firmware from separate flash block, remove dead code IXP: enable RTS add AcTux-1 board support add AcTux-2 board support add AcTux-3 board support add AcTux-4 board support Add AcTux board support
MAINTAINERS | 7 + MAKEALL | 4 + Makefile | 12 + README | 3 + board/actux1/Makefile | 50 + board/actux1/actux1.c | 161 +++ board/actux1/actux1_hw.h | 57 + board/actux1/config.mk | 4 + board/actux1/u-boot.lds | 69 + board/actux2/Makefile | 50 + board/actux2/actux2.c | 134 ++ board/actux2/actux2_hw.h | 59 + board/actux2/config.mk | 4 + board/actux2/u-boot.lds | 74 + board/actux3/Makefile | 50 + board/actux3/actux3.c | 165 +++ board/actux3/actux3_hw.h | 60 + board/actux3/config.mk | 4 + board/actux3/u-boot.lds | 74 + board/actux4/Makefile | 50 + board/actux4/actux4.c | 132 ++ board/actux4/actux4_hw.h | 49 + board/actux4/config.mk | 4 + board/actux4/u-boot.lds | 65 + board/ixdp425/ixdp425.c | 5 - board/prodrive/pdnb3/pdnb3.c | 5 - board/xm250/xm250.c | 8 - cpu/ixp/npe/IxNpeDl.c | 32 - cpu/ixp/npe/IxNpeDlImageMgr.c | 37 +- cpu/ixp/npe/Makefile | 4 +- cpu/ixp/serial.c | 6 +- include/asm-arm/mach-types.h | 3121 ++++++++++++++++++++++++++++++++++++++++- include/configs/actux1.h | 247 ++++ include/configs/actux2.h | 224 +++ include/configs/actux3.h | 224 +++ include/configs/actux4.h | 218 +++ 36 files changed, 5362 insertions(+), 110 deletions(-) create mode 100644 board/actux1/Makefile create mode 100644 board/actux1/actux1.c create mode 100644 board/actux1/actux1_hw.h create mode 100644 board/actux1/config.mk create mode 100644 board/actux1/u-boot.lds create mode 100644 board/actux2/Makefile create mode 100644 board/actux2/actux2.c create mode 100644 board/actux2/actux2_hw.h create mode 100644 board/actux2/config.mk create mode 100644 board/actux2/u-boot.lds create mode 100644 board/actux3/Makefile create mode 100644 board/actux3/actux3.c create mode 100644 board/actux3/actux3_hw.h create mode 100644 board/actux3/config.mk create mode 100644 board/actux3/u-boot.lds create mode 100644 board/actux4/Makefile create mode 100644 board/actux4/actux4.c create mode 100644 board/actux4/actux4_hw.h create mode 100644 board/actux4/config.mk create mode 100644 board/actux4/u-boot.lds create mode 100644 include/configs/actux1.h create mode 100644 include/configs/actux2.h create mode 100644 include/configs/actux3.h create mode 100644 include/configs/actux4.h
Best Regards, J.
participants (2)
-
Jean-Christophe PLAGNIOL-VILLARD -
Wolfgang Denk