[U-Boot] [PATCH 3/3] mxs: Rename 'mx28_dram_init' to 'mxs_dram_init'

Stefano Babic sbabic at denx.de
Fri Aug 24 09:57:15 CEST 2012


On 24/08/2012 01:06, Otavio Salvador wrote:
> Ping?
> 

Hi Otavio,

Marek has already acked it, we get the ACK from Veli-Pekkola this
morning. I have put the series in my "ready to be merged" queue. It will
be merged soon.

Regards,
Stefano

> On Sun, Aug 19, 2012 at 12:07 PM, Marek Vasut <marek.vasut at gmail.com> wrote:
>> Dear Otavio Salvador,
>>
>>> The DRAM initialization, after SPL has complete, is exactly the same
>>> for all mxs SoCs so we should name it accordinly.
>>
>> Acked-by: Marek Vasut <marex at denx.de>
>>
>>> The following boards has been changed:
>>>
>>>  * apx4devkit
>>>  * m28evk
>>>  * mx28evk
>>>  * sc_sps_1
>>>
>>> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
>>> ---
>>>  arch/arm/cpu/arm926ejs/mxs/mxs.c          |    4 ++--
>>>  arch/arm/include/asm/arch-mxs/sys_proto.h |    2 +-
>>>  board/bluegiga/apx4devkit/apx4devkit.c    |    2 +-
>>>  board/denx/m28evk/m28evk.c                |    2 +-
>>>  board/freescale/mx28evk/mx28evk.c         |    2 +-
>>>  board/schulercontrol/sc_sps_1/sc_sps_1.c  |    2 +-
>>>  6 files changed, 7 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c
>>> b/arch/arm/cpu/arm926ejs/mxs/mxs.c index a1769fd..c8cda6a 100644
>>> --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
>>> +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
>>> @@ -320,13 +320,13 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char
>>> *mac) }
>>>  #endif
>>>
>>> -int mx28_dram_init(void)
>>> +int mxs_dram_init(void)
>>>  {
>>>       struct mxs_spl_data *data = (struct mxs_spl_data *)
>>>               ((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf);
>>>
>>>       if (data->mem_dram_size == 0) {
>>> -             printf("MX28:\n"
>>> +             printf("MXS:\n"
>>>                       "Error, the RAM size passed up from SPL is 0!\n");
>>>               hang();
>>>       }
>>> diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h
>>> b/arch/arm/include/asm/arch-mxs/sys_proto.h index 9e4a4c9..fc84808 100644
>>> --- a/arch/arm/include/asm/arch-mxs/sys_proto.h
>>> +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
>>> @@ -69,6 +69,6 @@ struct mxs_spl_data {
>>>       uint32_t        mem_dram_size;
>>>  };
>>>
>>> -int mx28_dram_init(void);
>>> +int mxs_dram_init(void);
>>>
>>>  #endif       /* __SYS_PROTO_H__ */
>>> diff --git a/board/bluegiga/apx4devkit/apx4devkit.c
>>> b/board/bluegiga/apx4devkit/apx4devkit.c index 5a1042e..ae48ab5 100644
>>> --- a/board/bluegiga/apx4devkit/apx4devkit.c
>>> +++ b/board/bluegiga/apx4devkit/apx4devkit.c
>>> @@ -55,7 +55,7 @@ int board_early_init_f(void)
>>>
>>>  int dram_init(void)
>>>  {
>>> -     return mx28_dram_init();
>>> +     return mxs_dram_init();
>>>  }
>>>
>>>  int board_init(void)
>>> diff --git a/board/denx/m28evk/m28evk.c b/board/denx/m28evk/m28evk.c
>>> index 74da3ea..9473d10 100644
>>> --- a/board/denx/m28evk/m28evk.c
>>> +++ b/board/denx/m28evk/m28evk.c
>>> @@ -72,7 +72,7 @@ int board_init(void)
>>>
>>>  int dram_init(void)
>>>  {
>>> -     return mx28_dram_init();
>>> +     return mxs_dram_init();
>>>  }
>>>
>>>  #ifdef       CONFIG_CMD_MMC
>>> diff --git a/board/freescale/mx28evk/mx28evk.c
>>> b/board/freescale/mx28evk/mx28evk.c index 1320277..867d3c8 100644
>>> --- a/board/freescale/mx28evk/mx28evk.c
>>> +++ b/board/freescale/mx28evk/mx28evk.c
>>> @@ -64,7 +64,7 @@ int board_early_init_f(void)
>>>
>>>  int dram_init(void)
>>>  {
>>> -     return mx28_dram_init();
>>> +     return mxs_dram_init();
>>>  }
>>>
>>>  int board_init(void)
>>> diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c
>>> b/board/schulercontrol/sc_sps_1/sc_sps_1.c index 5f58e0b..fda191a 100644
>>> --- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
>>> +++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
>>> @@ -72,7 +72,7 @@ int board_init(void)
>>>
>>>  int dram_init(void)
>>>  {
>>> -     return mx28_dram_init();
>>> +     return mxs_dram_init();
>>>  }
>>>
>>>  #ifdef       CONFIG_CMD_MMC
> 
> 
> 


-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================


More information about the U-Boot mailing list