mpc83xx: Fix the fatal conflict of merge
PATCH 1/1 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.
--- cpu/mpc83xx/cpu_init.c | 7 +------ cpu/mpc83xx/speed.c | 10 +++++----- include/mpc83xx.h | 10 +++------- 3 files changed, 9 insertions(+), 18 deletions(-)
cpu/mpc83xx/cpu_init.c +1 -6
@@ -73,11 +73,6 @@ void cpu_init_f (volatile immap_t * im) (CFG_ACR_PIPE_DEP <<ACR_PIPE_DEP_SHIFT );#endif -#ifdef CFG_SPCR_TSECEP -/* eTSEC Emergency priority */ - im->sysconf.spcr = (im->sysconf.spcr & ~SPCR_TSECEP ) | (CFG_SPCR_TSECEP <<SPCR_TSECEP_SHIFT ); -#endif -#ifdef CFG_ACR_RPTCNT /* Arbiter repeat count */ im->arbiter.acr = (im->arbiter.acr & ~(ACR_RPTCNT)) |
@@ -85,7 +80,7 @@ void cpu_init_f (volatile immap_t * im)#endif #ifdef CFG_SPCR_TSECEP -/* all TSEC's Emergency priority */ +/* all eTSEC's Emergency priority */ im->sysconf.spcr = (im->sysconf.spcr & ~SPCR_TSECEP ) | (CFG_SPCR_TSECEP <<SPCR_TSECEP_SHIFT );#endif
cpu/mpc83xx/speed.c +5 -5
@@ -367,17 +367,17 @@ int get_clocks(void)#endif #if defined(CONFIG_MPC837X ) || defined(CONFIG_MPC8315 ) -switch ((sccr &SCCR_SATACM ) >>SCCR_SATACM_SHIFT ) { -case SCCR_SATACM_0 : +switch ((sccr &SCCR_SATA1CM ) >>SCCR_SATA1CM_SHIFT ) { +case 0 : sata_clk =0 ;break ; -case SCCR_SATACM_1 : +case 1 : sata_clk = csb_clk;break ; -case SCCR_SATACM_2 : +case 2 : sata_clk = csb_clk /2 ;break ; -case SCCR_SATACM_3 : +case 3 : sata_clk = csb_clk /3 ;break ;default :
include/mpc83xx.h +3 -7
@@ -725,6 +725,7 @@#define SCCR_USBCM_3 0x00F00000#elif defined(CONFIG_MPC8313 ) +/* TSEC1 bits are for TSEC2 as well */ #define SCCR_TSEC1CM 0xc0000000#define SCCR_TSEC1CM_SHIFT 30#define SCCR_TSEC1CM_0 0x00000000
@@ -732,13 +733,6 @@#define SCCR_TSEC1CM_2 0x80000000#define SCCR_TSEC1CM_3 0xC0000000 -#define SCCR_TSEC2CM 0x30000000 -#define SCCR_TSEC2CM_SHIFT 28 -#define SCCR_TSEC2CM_0 0x00000000 -#define SCCR_TSEC2CM_1 0x10000000 -#define SCCR_TSEC2CM_2 0x20000000 -#define SCCR_TSEC2CM_3 0x30000000 -#define SCCR_TSEC1ON 0x20000000#define SCCR_TSEC1ON_SHIFT 29#define SCCR_TSEC2ON 0x10000000
@@ -838,6 +832,8 @@#define SCCR_PCIEXP2CM_3 0x000c0000/* All of the four SATA controllers must have the same clock ratio */ +#define SCCR_SATA1CM 0x000000c0 +#define SCCR_SATA1CM_SHIFT 6#define SCCR_SATACM 0x000000ff#define SCCR_SATACM_SHIFT 0#define SCCR_SATACM_0 0x00000000
Signature · 1 line
1.5.3.5.643.g40e25
PATCH 1/1 mpc83xx: Fix the fatal conflict of merge
Quoted 2 lines
The commit
9e89647889cd4b5ada5b5e7cad6cbe55737a08d7will cause the mpc8315erdb board can't boot up.
Hi Wolfgang,
I don't know when the merge window will close today, Because the patch fix the fatal conflict, I wish it can be merged to main tree in this window.
If Kim can not take the patch to 83xx tree and request to you before the window close, could you apply it to main tree directly?
Thank you very much,
Dave
Kim Phillips
AppliedPATCH 1/1 mpc83xx: Fix the fatal conflict of merge
Quoted 12 lines · On Thu, 17 Jan 2008 18:35:52 +0800 Dave Liu <[email protected]> wrote:
Quoted 2 lines
The commit
9e89647889cd4b5ada5b5e7cad6cbe55737a08d7will cause the mpc8315erdb board can't boot up.Hi Wolfgang,
I don't know when the merge window will close today, Because the patch fix the fatal conflict, I wish it can be merged to main tree in this window.
If Kim can not take the patch to 83xx tree and request to you before the window close, could you apply it to main tree directly?
applied.
WD, if you care to wait I'm about to send YAPR (Yet Another Pull Request).
Kim