From: robertcnelson@gmail.com Date: Fri, 27 Jan 2012 07:09:42 +0000 (+0000) Subject: Beagleboard: Correct memory size on rev C4 X-Git-Tag: u-boot_fixes_v1~175 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=223b8aa42c0f4bf9b4a7a71c16d0f67b5faf5045;p=kernel%2Fu-boot.git Beagleboard: Correct memory size on rev C4 The logic for the rev C4 boards was missing one of the cases (variant with Micron NAND and 2x128MB). Signed-off-by: Robert Nelson --- diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 5c04b34..2cca6da 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -166,6 +166,13 @@ void get_board_mem_timings(u32 *mcfg, u32 *ctrla, u32 *ctrlb, u32 *rfr_ctrl, *ctrlb = NUMONYX_V_ACTIMB_165; *rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz; break; + } else if (pop_mfr == NAND_MFR_MICRON && pop_id == 0xba) { + /* Beagleboard Rev C4, 512MB Nand/256MB DDR*/ + *mcfg = MICRON_V_MCFG_165(128 << 20); + *ctrla = MICRON_V_ACTIMA_165; + *ctrlb = MICRON_V_ACTIMB_165; + *rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz; + break; } else if (pop_mfr == NAND_MFR_MICRON && pop_id == 0xbc) { /* Beagleboard Rev C5, 256MB DDR */ *mcfg = MICRON_V_MCFG_200(256 << 20);