summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorSesahgiri.Holi <seshagiri.holi@stericsson.com>2011-06-02 10:12:35 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2011-12-06 11:00:59 +0100
commitad430828f1c83f9358e19361d8a1806c87806d19 (patch)
tree0423d3617ac9c447950f00fbc5b43be267fda097 /arch/arm
parent3ce21a2330d52a43f36fba7a75ceb2ebf9712405 (diff)
mach-ux500: Adapt mloader to new mem layout
ST-Ericsson ID: AP 340293 ST-Ericsson FOSS-OUT ID: NA Signed-off-by: Sesahgiri.Holi <seshagiri.holi@stericsson.com> Change-Id: I6e470258e5d0794649bdbfa8fe469984531f8051 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24505 Reviewed-by: Martin PERSSON <martin.persson@stericsson.com> Reviewed-by: QATEST Reviewed-by: Preetham-rao K <preetham.rao@stericsson.com> Tested-by: Preetham-rao K <preetham.rao@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ux500/mloader-db5500.c28
1 files changed, 7 insertions, 21 deletions
diff --git a/arch/arm/mach-ux500/mloader-db5500.c b/arch/arm/mach-ux500/mloader-db5500.c
index 946a0ff490d..7798a1646d4 100644
--- a/arch/arm/mach-ux500/mloader-db5500.c
+++ b/arch/arm/mach-ux500/mloader-db5500.c
@@ -31,29 +31,15 @@ static unsigned int db5500_mloader_shm_total_size;
module_param_named(shm_total_size, db5500_mloader_shm_total_size, uint, 0600);
MODULE_PARM_DESC(shm_total_size, "Total Size of SHM shared memory");
-static int __init db5500_bootargs_memmap(char *str)
+static int __init db5500_bootargs_modem_memmap(char *p)
{
- char start_val_str[10];
- char *next_val_str;
- int ret;
-
- next_val_str = strchr(str, '$');
- if (next_val_str == NULL)
- return -EINVAL;
- strncpy(start_val_str, str, next_val_str - str);
- ret = strict_strtoul(start_val_str, 0,
- &db5500_bootargs_memmap_modem_total_size);
- if (ret < 0)
- return -EINVAL;
+ db5500_bootargs_memmap_modem_total_size = memparse(p, &p);
+ if (*p == '@')
+ db5500_bootargs_memmap_modem_start = memparse(p + 1, &p);
- ret = strict_strtoul(next_val_str + 1, 0,
- &db5500_bootargs_memmap_modem_start);
- if (ret < 0)
- return -EINVAL;
-
- return 1;
+ return 0;
}
-__setup("memmap=", db5500_bootargs_memmap);
+early_param("mem_modem", db5500_bootargs_modem_memmap);
static int __init db5500_bootargs_shm_total_size(char *str)
{
@@ -63,7 +49,7 @@ static int __init db5500_bootargs_shm_total_size(char *str)
return -EINVAL;
return 1;
}
-__setup("mloader.shm_total_size=", db5500_bootargs_shm_total_size);
+early_param("mloader.shm_total_size", db5500_bootargs_shm_total_size);
static int __exit db5500_mloader_remove(struct platform_device *pdev)
{