projects / project / bcm63xx / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0c0892b)
powerpc/8xxx: Fix merge issue with P2020DS DDR2 build config
authorKumar Gala <galak@kernel.crashing.org>
Wed, 10 Nov 2010 05:19:27 +0000 (23:19 -0600)
committerKumar Gala <galak@kernel.crashing.org>
Wed, 10 Nov 2010 14:07:26 +0000 (08:07 -0600)
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 patch | blob | history

diff --git a/boards.cfg b/boards.cfg
index 6c2a6672ff314816a27a6806a76ee0b122cadc8a..08e531e79a29b80dd6051e6ba53c149180d65d97 100644 (file)
--- 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
Broadcom-s U-Boot