diff mbox

[U-Boot] powerpc/8xxx: Fix merge issue with P2020DS DDR2 build config

Message ID 1289398195-22701-1-git-send-email-galak@kernel.crashing.org
State Accepted
Commit 9147ce15c07a766c134b407a0bcdcb4955a1fa6f
Delegated to: Kumar Gala
Headers show

Commit Message

Kumar Gala Nov. 10, 2010, 2:09 p.m. UTC 
When P2020DS DDR2 was merged it was merged incorrectly and propogated to
boards.cfg.  Fix this by moving DDR2 config to be associated with
P2020DS and not P1_P2_RDB.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 boards.cfg |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Kumar Gala Nov. 11, 2010, 6:53 a.m. UTC | #1 
On Nov 10, 2010, at 8:09 AM, Kumar Gala wrote:

> When P2020DS DDR2 was merged it was merged incorrectly and propogated to
> boards.cfg.  Fix this by moving DDR2 config to be associated with
> P2020DS and not P1_P2_RDB.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> boards.cfg |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

applied to 85xx

- k
diff mbox

Patch

diff --git a/boards.cfg b/boards.cfg
index 6c2a667..08e531e 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -569,6 +569,7 @@  MPC8540EVAL	powerpc	mpc85xx		mpc8540eval	-		-	MPC8540EVAL:SYSCLK_66M
 MPC8540EVAL_33	powerpc	mpc85xx		mpc8540eval	-		-	MPC8540EVAL
 MPC8540EVAL_66	powerpc	mpc85xx		mpc8540eval	-		-	MPC8540EVAL:SYSCLK_66M
 P2020DS_36BIT	powerpc	mpc85xx		p2020ds		freescale	-	P2020DS:36BIT
+P2020DS_DDR2	powerpc	mpc85xx		p2020ds		freescale	-	P2020DS:DDR2
 MPC8536DS	powerpc	mpc85xx		mpc8536ds	freescale	-	MPC8536DS
 MPC8536DS_36BIT	powerpc	mpc85xx		mpc8536ds	freescale	-	MPC8536DS:36BIT
 MPC8536DS_NAND	powerpc	mpc85xx		mpc8536ds	freescale	-	MPC8536DS:NAND
@@ -589,7 +590,6 @@  P1020RDB_SDCARD	powerpc	mpc85xx		p1_p2_rdb	freescale	-	P1_P2_RDB:P1020RDB,SDCARD
 P2010RDB	powerpc	mpc85xx		p1_p2_rdb	freescale	-	P1_P2_RDB:P2010
 P2010RDB_NAND	powerpc	mpc85xx		p1_p2_rdb	freescale	-	P1_P2_RDB:P2010,NAND
 P2010RDB_SDCARD	powerpc	mpc85xx		p1_p2_rdb	freescale	-	P1_P2_RDB:P2010,SDCARD
-P2020DS_DDR2	powerpc	mpc85xx		p1_p2_rdb	freescale	-	P1_P2_RDB:P2020,DDR2
 P2020RDB	powerpc	mpc85xx		p1_p2_rdb	freescale	-	P1_P2_RDB:P2020
 P2020RDB_NAND	powerpc	mpc85xx		p1_p2_rdb	freescale	-	P1_P2_RDB:P2020,NAND
 P2020RDB_SDCARD	powerpc	mpc85xx		p1_p2_rdb	freescale	-	P1_P2_RDB:P2020,SDCARD