diff mbox

[U-Boot] powerpc, mpc5xx: fix compiler warning

Message ID 1422958219-28178-1-git-send-email-hs@denx.de
State Superseded
Headers show

Commit Message

Heiko Schocher Feb. 3, 2015, 10:10 a.m. UTC
executing "tools/buildman/buildman mpc5xx" drops this warning:

common/spl/spl_nor.c: In function 'spl_nor_load_image':
common/spl/spl_nor.c:26:10: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]

fix this.

Signed-off-by: Heiko Schocher <hs@denx.de>
---

 common/spl/spl_nor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Masahiro Yamada Feb. 3, 2015, 10:53 a.m. UTC | #1
Hi Heiko,


On Tue,  3 Feb 2015 11:10:19 +0100
Heiko Schocher <hs@denx.de> wrote:

> executing "tools/buildman/buildman mpc5xx" drops this warning:
> 
> common/spl/spl_nor.c: In function 'spl_nor_load_image':
> common/spl/spl_nor.c:26:10: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
> 
> fix this.
> 
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
> 
>  common/spl/spl_nor.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
> index 2c0e8e0..dcba2e0 100644
> --- a/common/spl/spl_nor.c
> +++ b/common/spl/spl_nor.c
> @@ -23,7 +23,7 @@ void spl_nor_load_image(void)
>  		 * Load Linux from its location in NOR flash to its defined
>  		 * location in SDRAM
>  		 */
> -		header = (const struct image_header *)CONFIG_SYS_OS_BASE;
> +		header = (struct image_header *)CONFIG_SYS_OS_BASE;
>  
>  		if (image_get_os(header) == IH_OS_LINUX) {
>  			/* happy - was a Linux */
> -- 
> 2.1.0



I think you are doing wrong to just suppress the warning.


Both image_get_os() and spl_parse_image_header() expect
"const struct image_header *" argument.

Add "const" to "struct image_header *header;"




Best Regards
Masahiro Yamada
Masahiro Yamada Feb. 3, 2015, 10:56 a.m. UTC | #2
Hi Heiko,



On Tue,  3 Feb 2015 11:10:19 +0100
Heiko Schocher <hs@denx.de> wrote:

> executing "tools/buildman/buildman mpc5xx" drops this warning:
> 
> common/spl/spl_nor.c: In function 'spl_nor_load_image':
> common/spl/spl_nor.c:26:10: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
> 
> fix this.
> 
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
> 
>  common/spl/spl_nor.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
> index 2c0e8e0..dcba2e0 100644
> --- a/common/spl/spl_nor.c
> +++ b/common/spl/spl_nor.c
> @@ -23,7 +23,7 @@ void spl_nor_load_image(void)
>  		 * Load Linux from its location in NOR flash to its defined
>  		 * location in SDRAM
>  		 */
> -		header = (const struct image_header *)CONFIG_SYS_OS_BASE;
> +		header = (struct image_header *)CONFIG_SYS_OS_BASE;
>  
>  		if (image_get_os(header) == IH_OS_LINUX) {
>  			/* happy - was a Linux */
> -- 
> 2.1.0



I forgot to mention this:

This patch is not related to "powerpc, mpc5xx:"
even though you found this when you were building mpc5xx boards.


Please change the prefix of the subject.



Best Regards
Masahiro Yamada
Heiko Schocher Feb. 3, 2015, 11:19 a.m. UTC | #3
Hello Masahiro,

Am 03.02.2015 11:53, schrieb Masahiro Yamada:
> Hi Heiko,
>
>
> On Tue,  3 Feb 2015 11:10:19 +0100
> Heiko Schocher <hs@denx.de> wrote:
>
>> executing "tools/buildman/buildman mpc5xx" drops this warning:
>>
>> common/spl/spl_nor.c: In function 'spl_nor_load_image':
>> common/spl/spl_nor.c:26:10: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
>>
>> fix this.
>>
>> Signed-off-by: Heiko Schocher <hs@denx.de>
>> ---
>>
>>   common/spl/spl_nor.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
>> index 2c0e8e0..dcba2e0 100644
>> --- a/common/spl/spl_nor.c
>> +++ b/common/spl/spl_nor.c
>> @@ -23,7 +23,7 @@ void spl_nor_load_image(void)
>>   		 * Load Linux from its location in NOR flash to its defined
>>   		 * location in SDRAM
>>   		 */
>> -		header = (const struct image_header *)CONFIG_SYS_OS_BASE;
>> +		header = (struct image_header *)CONFIG_SYS_OS_BASE;
>>
>>   		if (image_get_os(header) == IH_OS_LINUX) {
>>   			/* happy - was a Linux */
>> --
>> 2.1.0
>
>
>
> I think you are doing wrong to just suppress the warning.
>
>
> Both image_get_os() and spl_parse_image_header() expect
> "const struct image_header *" argument.
>
> Add "const" to "struct image_header *header;"

Yep, fixed, thanks!

waiting for more comments before posting v2

bye,
Heiko
>
>
>
>
> Best Regards
> Masahiro Yamada
>
>
Heiko Schocher Feb. 3, 2015, 11:21 a.m. UTC | #4
Hello Mashairo,

Am 03.02.2015 11:56, schrieb Masahiro Yamada:
> Hi Heiko,
>
>
>
> On Tue,  3 Feb 2015 11:10:19 +0100
> Heiko Schocher <hs@denx.de> wrote:
>
>> executing "tools/buildman/buildman mpc5xx" drops this warning:
>>
>> common/spl/spl_nor.c: In function 'spl_nor_load_image':
>> common/spl/spl_nor.c:26:10: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
>>
>> fix this.
>>
>> Signed-off-by: Heiko Schocher <hs@denx.de>
>> ---
>>
>>   common/spl/spl_nor.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
>> index 2c0e8e0..dcba2e0 100644
>> --- a/common/spl/spl_nor.c
>> +++ b/common/spl/spl_nor.c
>> @@ -23,7 +23,7 @@ void spl_nor_load_image(void)
>>   		 * Load Linux from its location in NOR flash to its defined
>>   		 * location in SDRAM
>>   		 */
>> -		header = (const struct image_header *)CONFIG_SYS_OS_BASE;
>> +		header = (struct image_header *)CONFIG_SYS_OS_BASE;
>>
>>   		if (image_get_os(header) == IH_OS_LINUX) {
>>   			/* happy - was a Linux */
>> --
>> 2.1.0
>
>
>
> I forgot to mention this:
>
> This patch is not related to "powerpc, mpc5xx:"
> even though you found this when you were building mpc5xx boards.

Yes ...

> Please change the prefix of the subject.

Ok ... what would be correct? "spl, nor" ?

bye,
Heiko
Masahiro Yamada Feb. 3, 2015, 11:39 a.m. UTC | #5
Hi Heiko,


On Tue, 03 Feb 2015 12:21:03 +0100
Heiko Schocher <hs@denx.de> wrote:

> Hello Mashairo,
> 
> Am 03.02.2015 11:56, schrieb Masahiro Yamada:
> > Hi Heiko,
> >
> >
> >
> > On Tue,  3 Feb 2015 11:10:19 +0100
> > Heiko Schocher <hs@denx.de> wrote:
> >
> >> executing "tools/buildman/buildman mpc5xx" drops this warning:
> >>
> >> common/spl/spl_nor.c: In function 'spl_nor_load_image':
> >> common/spl/spl_nor.c:26:10: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
> >>
> >> fix this.
> >>
> >> Signed-off-by: Heiko Schocher <hs@denx.de>
> >> ---
> >>
> >>   common/spl/spl_nor.c | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
> >> index 2c0e8e0..dcba2e0 100644
> >> --- a/common/spl/spl_nor.c
> >> +++ b/common/spl/spl_nor.c
> >> @@ -23,7 +23,7 @@ void spl_nor_load_image(void)
> >>   		 * Load Linux from its location in NOR flash to its defined
> >>   		 * location in SDRAM
> >>   		 */
> >> -		header = (const struct image_header *)CONFIG_SYS_OS_BASE;
> >> +		header = (struct image_header *)CONFIG_SYS_OS_BASE;
> >>
> >>   		if (image_get_os(header) == IH_OS_LINUX) {
> >>   			/* happy - was a Linux */
> >> --
> >> 2.1.0
> >
> >
> >
> > I forgot to mention this:
> >
> > This patch is not related to "powerpc, mpc5xx:"
> > even though you found this when you were building mpc5xx boards.
> 
> Yes ...
> 
> > Please change the prefix of the subject.
> 
> Ok ... what would be correct? "spl, nor" ?
> 


I have no idea.

I would run "git log common/spl"
to see which prefix is commonly used.



Best Regards
Masahiro Yamada
diff mbox

Patch

diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 2c0e8e0..dcba2e0 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -23,7 +23,7 @@  void spl_nor_load_image(void)
 		 * Load Linux from its location in NOR flash to its defined
 		 * location in SDRAM
 		 */
-		header = (const struct image_header *)CONFIG_SYS_OS_BASE;
+		header = (struct image_header *)CONFIG_SYS_OS_BASE;
 
 		if (image_get_os(header) == IH_OS_LINUX) {
 			/* happy - was a Linux */