Searched hist:a8cb43a89be6cfd283257a603dd9841503ccce0f (Results 1 – 1 of 1) sorted by relevance
| /rk3399_rockchip-uboot/include/ |
| H A D | mpc83xx.h | a8cb43a89be6cfd283257a603dd9841503ccce0f Thu Jan 17 10:23:19 UTC 2008 Dave Liu <r63238@freescale.com> mpc83xx: Fix the fatal conflict of merge
The commit 9e89647889cd4b5ada5b5e7cad6cbe55737a08d7
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: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
|