aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/038-MIPS-BCM63XX-provide-a-MAC-address-for-BCM3368-chips.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-08-01 21:56:35 +0000
committerJonas Gorski <jogo@openwrt.org>2014-08-01 21:56:35 +0000
commit6354265168e5c7b593c6579c3a211cd94e914f94 (patch)
tree88a9fb14dbdecfde63ca70c49860b2269f0f3886 /target/linux/brcm63xx/patches-3.10/038-MIPS-BCM63XX-provide-a-MAC-address-for-BCM3368-chips.patch
parent9762c605fe5fe106010f441c9daf42b08c1fcad8 (diff)
downloadmaster-187ad058-6354265168e5c7b593c6579c3a211cd94e914f94.tar.gz
master-187ad058-6354265168e5c7b593c6579c3a211cd94e914f94.tar.bz2
master-187ad058-6354265168e5c7b593c6579c3a211cd94e914f94.zip
brcm63xx: switch to 3.14
Now that BB is branched off, we can now switch to 3.14 and start breaking stuff again. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41941 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/038-MIPS-BCM63XX-provide-a-MAC-address-for-BCM3368-chips.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/038-MIPS-BCM63XX-provide-a-MAC-address-for-BCM3368-chips.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/038-MIPS-BCM63XX-provide-a-MAC-address-for-BCM3368-chips.patch b/target/linux/brcm63xx/patches-3.10/038-MIPS-BCM63XX-provide-a-MAC-address-for-BCM3368-chips.patch
deleted file mode 100644
index ad32ac1738..0000000000
--- a/target/linux/brcm63xx/patches-3.10/038-MIPS-BCM63XX-provide-a-MAC-address-for-BCM3368-chips.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 404fdc457082772ff52e22988e09e82c0d6e8780 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Tue, 18 Jun 2013 16:55:42 +0000
-Subject: [PATCH 4/6] MIPS: BCM63XX: provide a MAC address for BCM3368 chips
-
-The BCM3368 SoC uses a NVRAM format which is not compatible with the one
-used by CFE, provide a default MAC address which is suitable for use and
-which is the default one also being used by the bootloader on these
-chips.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
-Cc: linux-mips@linux-mips.org
-Cc: cernekee@gmail.com
-Cc: jogo@openwrt.org
-Patchwork: https://patchwork.linux-mips.org/patch/5498/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm63xx/nvram.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/arch/mips/bcm63xx/nvram.c
-+++ b/arch/mips/bcm63xx/nvram.c
-@@ -45,6 +45,7 @@ void __init bcm63xx_nvram_init(void *add
- {
- unsigned int check_len;
- u32 crc, expected_crc;
-+ u8 hcs_mac_addr[ETH_ALEN] = { 0x00, 0x10, 0x18, 0xff, 0xff, 0xff };
-
- /* extract nvram data */
- memcpy(&nvram, addr, sizeof(nvram));
-@@ -65,6 +66,15 @@ void __init bcm63xx_nvram_init(void *add
- if (crc != expected_crc)
- pr_warn("nvram checksum failed, contents may be invalid (expected %08x, got %08x)\n",
- expected_crc, crc);
-+
-+ /* Cable modems have a different NVRAM which is embedded in the eCos
-+ * firmware and not easily extractible, give at least a MAC address
-+ * pool.
-+ */
-+ if (BCMCPU_IS_3368()) {
-+ memcpy(nvram.mac_addr_base, hcs_mac_addr, ETH_ALEN);
-+ nvram.mac_addr_count = 2;
-+ }
- }
-
- u8 *bcm63xx_nvram_get_name(void)