| Message ID | 1322930775-4767-7-git-send-email-agust@denx.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | Tom Rini |
| Headers | show |
> Fix: > spl.c: In function 'jump_to_image_no_args': > spl.c:103: warning: assignment makes pointer from integer without a cast > spl.c:105: warning: dereferencing type-punned pointer will break > strict-aliasing rules > > Signed-off-by: Anatolij Gustschin <agust@denx.de> > Cc: sricharan <r.sricharan@ti.com> > Cc: Tom Rini <trini@ti.com> > --- > arch/arm/cpu/armv7/omap-common/spl.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/cpu/armv7/omap-common/spl.c > b/arch/arm/cpu/armv7/omap-common/spl.c index 25f04ed..9c35a09 100644 > --- a/arch/arm/cpu/armv7/omap-common/spl.c > +++ b/arch/arm/cpu/armv7/omap-common/spl.c > @@ -100,9 +100,10 @@ static void jump_to_image_no_args(void) > debug("image entry point: 0x%X\n", spl_image.entry_point); > /* Pass the saved boot_params from rom code */ > #if defined(CONFIG_VIRTIO) || defined(CONFIG_ZEBU) > - image_entry = 0x80100000; > + image_entry = (image_entry_noargs_t)0x80100000; > #endif > - image_entry((u32 *)&boot_params_ptr); > + u32 boot_params_ptr_addr = (u32)&boot_params_ptr; > + image_entry((u32 *)boot_params_ptr_addr); > } > > void jump_to_image_no_args(void) __attribute__ ((noreturn)); Acked-by: Marek Vasut <marek.vasut@gmail.com>
On 12/04/2011 04:28 AM, Marek Vasut wrote: >> Fix: >> spl.c: In function 'jump_to_image_no_args': >> spl.c:103: warning: assignment makes pointer from integer without a cast >> spl.c:105: warning: dereferencing type-punned pointer will break >> strict-aliasing rules >> >> Signed-off-by: Anatolij Gustschin <agust@denx.de> >> Cc: sricharan <r.sricharan@ti.com> >> Cc: Tom Rini <trini@ti.com> >> --- >> arch/arm/cpu/armv7/omap-common/spl.c | 5 +++-- >> 1 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm/cpu/armv7/omap-common/spl.c >> b/arch/arm/cpu/armv7/omap-common/spl.c index 25f04ed..9c35a09 100644 >> --- a/arch/arm/cpu/armv7/omap-common/spl.c >> +++ b/arch/arm/cpu/armv7/omap-common/spl.c >> @@ -100,9 +100,10 @@ static void jump_to_image_no_args(void) >> debug("image entry point: 0x%X\n", spl_image.entry_point); >> /* Pass the saved boot_params from rom code */ >> #if defined(CONFIG_VIRTIO) || defined(CONFIG_ZEBU) >> - image_entry = 0x80100000; >> + image_entry = (image_entry_noargs_t)0x80100000; >> #endif >> - image_entry((u32 *)&boot_params_ptr); >> + u32 boot_params_ptr_addr = (u32)&boot_params_ptr; >> + image_entry((u32 *)boot_params_ptr_addr); >> } >> >> void jump_to_image_no_args(void) __attribute__ ((noreturn)); > > Acked-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Tom Rini <trini@ti.com> And will be queued to u-boot-ti/master once the current pull request is dealt with.
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c index 25f04ed..9c35a09 100644 --- a/arch/arm/cpu/armv7/omap-common/spl.c +++ b/arch/arm/cpu/armv7/omap-common/spl.c @@ -100,9 +100,10 @@ static void jump_to_image_no_args(void) debug("image entry point: 0x%X\n", spl_image.entry_point); /* Pass the saved boot_params from rom code */ #if defined(CONFIG_VIRTIO) || defined(CONFIG_ZEBU) - image_entry = 0x80100000; + image_entry = (image_entry_noargs_t)0x80100000; #endif - image_entry((u32 *)&boot_params_ptr); + u32 boot_params_ptr_addr = (u32)&boot_params_ptr; + image_entry((u32 *)boot_params_ptr_addr); } void jump_to_image_no_args(void) __attribute__ ((noreturn));
Fix: spl.c: In function 'jump_to_image_no_args': spl.c:103: warning: assignment makes pointer from integer without a cast spl.c:105: warning: dereferencing type-punned pointer will break strict-aliasing rules Signed-off-by: Anatolij Gustschin <agust@denx.de> Cc: sricharan <r.sricharan@ti.com> Cc: Tom Rini <trini@ti.com> --- arch/arm/cpu/armv7/omap-common/spl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)