From patchwork Tue Dec 6 13:48:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabien Parent X-Patchwork-Id: 703153 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 3tY2zS0HShz9vg4 for ; Wed, 7 Dec 2016 00:49:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="aONUxxsy"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EAC4FA75C6; Tue, 6 Dec 2016 14:49:00 +0100 (CET) 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 l_3A3oBz2sWo; Tue, 6 Dec 2016 14:49:00 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 33FBEA75D2; Tue, 6 Dec 2016 14:48:55 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 98A6EA7599 for ; Tue, 6 Dec 2016 14:48:51 +0100 (CET) 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 hg1sBCjBUqjj for ; Tue, 6 Dec 2016 14:48:51 +0100 (CET) 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-wj0-f174.google.com (mail-wj0-f174.google.com [209.85.210.174]) by theia.denx.de (Postfix) with ESMTPS id 6A54BA7573 for ; Tue, 6 Dec 2016 14:48:48 +0100 (CET) Received: by mail-wj0-f174.google.com with SMTP id xy5so321676018wjc.0 for ; Tue, 06 Dec 2016 05:48:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v62fnebogv4g7vGI+ynAJBWNY9DHUNlhf17zSJYE6/4=; b=aONUxxsyOZD+zHcEJMgo7eM5FhrYSHmWkxUSUpdXBlHVTXkuBWTy/pTdOIplcpQvvx pxw/jhsutVBU42HL9RULye8oJZS2A60yvPcG+s3ev2dvKMuGoGG0p6JTepW5QM53YHOe B0gMZAH96WUecEu+Q19sI6VLpTS3jglre3UQQXcbm1EXVZx3L0GYs4HuwqaCm22vyxvr 3UkLnoCcuuhvjmDhaiD1+C+xwA1qqJxoPK2q6nsEKvesOGDQTxVOibfoS5AJBlzRCi2j ZbSwoxikoYxhVvMZNTQqX2p3uqJWiTI/a7+Rhp/ordcVVWAChsD8e3gHG1435CgFk5hs uFPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v62fnebogv4g7vGI+ynAJBWNY9DHUNlhf17zSJYE6/4=; b=VSHmd7nuWVJSWuD/m69Mt13GZJJda0YN0ngt7+8xzgrUPPoRHJSUM/JVApjc4olnAW AoHsWCbvu4J/77dD8dT6jPehZzAWlYT9vEE9XrAjIHGdiYbVZktI8rKf/UZTh5sjumSQ 4HM8wllKL+G+DxNqB7wDU9Qo1R7G64Aom4c1b6KB8p5+ulsDwt4oCECBf9gm04oTi/JC /Ts2OoBw97oVlm44AXSfscGnX1cpdI6SrE6AWMoge7m8FpAZ4R1RXGxQCuNeikX2n9WA m4Nvrrc+BvXOZwb2qI+majlm4OVFjCiY+mYhTqAWByXki+NRT+rb6YRaiOz+mXY1cMUp dAGw== X-Gm-Message-State: AKaTC01CqmrjchAinDOlFjrt7M9bDYKm0/DdEjr0o3IIvh8yZFt9I0cxkR6uByVBWaYS2XZD X-Received: by 10.194.136.166 with SMTP id qb6mr52851450wjb.42.1481032127414; Tue, 06 Dec 2016 05:48:47 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id c81sm4084080wmf.22.2016.12.06.05.48.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2016 05:48:46 -0800 (PST) From: Fabien Parent To: u-boot@lists.denx.de Date: Tue, 6 Dec 2016 14:48:28 +0100 Message-Id: <20161206134830.22130-2-fparent@baylibre.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161206134830.22130-1-fparent@baylibre.com> References: <20161206134830.22130-1-fparent@baylibre.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 1/3] davinci: spl: use correct macro to select boot device X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The macro used to select the boot device is not the intended one. It should be CONFIG_SPL_NAND_LOAD and not CONFIG_SPL_NAND_SIMPLE. Using the correct config option will help move them to Kconfig option. Every davinci board that use the SPL are defining both CONFIG_SPL_NAND_LOAD and CONFIG_SPL_NAND_SIMPLE at the same place, so there should be no issue created by this change. Signed-off-by: Fabien Parent --- arch/arm/mach-davinci/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c index 0aeaa7d8b7..9d5a173701 100644 --- a/arch/arm/mach-davinci/spl.c +++ b/arch/arm/mach-davinci/spl.c @@ -52,7 +52,7 @@ u32 spl_boot_mode(const u32 boot_device) u32 spl_boot_device(void) { -#ifdef CONFIG_SPL_NAND_SIMPLE +#ifdef CONFIG_SPL_NAND_LOAD return BOOT_DEVICE_NAND; #elif defined(CONFIG_SPL_SPI_LOAD) return BOOT_DEVICE_SPI;