From: Andreas Bießmann <andreas.biessmann@corscience.de>
Date: Fri, 6 Sep 2013 13:04:51 +0000 (+0200)
Subject: tricorder: add mtdparts to environment
X-Git-Tag: v2014.01-rc1~77^2~19
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=deac6d664b3149ff0b44676c345303dad62b74b5

tricorder: add mtdparts to environment

Before we always ran 'mtdparts default' which also set the mtdparts and mtdids
environment. But if we changed that values by intention we will overwrite
them with our default values. This is obviously bad!

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
---

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 6d93cb0b2d..ec900e59d3 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -160,6 +160,8 @@
 	"vram=3M\0" \
 	"defaultdisplay=lcd\0" \
 	"kernelopts=mtdoops.mtddev=3\0" \
+	"mtdparts=" MTDPARTS_DEFAULT "\0" \
+	"mtdids=" MTDIDS_DEFAULT "\0" \
 	"commonargs=" \
 		"setenv bootargs console=${console} " \
 		"${mtdparts} " \
@@ -188,7 +190,6 @@
 	CONFIG_COMMON_ENV_SETTINGS \
 	CONFIG_ENV_RDADDR \
 	"autoboot=" \
-	"mtdparts default; " \
 	"run commonargs; " \
 	"setenv bootargs ${bootargs} " \
 		"flashy_updateimg=/dev/mmcblk0p1:corscience_update.img " \
@@ -226,16 +227,14 @@
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
 		"bootm ${loadaddr}\0" \
-	"loaduimage_ubi=mtd default; " \
-		"ubi part ubi; " \
+	"loaduimage_ubi=ubi part ubi; " \
 		"ubifsmount ubi:root; " \
 		"ubifsload ${loadaddr} /boot/uImage\0" \
 	"nandboot=echo Booting from nand ...; " \
 		"run nandargs; " \
 		"run loaduimage_ubi; " \
 		"bootm ${loadaddr}\0" \
-	"autoboot=mtdparts default;" \
-			"mmc dev ${mmcdev}; if mmc rescan; then " \
+	"autoboot=mmc dev ${mmcdev}; if mmc rescan; then " \
 			"if run loadbootscript; then " \
 				"run bootscript; " \
 			"else " \