Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

U

uboot-i9100
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

6d4511b2

Commit 6d4511b2 authored 11 years ago by Albert ARIBAUD

Downloads
- Plain Diff

Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'

Conflicts:
	arch/arm/include/asm/arch-zynq/hardware.h

The conflict above was trivial and solved during merge.

parents fb18fa95 2d83d33a

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/cpu/armv7/zynq/Makefile 1 addition, 0 deletions

arch/arm/cpu/armv7/zynq/Makefile
arch/arm/cpu/armv7/zynq/ddrc.c 50 additions, 0 deletions

arch/arm/cpu/armv7/zynq/ddrc.c
arch/arm/cpu/armv7/zynq/slcr.c 1 addition, 1 deletion

arch/arm/cpu/armv7/zynq/slcr.c
arch/arm/include/asm/arch-zynq/hardware.h 8 additions, 0 deletions

arch/arm/include/asm/arch-zynq/hardware.h
arch/arm/include/asm/arch-zynq/sys_proto.h 1 addition, 0 deletions

arch/arm/include/asm/arch-zynq/sys_proto.h
board/xilinx/zynq/board.c 19 additions, 0 deletions

board/xilinx/zynq/board.c

with 80 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment