diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-30 23:04:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-30 23:04:51 +0200 |
| commit | fed4de0135fdc13565704669cdf80902bbfe3c42 (patch) | |
| tree | b8fc14a0c94687ac766eba56cb8ec445dfad0668 /include | |
| parent | 42ffcec3f9eba010a662d5b42981812b6bebfb9a (diff) | |
| parent | 12bc4e94251c369c529ffa505cf58b148c372f7f (diff) | |
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-m68k/global_data.h | 4 | ||||
| -rw-r--r-- | include/configs/M5475EVB.h | 1 | ||||
| -rw-r--r-- | include/configs/M5485EVB.h | 1 | ||||
| -rw-r--r-- | include/net.h | 8 |
4 files changed, 10 insertions, 4 deletions
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 @@ -47,6 +47,10 @@ typedef struct global_data { 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 */ unsigned long reset_status; /* reset status register at boot */ 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 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 */ |