public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] digsy_mtc: Fix compile warnings.
@ 2009-03-19 14:27 Grzegorz Bernacki
  2009-03-20 20:58 ` Wolfgang Denk
  0 siblings, 1 reply; 2+ messages in thread
From: Grzegorz Bernacki @ 2009-03-19 14:27 UTC (permalink / raw)
  To: u-boot


Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
---
This patch should be applied to the "next" branch.

 cpu/mpc5xxx/cpu.c           |    3 ++-
 include/configs/digsy_mtc.h |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c
index ad5ef8e..f6258c7 100644
--- a/cpu/mpc5xxx/cpu.c
+++ b/cpu/mpc5xxx/cpu.c
@@ -28,6 +28,7 @@
 #include <common.h>
 #include <watchdog.h>
 #include <command.h>
+#include <net.h>
 #include <mpc5xxx.h>
 #include <netdev.h>
 #include <asm/io.h>
@@ -121,7 +122,7 @@ void ft_cpu_setup(void *blob, bd_t *bd)
 	int div = in_8((void*)CONFIG_SYS_MBAR + 0x204) & 0x0020 ? 8 : 4;
 	char * cpu_path = "/cpus/" OF_CPU;
 #ifdef CONFIG_MPC5xxx_FEC
-	uchar *enetaddr[6];
+	uchar enetaddr[6];
 	char * eth_path = "/" OF_SOC "/ethernet at 3000";
 #endif
 
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 18544f4..2716d5b 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -254,7 +254,7 @@
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR	" "
 
 #define CONFIG_LOOPW		1
-- 
1.6.0.6

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [PATCH] digsy_mtc: Fix compile warnings.
  2009-03-19 14:27 [U-Boot] [PATCH] digsy_mtc: Fix compile warnings Grzegorz Bernacki
@ 2009-03-20 20:58 ` Wolfgang Denk
  0 siblings, 0 replies; 2+ messages in thread
From: Wolfgang Denk @ 2009-03-20 20:58 UTC (permalink / raw)
  To: u-boot

Dear Grzegorz Bernacki,

In message <1237472877301-git-send-email-gjb@semihalf.com> you wrote:
> 
> Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
> ---
> This patch should be applied to the "next" branch.
> 
>  cpu/mpc5xxx/cpu.c           |    3 ++-
>  include/configs/digsy_mtc.h |    2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)

Thanks. Applied to "next" branch and squashed into "Add support for
the digsy MTC board." patch.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"To take a significant step forward, you must make a series of finite
improvements." - Donald J. Atwood, General Motors

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-03-20 20:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-19 14:27 [U-Boot] [PATCH] digsy_mtc: Fix compile warnings Grzegorz Bernacki
2009-03-20 20:58 ` Wolfgang Denk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox