Merge branch 'master' of git://git.denx.de/u-boot-marvell
Conflicts:
include/configs/km_arm.h
Signed-off-by:
Wolfgang Denk <wd@denx.de>
No related branches found
No related tags found
Showing
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/cpu/arm926ejs/kirkwood/dram.c 10 additions, 0 deletionsarch/arm/cpu/arm926ejs/kirkwood/dram.c
- board/Marvell/guruplug/config.mk 0 additions, 27 deletionsboard/Marvell/guruplug/config.mk
- board/Marvell/guruplug/guruplug.c 5 additions, 1 deletionboard/Marvell/guruplug/guruplug.c
- board/Marvell/mv88f6281gtw_ge/config.mk 0 additions, 28 deletionsboard/Marvell/mv88f6281gtw_ge/config.mk
- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c 5 additions, 1 deletionboard/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
- board/Marvell/openrd_base/config.mk 0 additions, 33 deletionsboard/Marvell/openrd_base/config.mk
- board/Marvell/openrd_base/openrd_base.c 5 additions, 1 deletionboard/Marvell/openrd_base/openrd_base.c
- board/Marvell/rd6281a/config.mk 0 additions, 28 deletionsboard/Marvell/rd6281a/config.mk
- board/Marvell/rd6281a/rd6281a.c 5 additions, 1 deletionboard/Marvell/rd6281a/rd6281a.c
- board/Marvell/sheevaplug/config.mk 0 additions, 28 deletionsboard/Marvell/sheevaplug/config.mk
- board/Marvell/sheevaplug/sheevaplug.c 5 additions, 1 deletionboard/Marvell/sheevaplug/sheevaplug.c
- board/keymile/km_arm/config.mk 0 additions, 28 deletionsboard/keymile/km_arm/config.mk
- board/keymile/km_arm/km_arm.c 15 additions, 9 deletionsboard/keymile/km_arm/km_arm.c
- include/configs/guruplug.h 2 additions, 2 deletionsinclude/configs/guruplug.h
- include/configs/keymile-common.h 16 additions, 0 deletionsinclude/configs/keymile-common.h
- include/configs/km_arm.h 4 additions, 2 deletionsinclude/configs/km_arm.h
- include/configs/mv-common.h 17 additions, 0 deletionsinclude/configs/mv-common.h
Loading
Please register or sign in to comment