Patchwork [U-Boot,11/24,V2] ppc4xx: Fix build problems of IBM DDR2 NAND booting targets

login
register
mail settings
Submitter Wolfgang Denk
Date Nov. 25, 2010, 4 p.m.
Message ID <1290700844-31427-12-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/73086/
State Accepted
Commit c56f84ca9c86d7b9ac4a79ce6c9569aa8b851833
Headers show

Comments

Wolfgang Denk - Nov. 25, 2010, 4 p.m.
From: Stefan Roese <sr@denx.de>

This change is needed to compile the PPC4xx NAND booting targets
equipped with the IBM DDR2 SDRAM controller.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
---
Stefan, if it's OK with you I will pull this directly.

 board/amcc/canyonlands/canyonlands.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
Stefan Roese - Nov. 25, 2010, 4:15 p.m.
Hi Wolfgang,

On Thursday 25 November 2010 17:00:31 Wolfgang Denk wrote:
> From: Stefan Roese <sr@denx.de>
> 
> This change is needed to compile the PPC4xx NAND booting targets
> equipped with the IBM DDR2 SDRAM controller.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
> Stefan, if it's OK with you I will pull this directly.

Yes, please do. And for the other ppc4xx specific ones too.

For all patches in this series:

Acked-by: Stefan Roese <sr@denx.de>

Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de

Patch

diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c
index faa3720..80e2739 100644
--- a/board/amcc/canyonlands/canyonlands.c
+++ b/board/amcc/canyonlands/canyonlands.c
@@ -363,18 +363,6 @@  int checkboard(void)
 }
 #endif	/* !defined(CONFIG_ARCHES) */
 
-#if defined(CONFIG_NAND_U_BOOT)
-/*
- * NAND booting U-Boot version uses a fixed initialization, since the whole
- * I2C SPD DIMM autodetection/calibration doesn't fit into the 4k of boot
- * code.
- */
-phys_size_t initdram(int board_type)
-{
-	return CONFIG_SYS_MBYTES_SDRAM << 20;
-}
-#endif
-
 #if defined(CONFIG_PCI)
 int board_pcie_first(void)
 {