Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
Conflicts:
common/cmd_bootm.c
cpu/mpc8xx/cpu.c
Signed-off-by: 
Bartlomiej Sieka <tur@semihalf.com>
Showing
- Makefile 3 additions, 1 deletionMakefile
- README 96 additions, 18 deletionsREADME
- board/cray/L1/L1.c 9 additions, 2 deletionsboard/cray/L1/L1.c
- board/esd/common/auto_update.c 52 additions, 40 deletionsboard/esd/common/auto_update.c
- board/mcc200/auto_update.c 52 additions, 38 deletionsboard/mcc200/auto_update.c
- board/mpl/common/common_util.c 23 additions, 23 deletionsboard/mpl/common/common_util.c
- board/pn62/cmd_pn62.c 9 additions, 2 deletionsboard/pn62/cmd_pn62.c
- board/siemens/common/fpga.c 27 additions, 21 deletionsboard/siemens/common/fpga.c
- board/trab/auto_update.c 65 additions, 49 deletionsboard/trab/auto_update.c
- common/Makefile 3 additions, 0 deletionscommon/Makefile
- common/cmd_autoscript.c 107 additions, 46 deletionscommon/cmd_autoscript.c
- common/cmd_bootm.c 725 additions, 1244 deletionscommon/cmd_bootm.c
- common/cmd_doc.c 31 additions, 7 deletionscommon/cmd_doc.c
- common/cmd_fdc.c 42 additions, 17 deletionscommon/cmd_fdc.c
- common/cmd_fpga.c 94 additions, 15 deletionscommon/cmd_fpga.c
- common/cmd_ide.c 40 additions, 18 deletionscommon/cmd_ide.c
- common/cmd_load.c 9 additions, 2 deletionscommon/cmd_load.c
- common/cmd_nand.c 65 additions, 15 deletionscommon/cmd_nand.c
- common/cmd_net.c 9 additions, 2 deletionscommon/cmd_net.c
- common/cmd_scsi.c 34 additions, 13 deletionscommon/cmd_scsi.c
Loading
Please register or sign in to comment