summaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.23/062-nas100d_setup_mac.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-01-04 16:18:05 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-01-04 16:18:05 +0000
commitc5eb10ed85a193982ff46197ff58d024e7061a51 (patch)
tree9a6752029ae2b139a1fe2b1248fd056aab194e1a /target/linux/ixp4xx/patches-2.6.23/062-nas100d_setup_mac.patch
parentef10c590d94cd701131fbd53a41b5c8ae3a82df5 (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/062-nas100d_setup_mac.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.23/062-nas100d_setup_mac.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/062-nas100d_setup_mac.patch b/target/linux/ixp4xx/patches-2.6.23/062-nas100d_setup_mac.patch
deleted file mode 100644
index df40a6e96..000000000
--- a/target/linux/ixp4xx/patches-2.6.23/062-nas100d_setup_mac.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
-index d4d8540..b8c99fa 100644
---- a/arch/arm/mach-ixp4xx/nas100d-setup.c
-+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
-@@ -17,6 +17,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>
-@@ -151,6 +152,30 @@ static struct platform_device *nas100d_devices[] __initdata = {
- &nas100d_eth[0],
- };
-
-+static void nas100d_flash_add(struct mtd_info *mtd)
-+{
-+ if (strcmp(mtd->name, "RedBoot config") == 0) {
-+ size_t retlen;
-+ u_char mac[6];
-+
-+ if (mtd->read(mtd, 0x0FD8, 6, &retlen, mac) == 0 && retlen == 6) {
-+ printk(KERN_INFO "nas100d mac: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
-+ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-+ memcpy(nas100d_plat_eth[0].hwaddr, mac, 6);
-+ } else {
-+ printk(KERN_ERR "nas100d mac: read failed\n");
-+ }
-+ }
-+}
-+
-+static void nas100d_flash_remove(struct mtd_info *mtd) {
-+}
-+
-+static struct mtd_notifier nas100d_flash_notifier = {
-+ .add = nas100d_flash_add,
-+ .remove = nas100d_flash_remove,
-+};
-+
- static void nas100d_power_off(void)
- {
- /* This causes the box to drop the power and go dead. */
-@@ -183,6 +208,8 @@ static void __init nas100d_init(void)
- (void)platform_device_register(&nas100d_uart);
-
- platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices));
-+
-+ register_mtd_user(&nas100d_flash_notifier);
- }
-
- MACHINE_START(NAS100D, "Iomega NAS 100d")