Merge branch 'master' of git://git.denx.de/u-boot-net

2015-08-23 20:41:04 -04:00
parent 7a53b9544e a77fda1f7d
commit 14e7a30f2e
344 changed files with 1108 additions and 452 deletions
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -718,7 +718,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
-#define CONFIG_E1000

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -94,7 +94,6 @@

 #define CONFIG_CMD_PCI

-#define CONFIG_E1000			/*  E1000 pci Ethernet card*/

 /*
 * PCI Windows
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -101,7 +101,6 @@

 #define CONFIG_CMD_PCI

-#define CONFIG_E1000

 /*
 * PCI Windows
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -61,7 +61,6 @@
 #define CONFIG_SYS_PCI_64BIT	1	/* enable 64-bit PCI resources */

 #define CONFIG_FSL_LAW		1	/* Use common FSL init code */
-#define CONFIG_E1000		1	/* Defind e1000 pci Ethernet card*/

 #define CONFIG_TSEC_ENET		/* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -32,7 +32,6 @@
 #define CONFIG_SYS_PCI_64BIT	1	/* enable 64-bit PCI resources */

 #define CONFIG_FSL_LAW		1	/* Use common FSL init code */
-#define CONFIG_E1000		1	/* Defind e1000 pci Ethernet card*/

 #define CONFIG_TSEC_ENET		/* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -423,7 +423,6 @@ extern unsigned long get_clock_freq(void);

 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
-#define CONFIG_E1000			/* Define e1000 pci Ethernet card */

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */

--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -441,7 +441,6 @@ extern unsigned long get_clock_freq(void);

 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
-#define CONFIG_E1000			/* Define e1000 pci Ethernet card */

 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */

--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -505,7 +505,6 @@
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
 #undef CONFIG_RTL8139
-#define CONFIG_E1000			/* Define e1000 pci Ethernet card */

 #ifndef CONFIG_PCI_PNP
 	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCIE3_IO_BUS
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -186,7 +186,6 @@

 #define CONFIG_CMD_PCI

-#define CONFIG_E1000			/*  E1000 pci Ethernet card*/

 /*
 * PCI Windows
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -554,7 +554,6 @@
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_E1000			/* Define e1000 pci Ethernet card */
 #endif

 /* SATA */
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -250,7 +250,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_PCIE1_IO_SIZE	0x00010000	/* 64k */

 #if defined(CONFIG_PCI)
-#define CONFIG_E1000		/* Defind e1000 pci Ethernet card */
 #define CONFIG_PCI_PNP		/* do pci plug-and-play */
 #define CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
 #endif	/* CONFIG_PCI */
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -562,7 +562,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
-#define CONFIG_E1000

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -668,7 +668,6 @@ unsigned long get_board_ddr_clk(void);
 #endif

 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
-#define CONFIG_E1000
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -681,7 +681,6 @@ unsigned long get_board_ddr_clk(void);
 #endif

 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
-#define CONFIG_E1000
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
 #endif	/* CONFIG_PCI */
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -547,7 +547,6 @@ unsigned long get_board_ddr_clk(void);
 #endif

 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
-#define CONFIG_E1000

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -605,7 +605,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
 #endif

 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
-#define CONFIG_E1000

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -619,7 +619,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_FSL_PCIE_RESET	   /* need PCIe reset errata */
-#define CONFIG_E1000
 #define CONFIG_PCI_PNP		/* do pci plug-and-play */
 #define CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -567,7 +567,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_FSL_PCIE_RESET           /* need PCIe reset errata LSZ ADD */
-#define CONFIG_E1000
 #define CONFIG_PCI_PNP		/* do pci plug-and-play */
 #define CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -278,7 +278,6 @@
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
-#define CONFIG_E1000

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -420,7 +420,6 @@
 #define CONFIG_SYS_PCIE1_IO_SIZE	0x00010000	/* 64k */

 #define CONFIG_PCI_PNP	/* do pci plug-and-play */
