summaryrefslogtreecommitdiffstats
path: root/defaultenv
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2011-02-15 14:49:32 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-03-03 16:15:51 +0100
commit1194e279d6bb68250fbf8c1dc8dcd961523c1352 (patch)
tree0642eb7be391f9d1e578f45761f1ffa2967d3c86 /defaultenv
parent51cbd46d9db9db9eeb22acbfe42923763694d905 (diff)
downloadbarebox-1194e279d6bb68250fbf8c1dc8dcd961523c1352.tar.gz
barebox-1194e279d6bb68250fbf8c1dc8dcd961523c1352.tar.xz
Generic environment: Fix assembling of the 'mtdparts' variable
The semicolon is a delimiter, not an end marker. With a trailing semicolon the kernel give the confusing message: mtd: no mtd-id With this patch, a semicolon gets added on demand only. Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'defaultenv')
-rw-r--r--defaultenv/bin/boot7
1 files changed, 5 insertions, 2 deletions
diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index 788a78115..7497791c0 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -46,11 +46,14 @@ else
fi
if [ -n $nor_parts ]; then
- mtdparts="${mtdparts}physmap-flash.0:${nor_parts};"
+ mtdparts="${mtdparts}physmap-flash.0:${nor_parts}"
fi
if [ -n $nand_parts ]; then
- mtdparts="${mtdparts}${nand_device}:${nand_parts};"
+ if [ -n ${mtdparts} ]; then
+ mtdparts="${mtdparts};"
+ fi
+ mtdparts="${mtdparts}${nand_device}:${nand_parts}"
fi
if [ -n $mtdparts ]; then