Signed-off-by: NRoy Zang <tie-fei.zang@freescale.com>
Acked-by: NAndr Schwarz <andre.schwarz@matrix-vision.de>

The Intel E1000 driver was making assumptions about the relationship between
some virtual, physical, and PCI addresses.

Also fix some bad usage of the DEBUGOUT macro
Signed-off-by: NTimur Tabi <timur@freescale.com>
Acked-by: NKumar Gala <galak@kernel.crashing.org>
Signed-off-by: NBen Warren <biggerbadderben@gmail.com>

 Fix E1000 build warning on AP1000 board
 Fix the build warning on AP1000 board:
 e1000.c:131: warning: 'e1000_read_eeprom' used but never defined
 e1000.c:2012: warning: 'e1000_set_phy_mode' defined but not used
Signed-off-by: NRoy Zang <tie-fei.zang@freescale.com>
Signed-off-by: NBen Warren <biggerbadderben@gmail.com>

Based on Intel PRO/1000 Network Driver 7.3.20-k2
  Add Intel E1000 PCIE card support. The following cards are added:
  INTEL_82571EB_COPPER
  INTEL_82571EB_FIBER,
  INTEL_82571EB_SERDES
  INTEL_82571EB_QUAD_COPPER
  INTEL_82571PT_QUAD_COPPER
  INTEL_82571EB_QUAD_FIBER
  INTEL_82571EB_QUAD_COPPER_LOWPROFILE
  INTEL_82571EB_SERDES_DUAL
  INTEL_82571EB_SERDES_QUAD
  INTEL_82572EI_COPPER
  INTEL_82572EI_FIBER
  INTEL_82572EI_SERDES
  INTEL_82572EI
  INTEL_82573E
  INTEL_82573E_IAMT
  INTEL_82573L
  INTEL_82546GB_QUAD_COPPER_KSP3
  INTEL_80003ES2LAN_COPPER_DPT
  INTEL_80003ES2LAN_SERDES_DPT
  INTEL_80003ES2LAN_COPPER_SPT
  INTEL_80003ES2LAN_SERDES_SPT

 82571EB_COPPER dual ports,
 82572EI single port,
 82572EI_COPPER single port PCIE cards
 and
 82545EM_COPPER,
 82541GI_LF
 pci cards are tested on both  P2020 board
 and MPC8544DS board.
Signed-off-by: NRoy Zang <tie-fei.zang@freescale.com>
Signed-off-by: NBen Warren <biggerbadderben@gmail.com>

Signed-off-by: NStefan Althoefer <stefan.althoefer@web.de>

Affected boards:
	ap1000
	mvbc_p
	PM854

Removed initialization of the driver from net/eth.c
Signed-off-by: NBen Warren <biggerbadderben@gmail.com>

Signed-off-by: NStefan Roese <sr@denx.de>

Avoid "integer constant is too large for 'long' type" warnings.
And simplify the code.
Signed-off-by: NWolfgang Denk <wd@denx.de>

This PCI-X e1000 variant works by just adding in the correct
PCI IDs in the appropriate places.
Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>

Replace COBJS-y with appropriate driver config names.
Signed-off-by: NShinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Signed-off-by: NBen Warren <biggerbadderben@gmail.com>

Signed-off-by: NWolfgang Grandegger <wg@grandegger.com>
Signed-off-by: NBen Warren <biggerbadderben@gmail.com>

Signed-off-by: NWolfgang Denk <wd@denx.de>

Add 82541ER device with latest integrated IGP2 PHY.
Introduced CONFIG_E1000_FALLBACK_MAC for NIC bring-up with empty eeprom.
Signed-off-by: NAndre Schwarz <andre.schwarz@matrix-vision.de>
Signed-off-by: NBen Warren <biggerbadderben@gmail.com>

Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Signed-off-by: NJon Loeliger <jdl@freescale.com>

This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.

All transformations are of the form:
Before:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
Signed-off-by: NJon Loeliger <jdl@freescale.com>

Patch by James MacAulay, 07 Oct 2005

  - remove trailing white space, trailing empty lines, C++ comments, etc.
  - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)

* Patches by Kenneth Johansson, 25 Jun 2003:
  - major rework of command structure
    (work done mostly by Michal Cendrowski and Joakim Kristiansen)

  - Added support for custom keyboards, initialized by defining a
    board-specific drv_keyboard_init as well as defining CONFIG_KEYBOARD .
  - Added support for the RBC823 board.
  - cpu/mpc8xx/lcd.c now automatically calculates the
    Horizontal Pixel Count field.

* Fix alignment problem in BOOTP (dhcp_leasetime option)
  [pointed out by Nicolas Lacressonnire, 2 Jun 2003]

* Patch by Mark Rakes, 14 May 2003:
  add support for Intel e1000 gig cards.

* Patch by Nye Liu, 3 Jun 2003:
  fix critical typo in MAMR definition (include/mpc8xx.h)

* Fix requirement to align U-Boot image on 16 kB boundaries on PPC.

* Patch by Klaus Heydeck, 2 Jun 2003
  Minor changes for KUP4K configuration