2012-03-25 08:50:09 +00:00
|
|
|
From 3be934b64f874e6cd2af7945f4fc441c7fadb34f Mon Sep 17 00:00:00 2001
|
2011-10-10 15:13:46 +00:00
|
|
|
From: John Crispin <blogic@openwrt.org>
|
|
|
|
|
Date: Fri, 12 Aug 2011 16:27:38 +0200
|
2012-03-25 08:50:09 +00:00
|
|
|
Subject: [PATCH 12/70] MIPS: lantiq: fix cmdline parsing
|
2011-10-10 15:13:46 +00:00
|
|
|
|
|
|
|
|
The code tested if the KSEG1 mapped address of argv was != 0. We need to use
|
|
|
|
|
CPHYSADDR instead to make the conditional actually work.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
|
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
|
|
|
---
|
|
|
|
|
arch/mips/lantiq/prom.c | 6 ++++--
|
|
|
|
|
1 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/arch/mips/lantiq/prom.c
|
|
|
|
|
+++ b/arch/mips/lantiq/prom.c
|
2012-04-01 07:56:55 +00:00
|
|
|
@@ -49,10 +49,12 @@ static void __init prom_init_cmdline(voi
|
2011-10-10 15:13:46 +00:00
|
|
|
char **argv = (char **) KSEG1ADDR(fw_arg1);
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
+ arcs_cmdline[0] = '\0';
|
|
|
|
|
+
|
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
|
- char *p = (char *) KSEG1ADDR(argv[i]);
|
|
|
|
|
+ char *p = (char *) KSEG1ADDR(argv[i]);
|
|
|
|
|
|
|
|
|
|
- if (p && *p) {
|
|
|
|
|
+ if (CPHYSADDR(p) && *p) {
|
|
|
|
|
strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
|
|
|
|
|
strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
|
|
|
|
|
}
|
