Skip to content
Snippets Groups Projects
Commit a8cb43a8 authored by Dave Liu's avatar Dave Liu Committed by Kim Phillips
Browse files

mpc83xx: Fix the fatal conflict of merge


The commit 9e896478
will cause the mpc8315erdb board can't boot up.

The patch fix that bug, and remove the duplicated #ifdef
CFG_SPCR_TSECEP code and clean the SCCR_TSEC2 for
MPC8313E processor.

Signed-off-by: default avatarDave Liu <daveliu@freescale.com>
Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
parent f188896c
No related branches found
No related tags found
No related merge requests found
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 to comment