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@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