diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2008-07-12 02:02:58 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2008-07-12 02:02:58 +0000 |
commit | 9ba31e3b0819f306c121e4404873bda4da655203 (patch) | |
tree | 6870fa2b5548592459151c5a5d25ceef5e45892d /target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch | |
parent | 0ef986bbe27767ff3937b53a93db84b966569e73 (diff) | |
download | upstream-9ba31e3b0819f306c121e4404873bda4da655203.tar.gz upstream-9ba31e3b0819f306c121e4404873bda4da655203.tar.bz2 upstream-9ba31e3b0819f306c121e4404873bda4da655203.zip |
nuke most of the old ixp4xx patchsets
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11778 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch')
-rw-r--r-- | target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch b/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch deleted file mode 100644 index 8993a9e17b..0000000000 --- a/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c -=================================================================== ---- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c -+++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c -@@ -15,6 +15,7 @@ - #include <linux/serial.h> - #include <linux/serial_8250.h> - -+#include <asm/setup.h> - #include <asm/mach-types.h> - #include <asm/mach/arch.h> - #include <asm/mach/flash.h> -@@ -142,6 +143,36 @@ static struct sys_timer dsmg600_timer = - .init = dsmg600_timer_init, - }; - -+static char dsmg600_rtc_probe[] __initdata = "rtc-pcf8563.probe=0,0x51 "; -+ -+static void __init dsmg600_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(dsmg600_rtc_probe) + strlen(p) + 1 + 4) >> 2; -+ strlcpy(t->u.cmdline.cmdline, dsmg600_rtc_probe, COMMAND_LINE_SIZE); -+ strlcpy(t->u.cmdline.cmdline + strlen(dsmg600_rtc_probe), p, -+ COMMAND_LINE_SIZE - strlen(dsmg600_rtc_probe)); -+ -+ /* Terminate the table. */ -+ t = tag_next(t); -+ t->hdr.tag = ATAG_NONE; -+ t->hdr.size = 0; -+} -+ - static void __init dsmg600_init(void) - { - ixp4xx_sys_init(); -@@ -174,6 +205,7 @@ MACHINE_START(DSMG600, "D-Link DSM-G600 - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, - .boot_params = 0x00000100, -+ .fixup = dsmg600_fixup, - .map_io = ixp4xx_map_io, - .init_irq = ixp4xx_init_irq, - .timer = &dsmg600_timer, |