Dave Liu a8cb43a89b mpc83xx: Fix the fatal conflict of merge ... The commit 9e89647889 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>		2008-01-17 11:01:52 -06:00
..
config.mk	Revert "Correct fixup relocation for mpc83xx"	2007-11-15 08:31:17 -07:00
cpu_init.c	mpc83xx: Fix the fatal conflict of merge	2008-01-17 11:01:52 -06:00
cpu.c	mpc83xx: convert to using do_fixup_*()	2008-01-08 09:56:42 -06:00
ecc.c	mpc83xx: Consolidate the ECC support of 83xx	2007-08-10 01:13:11 -05:00
fdt.c	mpc83xx: add "fsl, qe" compatible fixups	2008-01-10 20:52:47 -06:00
interrupts.c	cpu/m*: Remove obsolete references to CONFIG_COMMANDS	2007-07-09 19:06:00 -05:00
Makefile	mpc83xx: convert to using do_fixup_*()	2008-01-08 09:56:42 -06:00
pci.c	mpc83xx: convert to using do_fixup_*()	2008-01-08 09:56:42 -06:00
qe_io.c	mpc83xx: streamline the 83xx immr head file	2007-03-02 11:05:53 -06:00
spd_sdram.c	mpc83xx: Fix the bug of 266MHz data rate DDR	2008-01-10 21:24:11 -06:00
speed.c	mpc83xx: Fix the fatal conflict of merge	2008-01-17 11:01:52 -06:00
start.S	Fixed syntax error in function init_e300_core() of mpc83xx/start.S if	2008-01-12 00:43:59 +01:00
traps.c	cpu/m*: Remove obsolete references to CONFIG_COMMANDS	2007-07-09 19:06:00 -05:00
u-boot.lds	Fix linker scripts: add NOLOAD atribute to .bss/.sbss sections	2008-01-12 20:31:39 +01:00