diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 10:54:54 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 10:54:54 +0200 |
commit | 48b3ed217f58487c583d59575d7dfe2aafbb738d (patch) | |
tree | ec14ed8d9eba5b09a27508aa1deda08c47c7cdda /drivers/net/sh_eth.h | |
parent | 740f41d3cbefe2068247852220226c2c3b287249 (diff) | |
parent | cff2f5f09ee8ab45b86eed7228bacbce6eca9f01 (diff) | |
download | blackbird-obmc-uboot-48b3ed217f58487c583d59575d7dfe2aafbb738d.tar.gz blackbird-obmc-uboot-48b3ed217f58487c583d59575d7dfe2aafbb738d.zip |
Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/net/sh_eth.h')
-rw-r--r-- | drivers/net/sh_eth.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index d0d9aaa703..e325a39aac 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h @@ -358,7 +358,8 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = { #elif defined(CONFIG_R8A7740) #define SH_ETH_TYPE_GETHER #define BASE_IO_ADDR 0xE9A00000 -#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) +#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \ + defined(CONFIG_R8A7794) #define SH_ETH_TYPE_ETHER #define BASE_IO_ADDR 0xEE700200 #elif defined(CONFIG_R7S72100) @@ -569,7 +570,8 @@ enum FELIC_MODE_BIT { ECMR_PRM = 0x00000001, #ifdef CONFIG_CPU_SH7724 ECMR_RTM = 0x00000010, -#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) +#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \ + defined(CONFIG_R8A7794) ECMR_RTM = 0x00000004, #endif |