patches/0071-ENGR00119715-Add-multi-network-support-for-mx35.patch

   1 From 2d6150b0d95259c12877d82ac7f18d4d35b6b371 Mon Sep 17 00:00:00 2001
   2 From: Terry Lv <r65388@freescale.com>
   3 Date: Tue, 29 Dec 2009 15:26:47 +0800
   4 Subject: [PATCH] ENGR00119715: Add multi network support for mx35
   5
   6 mx35 need to enable both smc911x and FEC.
   7 So add CONFIG_ETHPRIME for it.
   8 Also, change CONFIG_ETH_PRIME to CONFIG_ETHPRIME.
   9
  10 Signed-off-by: Terry Lv <r65388@freescale.com>
  11 ---
  12  include/configs/mx25_3stack.h     |    2 +-
  13  include/configs/mx35_3stack.h     |    1 +
  14  include/configs/mx35_3stack_mmc.h |    1 +
  15  net/eth.c                         |    2 +-
  16  4 files changed, 4 insertions(+), 2 deletions(-)
  17
  18 diff --git a/include/configs/mx25_3stack.h b/include/configs/mx25_3stack.h
  19 index 5084fd8..e1a35f6 100644
  20 --- a/include/configs/mx25_3stack.h
  21 +++ b/include/configs/mx25_3stack.h
  22 @@ -147,7 +147,7 @@
  23  #define CONFIG_NET_RETRY_COUNT 100
  24  #define CONFIG_CMD_DHCP
  25  #define CONFIG_NET_MULTI
  26 -#define CONFIG_ETH_PRIME
  27 +#define CONFIG_ETHPRIME
  28
  29  #define CONFIG_MXC_FEC
  30  #define CONFIG_MII
  31 diff --git a/include/configs/mx35_3stack.h b/include/configs/mx35_3stack.h
  32 index b2fb714..21e5acf 100644
  33 --- a/include/configs/mx35_3stack.h
  34 +++ b/include/configs/mx35_3stack.h
  35 @@ -122,6 +122,7 @@
  36
  37  #define CONFIG_HAS_ETH1
  38  #define CONFIG_NET_MULTI 1
  39 +#define CONFIG_ETHPRIME
  40  #define CONFIG_MXC_FEC
  41  #define CONFIG_MII
  42  #define CONFIG_DISCOVER_PHY
  43 diff --git a/include/configs/mx35_3stack_mmc.h b/include/configs/mx35_3stack_mmc.h
  44 index 948bc91..9a1dd70 100644
  45 --- a/include/configs/mx35_3stack_mmc.h
  46 +++ b/include/configs/mx35_3stack_mmc.h
  47 @@ -123,6 +123,7 @@
  48
  49  #define CONFIG_HAS_ETH1
  50  #define CONFIG_NET_MULTI 1
  51 +#define CONFIG_ETHPRIME
  52  #define CONFIG_MXC_FEC
  53  #define CONFIG_MII
  54  #define CONFIG_DISCOVER_PHY
  55 diff --git a/net/eth.c b/net/eth.c
  56 index b72a4e8..7e4b187 100644
  57 --- a/net/eth.c
  58 +++ b/net/eth.c
  59 @@ -201,7 +201,7 @@ int eth_initialize(bd_t *bis)
  60  #endif
  61         /* Try board-specific initialization first.  If it fails or isn't
  62          * present, try the cpu-specific initialization */
  63 -#ifdef CONFIG_ETH_PRIME
  64 +#ifdef CONFIG_ETHPRIME
  65         board_eth_init(bis);
  66         cpu_eth_init(bis);
  67  #else
  68 --
  69 1.5.4.4
  70