diff options
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.24/190-cambria_support.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.24/190-cambria_support.patch | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.24/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.24/190-cambria_support.patch index 4f7f996b2..4fbc1de8a 100644 --- a/target/linux/ixp4xx/patches-2.6.24/190-cambria_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/190-cambria_support.patch @@ -125,7 +125,7 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-pci.c linux-2.6.24.5-owrt/ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-setup.c --- linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-setup.c 2008-04-28 21:07:16.000000000 +0200 -@@ -0,0 +1,280 @@ +@@ -0,0 +1,250 @@ +/* + * arch/arm/mach-ixp4xx/cambria-setup.c + * @@ -303,35 +303,6 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c linux-2.6.24.5-owr + &cambria_eth[1], +}; + -+static char cambria_rtc_probe[] __initdata = "rtc-ds1672.probe=0,0x68 "; -+ -+static void __init cambria_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(cambria_rtc_probe) + strlen(p) + 1 + 4) >> 2; -+ strlcpy(t->u.cmdline.cmdline, cambria_rtc_probe, COMMAND_LINE_SIZE); -+ strlcpy(t->u.cmdline.cmdline + strlen(cambria_rtc_probe), p, -+ COMMAND_LINE_SIZE - strlen(cambria_rtc_probe)); -+ -+ /* Terminate the table. */ -+ t = tag_next(t); -+ t->hdr.tag = ATAG_NONE; -+ t->hdr.size = 0; -+} -+ +#ifdef CONFIG_SENSORS_EEPROM +static int cambria_eeprom_do(struct notifier_block *self, unsigned long event, void *t) +{ @@ -398,7 +369,6 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c linux-2.6.24.5-owr + /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ + .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, + .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, -+ .fixup = cambria_fixup, + .map_io = ixp4xx_map_io, + .init_irq = ixp4xx_init_irq, + .timer = &ixp4xx_timer, |