summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-10-10 08:31:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-10-10 08:31:06 +0200
commitc80ba33cbe1eb2331a0544d0f553d73e091bb322 (patch)
treea2f6af60504bdef24872470cd57a28e007520cd2 /arch/arm/boards
parentc5fc5de3fe5c0ab41d1b81ee5bf24ea8fedfe307 (diff)
parentcc532a3f733718526898c14f8137118b7d76a5bc (diff)
downloadbarebox-c80ba33cbe1eb2331a0544d0f553d73e091bb322.tar.gz
barebox-c80ba33cbe1eb2331a0544d0f553d73e091bb322.tar.xz
Merge branch 'for-next/bootchooser'
Diffstat (limited to 'arch/arm/boards')
-rw-r--r--arch/arm/boards/at91sam9m10ihd/env/boot/android2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/at91sam9m10ihd/env/boot/android b/arch/arm/boards/at91sam9m10ihd/env/boot/android
index 8492e41f7f..ce5aa32353 100644
--- a/arch/arm/boards/at91sam9m10ihd/env/boot/android
+++ b/arch/arm/boards/at91sam9m10ihd/env/boot/android
@@ -3,4 +3,4 @@
global.bootm.image="/dev/nand0.kernel.bb"
global.linux.bootargs.dyn.root="root=/dev/mtdblock1 rootfstype=jffs2 rw init=/init rootdelay=1"
# clean the mtdparts otherwise android does not boot
-global -r linux.mtdparts.
+global -r "linux.mtdparts.*"