diff mbox

[U-Boot] mx28evk: Fix boot by adjusting HW_DRAM_CTL29 register

Message ID 1340126696-29673-1-git-send-email-fabio.estevam@freescale.com
State Accepted
Commit f69b0653acf5482a94fa1ec9542165914e30e50c
Headers show

Commit Message

Fabio Estevam June 19, 2012, 5:24 p.m. UTC
commit acc4959fc1 (Revert "i.MX28: Enable additional DRAM address bits")
broke mx28evk boot.

Fix it by properly adjusting the HW_DRAM_CTL29 register value.

Suggested-by: Marek Vasut <marex@denx.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 board/freescale/mx28evk/iomux.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

Comments

Marek Vasut June 19, 2012, 9:12 p.m. UTC | #1
Dear Fabio Estevam,

> commit acc4959fc1 (Revert "i.MX28: Enable additional DRAM address bits")
> broke mx28evk boot.
> 
> Fix it by properly adjusting the HW_DRAM_CTL29 register value.
> 
> Suggested-by: Marek Vasut <marex@denx.de>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  board/freescale/mx28evk/iomux.c |   14 ++++++++++++++
>  1 files changed, 14 insertions(+), 0 deletions(-)
> 
> diff --git a/board/freescale/mx28evk/iomux.c

Uh, why isn't this file called splboot.c?

But
Acked-by: Marek Vasut <marex@denx.de>

> b/board/freescale/mx28evk/iomux.c index 6587c45..1e60204 100644
> --- a/board/freescale/mx28evk/iomux.c
> +++ b/board/freescale/mx28evk/iomux.c
> @@ -161,6 +161,20 @@ const iomux_cfg_t iomux_setup[] = {
>  		(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),
>  };
> 
> +#define HW_DRAM_CTL29	(0x74 >> 2)
> +#define CS_MAP		0xf
> +#define COLUMN_SIZE	0x2
> +#define ADDR_PINS	0x1
> +#define APREBIT		0xa
> +
> +#define HW_DRAM_CTL29_CONFIG	(CS_MAP << 24 | COLUMN_SIZE << 16 | \
> +					ADDR_PINS << 8 | APREBIT)
> +
> +void mx28_adjust_memory_params(uint32_t *dram_vals)
> +{
> +	dram_vals[HW_DRAM_CTL29] = HW_DRAM_CTL29_CONFIG;
> +}
> +
>  void board_init_ll(void)
>  {
>  	mx28_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));

Best regards,
Marek Vasut
Fabio Estevam June 27, 2012, 1:17 p.m. UTC | #2
Hi Stefano,

On Tue, Jun 19, 2012 at 6:12 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Fabio Estevam,
>
>> commit acc4959fc1 (Revert "i.MX28: Enable additional DRAM address bits")
>> broke mx28evk boot.
>>
>> Fix it by properly adjusting the HW_DRAM_CTL29 register value.
>>
>> Suggested-by: Marek Vasut <marex@denx.de>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>> ---
>>  board/freescale/mx28evk/iomux.c |   14 ++++++++++++++
>>  1 files changed, 14 insertions(+), 0 deletions(-)
>>
>> diff --git a/board/freescale/mx28evk/iomux.c
>
> Uh, why isn't this file called splboot.c?
>
> But
> Acked-by: Marek Vasut <marex@denx.de>

Could this one be applied?

mx28evk does not boot without this patch.

Thanks,

Fabio Estevam
Stefano Babic July 2, 2012, 5:51 p.m. UTC | #3
On 19/06/2012 19:24, Fabio Estevam wrote:
> commit acc4959fc1 (Revert "i.MX28: Enable additional DRAM address bits")
> broke mx28evk boot.
> 
> Fix it by properly adjusting the HW_DRAM_CTL29 register value.
> 
> Suggested-by: Marek Vasut <marex@denx.de>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---


Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/board/freescale/mx28evk/iomux.c b/board/freescale/mx28evk/iomux.c
index 6587c45..1e60204 100644
--- a/board/freescale/mx28evk/iomux.c
+++ b/board/freescale/mx28evk/iomux.c
@@ -161,6 +161,20 @@  const iomux_cfg_t iomux_setup[] = {
 		(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),
 };
 
+#define HW_DRAM_CTL29	(0x74 >> 2)
+#define CS_MAP		0xf
+#define COLUMN_SIZE	0x2
+#define ADDR_PINS	0x1
+#define APREBIT		0xa
+
+#define HW_DRAM_CTL29_CONFIG	(CS_MAP << 24 | COLUMN_SIZE << 16 | \
+					ADDR_PINS << 8 | APREBIT)
+
+void mx28_adjust_memory_params(uint32_t *dram_vals)
+{
+	dram_vals[HW_DRAM_CTL29] = HW_DRAM_CTL29_CONFIG;
+}
+
 void board_init_ll(void)
 {
 	mx28_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));