You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c
|
|
--- linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:12:03.000000000 +0100
|
|
+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:11:34.000000000 +0100
|
|
@@ -100,6 +100,36 @@
|
|
&wg302_eth[0],
|
|
};
|
|
|
|
+static char wg302v1_mem_fixup[] __initdata = "mem=32M ";
|
|
+
|
|
+static void __init wg302v1_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(wg302v1_mem_fixup) + strlen(p) + 1 + 4) >> 2;
|
|
+ strlcpy(t->u.cmdline.cmdline, wg302v1_mem_fixup, COMMAND_LINE_SIZE);
|
|
+ strlcpy(t->u.cmdline.cmdline + strlen(wg302v1_mem_fixup), p,
|
|
+ COMMAND_LINE_SIZE - strlen(wg302v1_mem_fixup));
|
|
+
|
|
+ /* Terminate the table. */
|
|
+ t = tag_next(t);
|
|
+ t->hdr.tag = ATAG_NONE;
|
|
+ t->hdr.size = 0;
|
|
+}
|
|
+
|
|
static void __init wg302v1_init(void)
|
|
{
|
|
ixp4xx_sys_init();
|
|
@@ -118,6 +148,7 @@
|
|
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
|
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
|
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
|
+ .fixup = wg302v1_fixup,
|
|
.map_io = ixp4xx_map_io,
|
|
.init_irq = ixp4xx_init_irq,
|
|
.timer = &ixp4xx_timer,
|