diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-02-09 11:59:03 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-09 11:59:03 +0000 |
| commit | 4f999c3661ce6d85fda1bb97019c61f31d5edc11 (patch) | |
| tree | 7d536095ccc98beb3ded1f10120331b87953288e /packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-maclist.patch | |
| parent | 08f23753d0eab9c906b0fd43e36f83f66c1352e2 (diff) | |
ixp4xx-kernel: Added patchset and metadata for 2.6.16-rc2 kernel.
Diffstat (limited to 'packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-maclist.patch')
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-maclist.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-maclist.patch b/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-maclist.patch new file mode 100644 index 0000000000..f08efacb64 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-maclist.patch @@ -0,0 +1,84 @@ + arch/arm/mach-ixp4xx/Kconfig | 4 +-- + arch/arm/mach-ixp4xx/nslu2-setup.c | 39 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 41 insertions(+), 2 deletions(-) + +--- linux-nslu2.orig/arch/arm/mach-ixp4xx/Kconfig 2006-02-06 22:35:26.000000000 +0100 ++++ linux-nslu2/arch/arm/mach-ixp4xx/Kconfig 2006-02-06 22:35:31.000000000 +0100 +@@ -11,8 +11,8 @@ comment "IXP4xx Platforms" + # This entry is placed on top because otherwise it would have + # been shown as a submenu. + config MACH_NSLU2 +- bool +- prompt "NSLU2" if !(MACH_IXDP465 || MACH_IXDPG425 || ARCH_IXDP425 || ARCH_ADI_COYOTE || ARCH_AVILA || ARCH_IXCDP1100 || ARCH_PRPMC1100 || MACH_GTWX5715) ++ bool "NSLU2" ++ select MACLIST + help + Say 'Y' here if you want your kernel to support Linksys's + NSLU2 NAS device. For more information on this platform, +--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-02-06 22:34:55.000000000 +0100 ++++ linux-nslu2/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-02-06 22:35:31.000000000 +0100 +@@ -16,11 +16,14 @@ + #include <linux/kernel.h> + #include <linux/serial.h> + #include <linux/serial_8250.h> ++#include <linux/mtd/mtd.h> + + #include <asm/mach-types.h> + #include <asm/mach/arch.h> + #include <asm/mach/flash.h> + ++#include <net/maclist.h> ++ + static struct flash_platform_data nslu2_flash_data = { + .map_name = "cfi_probe", + .width = 2, +@@ -117,6 +120,37 @@ static void nslu2_power_off(void) + gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH); + } + ++/* ++ * When the RedBoot partition is added the MAC address is read from ++ * it. ++ */ ++static void nslu2_flash_add(struct mtd_info *mtd) { ++ if (strcmp(mtd->name, "RedBoot") == 0) { ++ size_t retlen; ++ u_char mac[6]; ++ ++ /* The MAC is at a known offset... */ ++ 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]); ++ maclist_add(mac); ++ } else { ++ printk(KERN_ERR "NSLU2 MAC: read failed\n"); ++ } ++ } ++} ++ ++/* ++ * Nothing to do on remove at present. ++ */ ++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 __init nslu2_init(void) + { + /* The NSLU2 has a 33MHz crystal on board - 1.01% different +@@ -124,6 +158,11 @@ static void __init nslu2_init(void) + */ + ixp4xx_set_board_tick_rate(66000000); + ++ /* The flash has an ethernet MAC embedded in it which we need, ++ * that is all this notifier does. ++ */ ++ register_mtd_user(&nslu2_flash_notifier); ++ + ixp4xx_sys_init(); + + pm_power_off = nslu2_power_off; |