diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/IceCube.h | 5 | ||||
| -rw-r--r-- | include/exports.h | 4 | ||||
| -rw-r--r-- | include/net.h | 8 |
3 files changed, 13 insertions, 4 deletions
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index e6d735a2292..2a455f89229 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -52,7 +52,7 @@ /* * Supported commands */ -#define CONFIG_COMMANDS (CONFIG_CMD_DFL & ~(CFG_CMD_NET)) +#define CONFIG_COMMANDS CONFIG_CMD_DFL /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> @@ -122,10 +122,7 @@ /* * Ethernet configuration */ -#if 0 -#define CONFIG_NET_MULTI 1 #define CONFIG_MPC5XXX_FEC 1 -#endif /* * GPIO configuration diff --git a/include/exports.h b/include/exports.h index b45a466914b..f812f16072c 100644 --- a/include/exports.h +++ b/include/exports.h @@ -33,4 +33,8 @@ enum { #define XF_VERSION 1 +#if defined(CONFIG_I386) +extern gd_t *global_data; +#endif + #endif diff --git a/include/net.h b/include/net.h index b9bf133d9f0..dd8d3780451 100644 --- a/include/net.h +++ b/include/net.h @@ -21,6 +21,14 @@ # endif #endif /* CONFIG_8xx */ +#if defined(CONFIG_MPC5XXX) +# if !defined(CONFIG_NET_MULTI) +# if defined(CONFIG_MPC5XXX_FEC) +# define CONFIG_NET_MULTI +# endif +# endif +#endif /* CONFIG_MPC5XXX */ + #if !defined(CONFIG_NET_MULTI) && defined(CONFIG_8260) #include <config.h> #if defined(CONFIG_ETHER_ON_FCC) |