From 33a4a70d48d622cc4950c60a84fec23b9421f23e Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Wed, 30 Apr 2008 13:34:40 +0200 Subject: Fix warnings while compiling net/net.c for MPC8610HPCD board MPC8610HPCD board adds -O2 gcc option to PLATFORM_CPPFLAGS causing overriding default -Os option. New gcc (ver. 4.2.2) produces warnings while compiling net/net.c file with -O2 option. The patch is an attempt to fix this. Signed-off-by: Anatolij Gustschin --- include/net.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/net.h b/include/net.h index f6decdca88..9a2f03fe98 100644 --- a/include/net.h +++ b/include/net.h @@ -412,10 +412,10 @@ extern void print_IPaddr (IPaddr_t); * footprint in our tests. */ /* return IP *in network byteorder* */ -static inline IPaddr_t NetReadIP(void *from) +static inline IPaddr_t NetReadIP(volatile void *from) { IPaddr_t ip; - memcpy((void*)&ip, from, sizeof(ip)); + memcpy((void*)&ip, (void*)from, sizeof(ip)); return ip; } @@ -434,9 +434,9 @@ static inline void NetWriteIP(void *to, IPaddr_t ip) } /* copy IP */ -static inline void NetCopyIP(void *to, void *from) +static inline void NetCopyIP(volatile void *to, void *from) { - memcpy(to, from, sizeof(IPaddr_t)); + memcpy((void*)to, from, sizeof(IPaddr_t)); } /* copy ulong */ -- cgit From 886d90176fc257e0ab4d0db05d11d0749bbed3ca Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Wed, 30 Apr 2008 12:10:47 -0500 Subject: ColdFire: Fix compilation issue caused by new changes in fsl_i2c.c Signed-off-by: Luigi Comio Mantellini Signed-off-by: TsiChung Liew --- include/asm-m68k/global_data.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/asm-m68k/global_data.h b/include/asm-m68k/global_data.h index 958736ec70..c897f2b2a8 100644 --- a/include/asm-m68k/global_data.h +++ b/include/asm-m68k/global_data.h @@ -46,6 +46,10 @@ typedef struct global_data { unsigned long inp_clk; unsigned long vco_clk; unsigned long flb_clk; +#endif +#ifdef CONFIG_FSL_I2C + unsigned long i2c1_clk; + unsigned long i2c2_clk; #endif unsigned long ram_size; /* RAM size */ unsigned long reloc_off; /* Relocation Offset */ -- cgit From f32f7fe7bd3a5bda3a476520f00e1aca7c2103a9 Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Wed, 30 Apr 2008 12:11:19 -0500 Subject: ColdFire: Fix ethernet hang issue for mcf547x_8x The ethernet hang is caused by receiving buffer in DRAM is not yet ready due to access cycles require longer time in DRAM. Relocate DMA buffer descriptors from DRAM to internal SRAM. Signed-off-by: TsiChung Liew --- include/configs/M5475EVB.h | 1 + include/configs/M5485EVB.h | 1 + 2 files changed, 2 insertions(+) (limited to 'include') diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 6bb461913a..fea7551cf1 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -72,6 +72,7 @@ # define CONFIG_MII_INIT 1 # define CONFIG_HAS_ETH1 +# define CFG_DMA_USE_INTSRAM 1 # define CFG_DISCOVER_PHY # define CFG_RX_ETH_BUFFER 32 # define CFG_TX_ETH_BUFFER 48 diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index cba51c87c1..454d0a28dc 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -72,6 +72,7 @@ # define CONFIG_MII_INIT 1 # define CONFIG_HAS_ETH1 +# define CFG_DMA_USE_INTSRAM 1 # define CFG_DISCOVER_PHY # define CFG_RX_ETH_BUFFER 32 # define CFG_TX_ETH_BUFFER 48 -- cgit