From patchwork Fri Sep 6 13:04:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Bie=C3=9Fmann?= X-Patchwork-Id: 273181 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 21A332C0106 for ; Fri, 6 Sep 2013 23:04:07 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5F43B4A05F; Fri, 6 Sep 2013 15:03:57 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f-r65vEvHSBN; Fri, 6 Sep 2013 15:03:57 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 486C34A0A2; Fri, 6 Sep 2013 15:03:36 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2B0CA4A062 for ; Fri, 6 Sep 2013 15:03:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G3KB0Az0J2Nd for ; Fri, 6 Sep 2013 15:03:22 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-bk0-f49.google.com (mail-bk0-f49.google.com [209.85.214.49]) by theia.denx.de (Postfix) with ESMTPS id 486E94A099 for ; Fri, 6 Sep 2013 15:03:11 +0200 (CEST) Received: by mail-bk0-f49.google.com with SMTP id r7so1273442bkg.36 for ; Fri, 06 Sep 2013 06:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=NaI9VyT6icYG8XnZDTi1tY9FAzRac6plJk140MSnxiU=; b=ojro7gBICLhw6SNNyiUxTyf7V/R88nJMaoCcAtKwkJsKWY0JO7apvreqanM4/WxG3/ W8SSuAlUGGSdy/56n2MigD5zWRLhzcktND3SXWjR8VMdSbqzaifYe+TfYlnIenE+eZlx f+EkpQdkWzMyG5m4tdgvWy2/EPqotz45VqmMDvvE7L6zDcFN5L3lwVy4wqccobms7EMl vqDuzEDhurFVw5YCVI03mGbZ+qTa4/DRvUw9l5rARjbzzMa17um7elXj5kXeyK4UntqF sXMagYo+HKZ0EUx28XqTqldK19qSSNbwNuM4ubhTEetSwNu5KyAkkeWAkkrF88zvwECy 4VLw== X-Received: by 10.204.232.207 with SMTP id jv15mr1671127bkb.39.1378472590860; Fri, 06 Sep 2013 06:03:10 -0700 (PDT) Received: from localhost ([2a01:198:47b:1:210:75ff:fe1a:cd1e]) by mx.google.com with ESMTPSA id m6sm679118bki.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 06 Sep 2013 06:03:10 -0700 (PDT) From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= To: u-boot@lists.denx.de Date: Fri, 6 Sep 2013 15:04:51 +0200 Message-Id: <1378472698-18557-6-git-send-email-andreas.devel@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1378472698-18557-1-git-send-email-andreas.devel@googlemail.com> References: <1378472698-18557-1-git-send-email-andreas.devel@googlemail.com> MIME-Version: 1.0 Cc: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= , Thomas Weber Subject: [U-Boot] [PATCH 06/13] tricorder: add mtdparts to environment X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Andreas Bießmann 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 --- include/configs/tricorder.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index b2642a4..abd5bb3 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 " \