From 85b39abe7d82d9b6b3ee3c7bc9f9d94fbb65beff Mon Sep 17 00:00:00 2001 From: kaloz Date: Sun, 10 Feb 2008 18:55:46 +0000 Subject: prepare 2.6.24 on ixp4xx git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10438 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.24/091-nslu2_rtc_fixup.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 target/linux/ixp4xx/patches-2.6.24/091-nslu2_rtc_fixup.patch (limited to 'target/linux/ixp4xx/patches-2.6.24/091-nslu2_rtc_fixup.patch') diff --git a/target/linux/ixp4xx/patches-2.6.24/091-nslu2_rtc_fixup.patch b/target/linux/ixp4xx/patches-2.6.24/091-nslu2_rtc_fixup.patch new file mode 100644 index 000000000..49ca1e2dc --- /dev/null +++ b/target/linux/ixp4xx/patches-2.6.24/091-nslu2_rtc_fixup.patch @@ -0,0 +1,55 @@ +diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/nslu2-setup.c linux-2.6.23/arch/arm/mach-ixp4xx/nslu2-setup.c +--- linux-2.6.23.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-10-09 15:31:38.000000000 -0500 ++++ linux-2.6.23/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-10-11 01:04:46.000000000 -0500 +@@ -19,6 +19,7 @@ + #include + #include + ++#include + #include + #include + #include +@@ -171,6 +172,35 @@ static struct sys_timer nslu2_timer = { + .init = nslu2_timer_init, + }; + ++static char nslu2_rtc_probe[] __initdata = "rtc-isl1208.ignore=0,0x6f rtc-x1205.probe=0,0x6f "; ++ ++static void __init nslu2_fixup(struct machine_desc *desc, ++ struct tag *tags, char **cmdline, struct meminfo *mi) ++{ ++ struct tag *t = tags; ++ char *p = *cmdline; ++ ++ /* Find the end of the tags table, taking note of any cmdline tag. */ ++ for (; t->hdr.size; t = tag_next(t)) { ++ if (t->hdr.tag == ATAG_CMDLINE) { ++ p = t->u.cmdline.cmdline; ++ } ++ } ++ ++ /* Overwrite the end of the table with a new cmdline tag. */ ++ t->hdr.tag = ATAG_CMDLINE; ++ t->hdr.size = (sizeof (struct tag_header) + ++ strlen(nslu2_rtc_probe) + strlen(p) + 1 + 4) >> 2; ++ strlcpy(t->u.cmdline.cmdline, nslu2_rtc_probe, COMMAND_LINE_SIZE); ++ strlcpy(t->u.cmdline.cmdline + strlen(nslu2_rtc_probe), p, ++ COMMAND_LINE_SIZE - strlen(nslu2_rtc_probe)); ++ ++ /* Terminate the table. */ ++ t = tag_next(t); ++ t->hdr.tag = ATAG_NONE; ++ t->hdr.size = 0; ++} ++ + static void __init nslu2_init(void) + { + ixp4xx_sys_init(); +@@ -196,6 +226,7 @@ MACHINE_START(NSLU2, "Linksys NSLU2") + .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, + .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, + .boot_params = 0x00000100, ++ .fixup = nslu2_fixup, + .map_io = ixp4xx_map_io, + .init_irq = ixp4xx_init_irq, + .timer = &nslu2_timer, -- cgit v1.2.3