Patchwork [U-Boot,v2] ARMV7: Vexpress: Add missing MMC header

login
register
mail settings
Submitter Dirk Behme
Date May 23, 2011, 5:40 p.m.
Message ID <1306172426-17837-1-git-send-email-dirk.behme@gmail.com>
Download mbox | patch
Permalink /patch/97018/
State Accepted
Commit a6f479cd85c8b8156dc2a865856617975eac18db
Delegated to: Albert ARIBAUD
Headers show

Comments

Dirk Behme - May 23, 2011, 5:40 p.m.
From: Dirk Behme <dirk.behme@googlemail.com>

Add a header file with the missing function prototype to fix

ca9x4_ct_vxp.c: In function 'cpu_mmc_init':
ca9x4_ct_vxp.c:93: warning: implicit declaration of function 'arm_pl180_mmci_init'

introduced by commit "ARMV7: Vexpress: Add MMC support"
(f0c64526b7e51ba997a0f1baf9e74e6d497b957e)

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
CC: Andy Fleming <afleming@freescale.com>
CC: Matt Waddel <matt.waddel@linaro.org>

---

Changes in v2: Switch angle braces to quotes.

Note: Maybe it would be better to move

int arm_pl180_mmci_init(void);

from drivers/mmc/arm_pl180_mmci.h to a header in the
include directory?

 board/armltd/vexpress/ca9x4_ct_vxp.c |    1 +
 1 file changed, 1 insertion(+)
Albert ARIBAUD - May 31, 2011, 6:18 p.m.
Le 23/05/2011 19:40, Dirk Behme a écrit :
> From: Dirk Behme<dirk.behme@googlemail.com>
>
> Add a header file with the missing function prototype to fix
>
> ca9x4_ct_vxp.c: In function 'cpu_mmc_init':
> ca9x4_ct_vxp.c:93: warning: implicit declaration of function 'arm_pl180_mmci_init'
>
> introduced by commit "ARMV7: Vexpress: Add MMC support"
> (f0c64526b7e51ba997a0f1baf9e74e6d497b957e)
>
> Signed-off-by: Dirk Behme<dirk.behme@googlemail.com>
> CC: Andy Fleming<afleming@freescale.com>
> CC: Matt Waddel<matt.waddel@linaro.org>
>
> ---
>
> Changes in v2: Switch angle braces to quotes.

Applied to u-boot-arm/next, thanks -- that will go in master at next 
merge window.

Amicalement,
Dirk Behme - May 31, 2011, 6:41 p.m.
On 31.05.2011 20:18, Albert ARIBAUD wrote:
> Le 23/05/2011 19:40, Dirk Behme a écrit :
>> From: Dirk Behme<dirk.behme@googlemail.com>
>>
>> Add a header file with the missing function prototype to fix
>>
>> ca9x4_ct_vxp.c: In function 'cpu_mmc_init':
>> ca9x4_ct_vxp.c:93: warning: implicit declaration of function
>> 'arm_pl180_mmci_init'
>>
>> introduced by commit "ARMV7: Vexpress: Add MMC support"
>> (f0c64526b7e51ba997a0f1baf9e74e6d497b957e)
>>
>> Signed-off-by: Dirk Behme<dirk.behme@googlemail.com>
>> CC: Andy Fleming<afleming@freescale.com>
>> CC: Matt Waddel<matt.waddel@linaro.org>
>>
>> ---
>>
>> Changes in v2: Switch angle braces to quotes.
>
> Applied to u-boot-arm/next, thanks -- that will go in master at next
> merge window.

Thanks!

Hmm, but why next? This would mean we release v2011.06 with the above 
warning? I thought that fixing warnings introduced while the merge 
window is one of the things a rc cycle is good for?

Best regards

Dirk
Albert ARIBAUD - May 31, 2011, 8:26 p.m.
Hi Dirk,

Le 31/05/2011 20:41, Dirk Behme a écrit :
> On 31.05.2011 20:18, Albert ARIBAUD wrote:
>> Le 23/05/2011 19:40, Dirk Behme a écrit :
>>> From: Dirk Behme<dirk.behme@googlemail.com>
>>>
>>> Add a header file with the missing function prototype to fix
>>>
>>> ca9x4_ct_vxp.c: In function 'cpu_mmc_init':
>>> ca9x4_ct_vxp.c:93: warning: implicit declaration of function
>>> 'arm_pl180_mmci_init'
>>>
>>> introduced by commit "ARMV7: Vexpress: Add MMC support"
>>> (f0c64526b7e51ba997a0f1baf9e74e6d497b957e)
>>>
>>> Signed-off-by: Dirk Behme<dirk.behme@googlemail.com>
>>> CC: Andy Fleming<afleming@freescale.com>
>>> CC: Matt Waddel<matt.waddel@linaro.org>
>>>
>>> ---
>>>
>>> Changes in v2: Switch angle braces to quotes.
>>
>> Applied to u-boot-arm/next, thanks -- that will go in master at next
>> merge window.
>
> Thanks!
>
> Hmm, but why next? This would mean we release v2011.06 with the above
> warning? I thought that fixing warnings introduced while the merge
> window is one of the things a rc cycle is good for?

Hmm, you're right, I overlooked the date of the commit that caused the 
warning. Moving from next to master, then, with my apologies.

> Best regards
>
> Dirk

Amicalement,

Patch

Index: u-boot.git/board/armltd/vexpress/ca9x4_ct_vxp.c
===================================================================
--- u-boot.git.orig/board/armltd/vexpress/ca9x4_ct_vxp.c
+++ u-boot.git/board/armltd/vexpress/ca9x4_ct_vxp.c
@@ -38,6 +38,7 @@ 
 #include <asm/arch/systimer.h>
 #include <asm/arch/sysctrl.h>
 #include <asm/arch/wdt.h>
+#include "../drivers/mmc/arm_pl180_mmci.h"
 
 static ulong timestamp;
 static ulong lastdec;