summaryrefslogtreecommitdiff
path: root/target/m68k
diff options
context:
space:
mode:
Diffstat (limited to 'target/m68k')
-rw-r--r--target/m68k/qemu-m68k/patches/3.16.6/m68k-coldfire-fec.patch145
-rw-r--r--target/m68k/qemu-m68k/patches/3.17.4/qemu-coldfire.patch (renamed from target/m68k/qemu-m68k/patches/3.16.6/qemu-coldfire.patch)0
2 files changed, 0 insertions, 145 deletions
diff --git a/target/m68k/qemu-m68k/patches/3.16.6/m68k-coldfire-fec.patch b/target/m68k/qemu-m68k/patches/3.16.6/m68k-coldfire-fec.patch
deleted file mode 100644
index 60dfadb6d..000000000
--- a/target/m68k/qemu-m68k/patches/3.16.6/m68k-coldfire-fec.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -Nur linux-3.16.1.orig/drivers/net/ethernet/freescale/fec_main.c linux-3.16.1/drivers/net/ethernet/freescale/fec_main.c
---- linux-3.16.1.orig/drivers/net/ethernet/freescale/fec_main.c 2014-08-14 04:36:35.000000000 +0200
-+++ linux-3.16.1/drivers/net/ethernet/freescale/fec_main.c 2014-08-28 14:14:15.573666435 +0200
-@@ -154,7 +154,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.
-@@ -165,14 +165,14 @@
- #define FEC_FLASHMAC 0xf0006000
- #elif defined(CONFIG_CANCam)
- #define FEC_FLASHMAC 0xf0020000
--#elif defined (CONFIG_M5272C3)
-+#elif defined (CONFIG_COLDFIREC3)
- #define FEC_FLASHMAC (0xffe04000 + 4)
- #elif defined(CONFIG_MOD5272)
- #define FEC_FLASHMAC 0xffc0406b
- #else
- #define FEC_FLASHMAC 0
- #endif
--#endif /* CONFIG_M5272 */
-+#endif /* CONFIG_COLDFIRE */
-
- /* Interrupt events/masks. */
- #define FEC_ENET_HBERR ((uint)0x80000000) /* Heartbeat error */
-@@ -826,7 +826,9 @@
- const struct platform_device_id *id_entry =
- platform_get_device_id(fep->pdev);
- int i;
-+#if !defined(CONFIG_COLDFIRE)
- u32 val;
-+#endif
- u32 temp_mac[2];
- u32 rcntl = OPT_FRAME_SIZE | 0x04;
- u32 ecntl = 0x2; /* ETHEREN */
-@@ -892,7 +894,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)
-@@ -953,7 +955,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) &&
-@@ -971,13 +973,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
-@@ -992,7 +994,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
-@@ -1442,7 +1444,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
-@@ -1667,7 +1669,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
- }
-@@ -1853,7 +1855,7 @@
- }
- }
-
--#if !defined(CONFIG_M5272)
-+#if !defined(CONFIG_COLDFIRE)
-
- static void fec_enet_get_pauseparam(struct net_device *ndev,
- struct ethtool_pauseparam *pause)
-@@ -1999,7 +2001,7 @@
- return -EOPNOTSUPP;
- }
- }
--#endif /* !defined(CONFIG_M5272) */
-+#endif /* !defined(CONFIG_COLDFIRE) */
-
- static int fec_enet_nway_reset(struct net_device *dev)
- {
-@@ -2013,7 +2015,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
-@@ -2023,7 +2025,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,
-@@ -2500,7 +2502,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.16.6/qemu-coldfire.patch b/target/m68k/qemu-m68k/patches/3.17.4/qemu-coldfire.patch
index 503fe8ef3..503fe8ef3 100644
--- a/target/m68k/qemu-m68k/patches/3.16.6/qemu-coldfire.patch
+++ b/target/m68k/qemu-m68k/patches/3.17.4/qemu-coldfire.patch