diff options
author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-01-04 16:18:05 +0000 |
---|---|---|
committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-01-04 16:18:05 +0000 |
commit | c5eb10ed85a193982ff46197ff58d024e7061a51 (patch) | |
tree | 9a6752029ae2b139a1fe2b1248fd056aab194e1a /target/linux/ixp4xx/patches-2.6.23/061-nslu2_setup_mac.patch | |
parent | ef10c590d94cd701131fbd53a41b5c8ae3a82df5 (diff) |
use the newer mac handling patches from nslu2-linux
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10116 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.23/061-nslu2_setup_mac.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.23/061-nslu2_setup_mac.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/061-nslu2_setup_mac.patch b/target/linux/ixp4xx/patches-2.6.23/061-nslu2_setup_mac.patch deleted file mode 100644 index c71c47e65..000000000 --- a/target/linux/ixp4xx/patches-2.6.23/061-nslu2_setup_mac.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c -index e0d0dde..6e24916 100644 ---- a/arch/arm/mach-ixp4xx/nslu2-setup.c -+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c -@@ -19,6 +19,7 @@ - #include <linux/serial_8250.h> - #include <linux/leds.h> - #include <linux/i2c-gpio.h> -+#include <linux/mtd/mtd.h> - - #include <asm/mach-types.h> - #include <asm/mach/arch.h> -@@ -167,6 +168,30 @@ static struct platform_device *nslu2_devices[] __initdata = { - &nslu2_eth[0], - }; - -+static void nslu2_flash_add(struct mtd_info *mtd) -+{ -+ if (strcmp(mtd->name, "RedBoot") == 0) { -+ size_t retlen; -+ u_char mac[6]; -+ -+ if (mtd->read(mtd, 0x3FFB0, 6, &retlen, mac) == 0 && retlen == 6) { -+ printk(KERN_INFO "nslu2 mac: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", -+ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); -+ memcpy(nslu2_plat_eth[0].hwaddr, mac, 6); -+ } else { -+ printk(KERN_ERR "nslu2 mac: read failed\n"); -+ } -+ } -+} -+ -+static void nslu2_flash_remove(struct mtd_info *mtd) { -+} -+ -+static struct mtd_notifier nslu2_flash_notifier = { -+ .add = nslu2_flash_add, -+ .remove = nslu2_flash_remove, -+}; -+ - static void nslu2_power_off(void) - { - /* This causes the box to drop the power and go dead. */ -@@ -209,6 +234,8 @@ static void __init nslu2_init(void) - (void)platform_device_register(&nslu2_uart); - - platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); -+ -+ register_mtd_user(&nslu2_flash_notifier); - } - - MACHINE_START(NSLU2, "Linksys NSLU2") |