]> git.ipfire.org Git - people/ms/u-boot.git/commit
projects / people / ms / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f188896) | patch
mpc83xx: Fix the fatal conflict of merge
authorDave Liu <r63238@freescale.com>
Thu, 17 Jan 2008 10:23:19 +0000 (18:23 +0800)
committerKim Phillips <kim.phillips@freescale.com>
Thu, 17 Jan 2008 17:01:52 +0000 (11:01 -0600)
commita8cb43a89be6cfd283257a603dd9841503ccce0f
tree3480bb902c877d92ce4eeeb1f9e5fd062cbc0adatree | snapshot
parentf188896c2f1594fe749fdb99bbc8c54023cfab3acommit | diff
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>
cpu/mpc83xx/cpu_init.c diff | blob | blame | history
cpu/mpc83xx/speed.c diff | blob | blame | history
include/mpc83xx.h diff | blob | blame | history
"Das U-Boot" Source Tree