Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

U

u-boot-2015.04
- Activity
- Members

Snippets Groups Projects

504b5cd0

Commit 504b5cd0 authored 18 years ago by Jon Loeliger

Downloads
- Plain Diff

Merge branch 'mpc85xx'

Conflicts:

	drivers/tsec.c

parents afbdc649 8272dc2f

Branches

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

board/cds/common/ft_board.c 29 additions, 1 deletion

board/cds/common/ft_board.c
board/cds/mpc8548cds/mpc8548cds.c 32 additions, 0 deletions

board/cds/mpc8548cds/mpc8548cds.c
drivers/tsec.c 60 additions, 13 deletions

drivers/tsec.c
drivers/tsec.h 17 additions, 0 deletions

drivers/tsec.h
include/configs/MPC8540ADS.h 7 additions, 3 deletions

include/configs/MPC8540ADS.h
include/configs/MPC8541CDS.h 6 additions, 3 deletions

include/configs/MPC8541CDS.h
include/configs/MPC8548CDS.h 11 additions, 6 deletions

include/configs/MPC8548CDS.h
include/configs/MPC8555CDS.h 6 additions, 3 deletions

include/configs/MPC8555CDS.h

with 168 additions and 29 deletions

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