-#define CONFIG_E1000	/* Defind e1000 pci Ethernet card*/
 #define CONFIG_CMD_PCI

 #define CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -55,7 +55,6 @@
 #define CONFIG_CMD_PCI_ENUM

 /* PCI networking support */
-#define CONFIG_E1000
 #define CONFIG_E1000_NO_NVM

 /* General networking support */
--- a/include/configs/bayleybay.h
+++ b/include/configs/bayleybay.h
@@ -19,7 +19,6 @@
 #define CONFIG_PCI_CONFIG_HOST_BRIDGE
 #define CONFIG_SYS_EARLY_PCI_INIT
 #define CONFIG_PCI_PNP
-#define CONFIG_E1000

 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,vga,usbkbd\0" \
 					"stdout=serial,vga\0" \
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -575,7 +575,6 @@
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
-#define CONFIG_E1000

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -34,7 +34,6 @@
 #define CONFIG_PCI_CONFIG_HOST_BRIDGE
 #define CONFIG_SYS_EARLY_PCI_INIT
 #define CONFIG_PCI_PNP
-#define CONFIG_E1000

 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,vga,usbkbd\0" \
 					"stdout=serial,vga\0" \
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -168,7 +168,6 @@

 /* Ethernet support */
 #define CONFIG_FEC_MXC
-#define CONFIG_E1000
 #define CONFIG_MII
 #define IMX_FEC_BASE             ENET_BASE_ADDR
 #define CONFIG_FEC_XCV_TYPE      RGMII
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -375,7 +375,6 @@ int get_scl(void);

 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
-#define CONFIG_E1000

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -547,7 +547,6 @@ unsigned long get_board_ddr_clk(void);

 #ifdef CONFIG_PCI
 #define CONFIG_PCI_PNP
-#define CONFIG_E1000
 #define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_CMD_PCI
 #endif
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -395,7 +395,6 @@

 #ifdef CONFIG_PCI
 #define CONFIG_PCI_PNP
-#define CONFIG_E1000
 #define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_CMD_PCI
 #endif
--- a/include/configs/ls2085aqds.h
+++ b/include/configs/ls2085aqds.h
@@ -313,7 +313,6 @@ unsigned long get_board_ddr_clk(void);

 #ifdef CONFIG_PCI
 #define CONFIG_PCI_PNP
-#define CONFIG_E1000
 #define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_CMD_PCI
 #endif
--- a/include/configs/ls2085ardb.h
+++ b/include/configs/ls2085ardb.h
@@ -277,7 +277,6 @@ unsigned long get_board_sys_clk(void);

 #ifdef CONFIG_PCI
 #define CONFIG_PCI_PNP
-#define CONFIG_E1000
 #define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_CMD_PCI
 #endif
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -767,7 +767,6 @@
 #define CONFIG_SYS_PCIE1_IO_SIZE	0x00010000	/* 64k */

 #define CONFIG_PCI_PNP	/* do pci plug-and-play */
-#define CONFIG_E1000	/* Defind e1000 pci Ethernet card*/
 #define CONFIG_CMD_PCI

 #define CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -303,7 +303,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_PCIE1_IO_SIZE	0x00010000	/* 64k */

 #define CONFIG_PCI_PNP	/* do pci plug-and-play */
-#define CONFIG_E1000	/* Defind e1000 pci Ethernet card*/
 #define CONFIG_CMD_PCI

 #define CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -136,7 +136,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
-#define CONFIG_E1000

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
--- a/include/configs/qemu-x86.h
+++ b/include/configs/qemu-x86.h
@@ -30,7 +30,6 @@

 #define CONFIG_PCI_CONFIG_HOST_BRIDGE
 #define CONFIG_PCI_PNP
-#define CONFIG_E1000

 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,vga\0" \
 					"stdout=serial,vga\0" \
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -233,7 +233,6 @@
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_PCI_PNP			/* do pci plug-and-play */
-#define CONFIG_E1000

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -298,7 +298,6 @@
 * TSEC configuration
 */
 #ifdef VME_CADDY2
-#define CONFIG_E1000
 #else
 #define CONFIG_TSEC_ENET		/* TSEC ethernet support */
 #endif