fix fec problem in qemu-m68k-mcf5208

2 files changed, 0 insertions, 245 deletions

diff --git a/target/m68k/qemu-m68k/patches/3.14.54/m68k-coldfire-fec.patch b/target/m68k/qemu-m68k/patches/3.14.54/m68k-coldfire-fec.patch
deleted file mode 100644
index be0b18ad7..000000000
--- a/target/m68k/qemu-m68k/patches/3.14.54/m68k-coldfire-fec.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Nur linux-3.14.26.orig/drivers/net/ethernet/freescale/fec_main.c linux-3.14.26/drivers/net/ethernet/freescale/fec_main.c
---- linux-3.14.26.orig/drivers/net/ethernet/freescale/fec_main.c	2014-12-06 17:56:06.000000000 -0600
-+++ linux-3.14.26/drivers/net/ethernet/freescale/fec_main.c	2014-12-28 22:15:41.533921249 -0600
-@@ -152,7 +152,7 @@
- module_param_array(macaddr, byte, NULL, 0);
- MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
- 
--#if defined(CONFIG_M5272)
-+#if defined(CONFIG_COLDFIRE)
- /*
-  * Some hardware gets it MAC address out of local flash memory.
-  * if this is non-zero then assume it is the address to get MAC from.
-@@ -170,7 +170,7 @@
- #else
- #define	FEC_FLASHMAC	0
- #endif
--#endif /* CONFIG_M5272 */
-+#endif /* CONFIG_COLDFIRE */
- 
- #if (((RX_RING_SIZE + TX_RING_SIZE) * 32) > PAGE_SIZE)
- #error "FEC: descriptor ring size constants too large"
-@@ -565,7 +565,7 @@
- 	/* Set MII speed */
- 	writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
- 
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
- 	/* set RX checksum */
- 	val = readl(fep->hwp + FEC_RACC);
- 	if (fep->csum_flags & FLAG_RX_CSUM_ENABLED)
-@@ -626,7 +626,7 @@
- #endif
- 	}
- 
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
- 	/* enable pause frame*/
- 	if ((fep->pause_flag & FEC_PAUSE_FLAG_ENABLE) ||
- 	    ((fep->pause_flag & FEC_PAUSE_FLAG_AUTONEG) &&
-@@ -644,13 +644,13 @@
- 	} else {
- 		rcntl &= ~FEC_ENET_FCE;
- 	}
--#endif /* !defined(CONFIG_M5272) */
-+#endif /* !defined(CONFIG_COLDFIRE) */
- 
- 	writel(rcntl, fep->hwp + FEC_R_CNTRL);
- 
- 	/* Setup multicast filter. */
- 	set_multicast_list(ndev);
--#ifndef CONFIG_M5272
-+#ifndef CONFIG_COLDFIRE
- 	writel(0, fep->hwp + FEC_HASH_TABLE_HIGH);
- 	writel(0, fep->hwp + FEC_HASH_TABLE_LOW);
- #endif
-@@ -665,7 +665,7 @@
- 	if (fep->bufdesc_ex)
- 		ecntl |= (1 << 4);
- 
--#ifndef CONFIG_M5272
-+#ifndef CONFIG_COLDFIRE
- 	/* Enable the MIB statistic event counters */
- 	writel(0 << 31, fep->hwp + FEC_MIB_CTRLSTAT);
- #endif
-@@ -1117,7 +1117,7 @@
- 	 * 3) from flash or fuse (via platform data)
- 	 */
- 	if (!is_valid_ether_addr(iap)) {
--#ifdef CONFIG_M5272
-+#ifdef CONFIG_COLDFIRE
- 		if (FEC_FLASHMAC)
- 			iap = (unsigned char *)FEC_FLASHMAC;
- #else
-@@ -1304,7 +1304,7 @@
- 	/* mask with MAC supported features */
- 	if (id_entry->driver_data & FEC_QUIRK_HAS_GBIT) {
- 		phy_dev->supported &= PHY_GBIT_FEATURES;
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
- 		phy_dev->supported |= SUPPORTED_Pause;
- #endif
- 	}
-@@ -1491,7 +1491,7 @@
- 	}
- }
- 
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
- 
- static void fec_enet_get_pauseparam(struct net_device *ndev,
- 				    struct ethtool_pauseparam *pause)
-@@ -1637,7 +1637,7 @@
- 		return -EOPNOTSUPP;
- 	}
- }
--#endif /* !defined(CONFIG_M5272) */
-+#endif /* !defined(CONFIG_COLDFIRE) */
- 
- static int fec_enet_nway_reset(struct net_device *dev)
- {
-@@ -1651,7 +1651,7 @@
- }
- 
- static const struct ethtool_ops fec_enet_ethtool_ops = {
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
- 	.get_pauseparam		= fec_enet_get_pauseparam,
- 	.set_pauseparam		= fec_enet_set_pauseparam,
- #endif
-@@ -1661,7 +1661,7 @@
- 	.get_link		= ethtool_op_get_link,
- 	.get_ts_info		= fec_enet_get_ts_info,
- 	.nway_reset		= fec_enet_nway_reset,
--#ifndef CONFIG_M5272
-+#ifndef CONFIG_COLDFIRE
- 	.get_ethtool_stats	= fec_enet_get_ethtool_stats,
- 	.get_strings		= fec_enet_get_strings,
- 	.get_sset_count		= fec_enet_get_sset_count,
-@@ -2110,7 +2110,7 @@
- 	/* setup board info structure */
- 	fep = netdev_priv(ndev);
- 
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
- 	/* default enable pause frame auto negotiation */
- 	if (pdev->id_entry &&
- 	    (pdev->id_entry->driver_data & FEC_QUIRK_HAS_GBIT))
diff --git a/target/m68k/qemu-m68k/patches/3.18.22/m68k-coldfire-fec.patch b/target/m68k/qemu-m68k/patches/3.18.22/m68k-coldfire-fec.patch
deleted file mode 100644
index ceaa21ce6..000000000
--- a/target/m68k/qemu-m68k/patches/3.18.22/m68k-coldfire-fec.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Nur linux-3.18.2.orig/drivers/net/ethernet/freescale/fec_main.c linux-3.18.2/drivers/net/ethernet/freescale/fec_main.c
---- linux-3.18.2.orig/drivers/net/ethernet/freescale/fec_main.c	2015-01-08 12:30:41.000000000 -0600
-+++ linux-3.18.2/drivers/net/ethernet/freescale/fec_main.c	2015-01-11 20:34:04.690309863 -0600
-@@ -136,7 +136,7 @@
- module_param_array(macaddr, byte, NULL, 0);
- MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
- 
--#if defined(CONFIG_M5272)
-+#if defined(CONFIG_COLDFIRE)
- /*
-  * Some hardware gets it MAC address out of local flash memory.
-  * if this is non-zero then assume it is the address to get MAC from.
-@@ -154,7 +154,7 @@
- #else
- #define	FEC_FLASHMAC	0
- #endif
--#endif /* CONFIG_M5272 */
-+#endif /* CONFIG_COLDFIRE */
- 
- /* The FEC stores dest/src/type/vlan, data, and checksum for receive packets.
-  */
-@@ -978,7 +978,7 @@
- 	/* Set MII speed */
- 	writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
- 
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
- 	/* set RX checksum */
- 	val = readl(fep->hwp + FEC_RACC);
- 	if (fep->csum_flags & FLAG_RX_CSUM_ENABLED)
-@@ -1039,7 +1039,7 @@
- #endif
- 	}
- 
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
- 	/* enable pause frame*/
- 	if ((fep->pause_flag & FEC_PAUSE_FLAG_ENABLE) ||
- 	    ((fep->pause_flag & FEC_PAUSE_FLAG_AUTONEG) &&
-@@ -1057,13 +1057,13 @@
- 	} else {
- 		rcntl &= ~FEC_ENET_FCE;
- 	}
--#endif /* !defined(CONFIG_M5272) */
-+#endif /* !defined(CONFIG_COLDFIRE) */
- 
- 	writel(rcntl, fep->hwp + FEC_R_CNTRL);
- 
- 	/* Setup multicast filter. */
- 	set_multicast_list(ndev);
--#ifndef CONFIG_M5272
-+#ifndef CONFIG_COLDFIRE
- 	writel(0, fep->hwp + FEC_HASH_TABLE_HIGH);
- 	writel(0, fep->hwp + FEC_HASH_TABLE_LOW);
- #endif
-@@ -1078,7 +1078,7 @@
- 	if (fep->bufdesc_ex)
- 		ecntl |= (1 << 4);
- 
--#ifndef CONFIG_M5272
-+#ifndef CONFIG_COLDFIRE
- 	/* Enable the MIB statistic event counters */
- 	writel(0 << 31, fep->hwp + FEC_MIB_CTRLSTAT);
- #endif
-@@ -1656,7 +1656,7 @@
- 	 * 3) from flash or fuse (via platform data)
- 	 */
- 	if (!is_valid_ether_addr(iap)) {
--#ifdef CONFIG_M5272
-+#ifdef CONFIG_COLDFIRE
- 		if (FEC_FLASHMAC)
- 			iap = (unsigned char *)FEC_FLASHMAC;
- #else
-@@ -1930,7 +1930,7 @@
- 	if (id_entry->driver_data & FEC_QUIRK_HAS_GBIT) {
- 		phy_dev->supported &= PHY_GBIT_FEATURES;
- 		phy_dev->supported &= ~SUPPORTED_1000baseT_Half;
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
- 		phy_dev->supported |= SUPPORTED_Pause;
- #endif
- 	}
-@@ -2125,7 +2125,7 @@
- 	}
- }
- 
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
- 
- static void fec_enet_get_pauseparam(struct net_device *ndev,
- 				    struct ethtool_pauseparam *pause)
-@@ -2280,7 +2280,7 @@
- 		return -EOPNOTSUPP;
- 	}
- }
--#endif /* !defined(CONFIG_M5272) */
-+#endif /* !defined(CONFIG_COLDFIRE) */
- 
- static int fec_enet_nway_reset(struct net_device *dev)
- {
-@@ -2466,7 +2466,7 @@
- 	.get_link		= ethtool_op_get_link,
- 	.get_coalesce		= fec_enet_get_coalesce,
- 	.set_coalesce		= fec_enet_set_coalesce,
--#ifndef CONFIG_M5272
-+#ifndef CONFIG_COLDFIRE
- 	.get_pauseparam		= fec_enet_get_pauseparam,
- 	.set_pauseparam		= fec_enet_set_pauseparam,
- 	.get_strings		= fec_enet_get_strings,
-@@ -3164,7 +3164,7 @@
- 	fep->num_rx_queues = num_rx_qs;
- 	fep->num_tx_queues = num_tx_qs;
- 
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
- 	/* default enable pause frame auto negotiation */
- 	if (pdev->id_entry &&
- 	    (pdev->id_entry->driver_data & FEC_QUIRK_HAS_GBIT))