* [U-Boot] [PATCH 1/3] i2c: eliminate warnings in i2c_reloc_fixup function
2013-10-16 4:53 [U-Boot] [PATCH 0/3] All M68K boards are broken Masahiro Yamada
@ 2013-10-16 4:53 ` Masahiro Yamada
2013-10-17 6:27 ` [U-Boot] [U-Boot, " Heiko Schocher
2013-10-16 4:53 ` [U-Boot] [PATCH 2/3] m68k: eliminate warnings in do_bootm_linux function Masahiro Yamada
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Masahiro Yamada @ 2013-10-16 4:53 UTC (permalink / raw)
To: u-boot
The prototype of handlers had changed.
This commit uses cast with (void *) rather than
the handler-specific prototype.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
Note:
The body of i2c_reloc_fixup function is surrounded by
#if defined(CONFIG_NEEDS_MANUAL_RELOC) ... #endif
avr32, m68k, nds32, sparc defines this macro.
drivers/i2c/i2c_core.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index d1072e8..b853ac2 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -60,25 +60,23 @@ void i2c_reloc_fixup(void)
/* i2c_init() */
addr = (unsigned long)i2c_adap_p->init;
addr += gd->reloc_off;
- i2c_adap_p->init = (void (*)(int, int))addr;
+ i2c_adap_p->init = (void *)addr;
/* i2c_probe() */
addr = (unsigned long)i2c_adap_p->probe;
addr += gd->reloc_off;
- i2c_adap_p->probe = (int (*)(uint8_t))addr;
+ i2c_adap_p->probe = (void *)addr;
/* i2c_read() */
addr = (unsigned long)i2c_adap_p->read;
addr += gd->reloc_off;
- i2c_adap_p->read = (int (*)(uint8_t, uint, int, uint8_t *,
- int))addr;
+ i2c_adap_p->read = (void *)addr;
/* i2c_write() */
addr = (unsigned long)i2c_adap_p->write;
addr += gd->reloc_off;
- i2c_adap_p->write = (int (*)(uint8_t, uint, int, uint8_t *,
- int))addr;
+ i2c_adap_p->write = (void *)addr;
/* i2c_set_bus_speed() */
addr = (unsigned long)i2c_adap_p->set_bus_speed;
addr += gd->reloc_off;
- i2c_adap_p->set_bus_speed = (uint (*)(uint))addr;
+ i2c_adap_p->set_bus_speed = (void *)addr;
/* name */
addr = (unsigned long)i2c_adap_p->name;
addr += gd->reloc_off;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [U-Boot, 1/3] i2c: eliminate warnings in i2c_reloc_fixup function
2013-10-16 4:53 ` [U-Boot] [PATCH 1/3] i2c: eliminate warnings in i2c_reloc_fixup function Masahiro Yamada
@ 2013-10-17 6:27 ` Heiko Schocher
0 siblings, 0 replies; 10+ messages in thread
From: Heiko Schocher @ 2013-10-17 6:27 UTC (permalink / raw)
To: u-boot
Hello Masahiro,
Am 16.10.2013 06:53, schrieb Masahiro Yamada:
> The prototype of handlers had changed.
> This commit uses cast with (void *) rather than
> the handler-specific prototype.
>
> Signed-off-by: Masahiro Yamada<yamada.m@jp.panasonic.com>
>
> ---
> Note:
> The body of i2c_reloc_fixup function is surrounded by
> #if defined(CONFIG_NEEDS_MANUAL_RELOC) ... #endif
>
> avr32, m68k, nds32, sparc defines this macro.
>
>
> drivers/i2c/i2c_core.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
Applied to u-boot-i2c.git
Thanks!
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 2/3] m68k: eliminate warnings in do_bootm_linux function
2013-10-16 4:53 [U-Boot] [PATCH 0/3] All M68K boards are broken Masahiro Yamada
2013-10-16 4:53 ` [U-Boot] [PATCH 1/3] i2c: eliminate warnings in i2c_reloc_fixup function Masahiro Yamada
@ 2013-10-16 4:53 ` Masahiro Yamada
2013-10-16 4:53 ` [U-Boot] [PATCH 3/3] m68k: eliminate a warning in cpu_init Masahiro Yamada
2013-10-16 7:41 ` [U-Boot] [PATCH 0/3] All M68K boards are broken Albert ARIBAUD
3 siblings, 0 replies; 10+ messages in thread
From: Masahiro Yamada @ 2013-10-16 4:53 UTC (permalink / raw)
To: u-boot
- delete an unused variable
- set forcibly some variables to zero
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
*** CAUTION ***
I do not think I am doing right thing.
(I post this patch just to raise the flag.)
Experts of M68K architecture, please fix this correctly.
arch/m68k/lib/bootm.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 804e01d..e71f593 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -50,7 +50,6 @@ void arch_lmb_reserve(struct lmb *lmb)
int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images)
{
- ulong rd_len;
ulong initrd_start, initrd_end;
int ret;
@@ -87,6 +86,12 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
bootstage_mark(BOOTSTAGE_ID_RUN_OS);
+ /* Workaround to eliminate warnings: FIX ME */
+ initrd_start = 0;
+ initrd_end = 0;
+ cmd_start = 0;
+ cmd_end = 0;
+
/*
* Linux Kernel Parameters (passing board info data):
* sp+00: Ignore, side effect of using jsr to jump to kernel
--
1.8.1.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 3/3] m68k: eliminate a warning in cpu_init
2013-10-16 4:53 [U-Boot] [PATCH 0/3] All M68K boards are broken Masahiro Yamada
2013-10-16 4:53 ` [U-Boot] [PATCH 1/3] i2c: eliminate warnings in i2c_reloc_fixup function Masahiro Yamada
2013-10-16 4:53 ` [U-Boot] [PATCH 2/3] m68k: eliminate warnings in do_bootm_linux function Masahiro Yamada
@ 2013-10-16 4:53 ` Masahiro Yamada
2014-06-19 15:19 ` [U-Boot] [U-Boot,3/3] " Tom Rini
2013-10-16 7:41 ` [U-Boot] [PATCH 0/3] All M68K boards are broken Albert ARIBAUD
3 siblings, 1 reply; 10+ messages in thread
From: Masahiro Yamada @ 2013-10-16 4:53 UTC (permalink / raw)
To: u-boot
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
arch/m68k/cpu/mcf5445x/cpu_init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c
index 9c324dc..b4a8eef 100644
--- a/arch/m68k/cpu/mcf5445x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5445x/cpu_init.c
@@ -364,9 +364,9 @@ void uart_port_conf(int port)
int fecpin_setclear(struct eth_device *dev, int setclear)
{
gpio_t *gpio = (gpio_t *) MMAP_GPIO;
+#ifdef CONFIG_MCF5445x
struct fec_info_s *info = (struct fec_info_s *)dev->priv;
-#ifdef CONFIG_MCF5445x
if (setclear) {
#ifdef CONFIG_SYS_FEC_NO_SHARED_PHY
if (info->iobase == CONFIG_SYS_FEC0_IOBASE)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 0/3] All M68K boards are broken
2013-10-16 4:53 [U-Boot] [PATCH 0/3] All M68K boards are broken Masahiro Yamada
` (2 preceding siblings ...)
2013-10-16 4:53 ` [U-Boot] [PATCH 3/3] m68k: eliminate a warning in cpu_init Masahiro Yamada
@ 2013-10-16 7:41 ` Albert ARIBAUD
2013-10-16 8:20 ` Masahiro Yamada
3 siblings, 1 reply; 10+ messages in thread
From: Albert ARIBAUD @ 2013-10-16 7:41 UTC (permalink / raw)
To: u-boot
Hi Masahiro,
On Wed, 16 Oct 2013 13:53:01 +0900, Masahiro Yamada
<yamada.m@jp.panasonic.com> wrote:
> Hello.
>
> Even after applying the patch
> "config.mk: fix -fstack-usage support test"
> (http://patchwork.ozlabs.org/patch/283619/),
> I still cannot compile m68k correctly.
Patch 283691 has not been applied and won't be since it breaks builds;
therefore, to fix this, rather than submitting this new patch, please
provide a new and fixed version (v5) of the existing one.
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 0/3] All M68K boards are broken
2013-10-16 7:41 ` [U-Boot] [PATCH 0/3] All M68K boards are broken Albert ARIBAUD
@ 2013-10-16 8:20 ` Masahiro Yamada
2013-10-16 8:43 ` Albert ARIBAUD
0 siblings, 1 reply; 10+ messages in thread
From: Masahiro Yamada @ 2013-10-16 8:20 UTC (permalink / raw)
To: u-boot
Hello Albert.
> > Even after applying the patch
> > "config.mk: fix -fstack-usage support test"
> > (http://patchwork.ozlabs.org/patch/283619/),
> > I still cannot compile m68k correctly.
>
> Patch 283691 has not been applied and won't be since it breaks builds;
> therefore, to fix this, rather than submitting this new patch, please
> provide a new and fixed version (v5) of the existing one.
Sorry, I could not understand what you mean.
I think Patch 283691 does not break builds,
but fixes -fstack-usage related warnings
on Blackfin, M68K, etc.
What I mean is:
Patch 283619 makes it better,
but we still have lots of other errors/warnings.
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 0/3] All M68K boards are broken
2013-10-16 8:20 ` Masahiro Yamada
@ 2013-10-16 8:43 ` Albert ARIBAUD
2013-10-16 9:14 ` Masahiro Yamada
0 siblings, 1 reply; 10+ messages in thread
From: Albert ARIBAUD @ 2013-10-16 8:43 UTC (permalink / raw)
To: u-boot
Hi Masahiro,
On Wed, 16 Oct 2013 17:20:27 +0900, Masahiro Yamada
<yamada.m@jp.panasonic.com> wrote:
> Hello Albert.
>
>
> > > Even after applying the patch
> > > "config.mk: fix -fstack-usage support test"
> > > (http://patchwork.ozlabs.org/patch/283619/),
> > > I still cannot compile m68k correctly.
> >
> > Patch 283691 has not been applied and won't be since it breaks builds;
> > therefore, to fix this, rather than submitting this new patch, please
> > provide a new and fixed version (v5) of the existing one.
>
> Sorry, I could not understand what you mean.
>
> I think Patch 283691 does not break builds,
> but fixes -fstack-usage related warnings
> on Blackfin, M68K, etc.
>
> What I mean is:
> Patch 283619 makes it better,
> but we still have lots of other errors/warnings.
That's what I understood too; and the way you said it, I thought this
patch series was an improvement on 283619. If it is unrelated, then
ignore my comment.
> Best Regards
> Masahiro Yamada
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 10+ messages in thread