[U-Boot,5/5] imx: mx6ullevk: correct boot device macro

Message ID	1474257344-12962-5-git-send-email-peng.fan@nxp.com
State	Accepted
Commit	ab1f75a7dbb9a9f6084eb858860179308445189f
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: van.freenix@gmail.com To: sbabic@denx.de Date: Mon, 19 Sep 2016 11:55:44 +0800 Message-Id: <1474257344-12962-5-git-send-email-peng.fan@nxp.com> In-Reply-To: <1474257344-12962-1-git-send-email-peng.fan@nxp.com> References: <1474257344-12962-1-git-send-email-peng.fan@nxp.com> Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 5/5] imx: mx6ullevk: correct boot device macro Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Message ID

1474257344-12962-5-git-send-email-peng.fan@nxp.com

State

Accepted

Commit

ab1f75a7dbb9a9f6084eb858860179308445189f

Delegated to:

Tom Rini

Headers

show

Return-Path: <u-boot-bounces@lists.denx.de>
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 3scsX773Wxz9s5w
	for <incoming@patchwork.ozlabs.org>;
	Mon, 19 Sep 2016 13:56:55 +1000 (AEST)
Authentication-Results: ozlabs.org;
	dkim=fail reason="signature verification failed" (2048-bit key;
	unprotected) header.d=gmail.com header.i=@gmail.com header.b=UAmAZFPr;
	dkim-atps=neutral
Received: from localhost (localhost [127.0.0.1])
	by theia.denx.de (Postfix) with ESMTP id 62C02A75D5;
	Mon, 19 Sep 2016 05:56:43 +0200 (CEST)
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 mR05aej8uaUZ; Mon, 19 Sep 2016 05:56:43 +0200 (CEST)
Received: from theia.denx.de (localhost [127.0.0.1])
	by theia.denx.de (Postfix) with ESMTP id 3D8B8A758E;
	Mon, 19 Sep 2016 05:56:33 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by theia.denx.de (Postfix) with ESMTP id 24205A7564
	for <u-boot@lists.denx.de>; Mon, 19 Sep 2016 05:56:25 +0200 (CEST)
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 kPQCHep3i6hw for <u-boot@lists.denx.de>;
	Mon, 19 Sep 2016 05:56:25 +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-pa0-f68.google.com (mail-pa0-f68.google.com
	[209.85.220.68]) by theia.denx.de (Postfix) with ESMTPS id 15AF3A7548
	for <u-boot@lists.denx.de>; Mon, 19 Sep 2016 05:56:21 +0200 (CEST)
Received: by mail-pa0-f68.google.com with SMTP id vz6so6335084pab.1
	for <u-boot@lists.denx.de>; Sun, 18 Sep 2016 20:56:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:to:cc:subject:date:message-id:in-reply-to:references;
	bh=ddKbettAgl0ixUAY13jX6vn8ZvWuocvm0U5mLqJYndk=;
	b=UAmAZFPr0mvNPd9iHmpYwZsVKcoEqd1lKXhl1TubkV00JOyVyI47oT3vOmzGA/AJKq
	eBBxrhky6n84bOsOCL3baT6nPYzPYplI5AMaNdAng6KLHvLEBzWUomxg/lCx+1XZFEVK
	yM9JqHChJIRqLQqJfyagPC0tVt1Hphljbi5bOHHQBQBYowqYQiu3w+2gAOxtnVtiq2o4
	eAlCygFq8TFWzwHr8n47PId+Owv1VnC59R2KvTAH8b+z1YwZzf937IDiGIKknn68wsPO
	7a/zT+QbbVaAtLVUsPwKicq5cYcxjVeVqZC5h9h4OFHpFOdOvfWRI2dowl37sVpaJjOw
	8Lfg==
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=ddKbettAgl0ixUAY13jX6vn8ZvWuocvm0U5mLqJYndk=;
	b=Y19W6AnSikj/PYz12eg/fS3KpWcBwtW7iOf+sgHg006VxR0VyVXReT/42cQMmRNc30
	xRnpXj1p6vx9fKxg6QMS58mft8GG5ARzA95D7gIivIriSfg5lub2LcwU7qGFT6Sy/LCw
	i63c8T7LCnrYJhJsnoVelusi7BlHkjJIJeUQWtUe3djLPtcGb/SFbIGDfbjayiE7da1m
	1pQZ3w9HMjiU/5p8OZMqN05aDnUdLgbr5y9+3W/ImSuIe+yf06NVcm5C6ag7M4ANNL4E
	pKoJhWcNZ5K9kKqPmNK6ykEeqvVKrx/dtEhhFFNfjSBrwDwPI75GSYmHRKjuK9KEEOEt
	lkSQ==
X-Gm-Message-State: AE9vXwPOy0WeeOyZO+g57zzM5Wft75Zj1N6z/xS3U15r6EiMd8p6FCcduYguq6+Zqz6ZMg==
X-Received: by 10.66.254.10 with SMTP id ae10mr43801506pad.26.1474257380669; 
	Sun, 18 Sep 2016 20:56:20 -0700 (PDT)
Received: from linux-7smt.suse (gate-zmy3.freescale.com. [192.88.167.1])
	by smtp.gmail.com with ESMTPSA id
	y2sm27103195pan.31.2016.09.18.20.56.18
	(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
	Sun, 18 Sep 2016 20:56:20 -0700 (PDT)
From: van.freenix@gmail.com
X-Google-Original-From: peng.fan@nxp.com
To: sbabic@denx.de
Date: Mon, 19 Sep 2016 11:55:44 +0800
Message-Id: <1474257344-12962-5-git-send-email-peng.fan@nxp.com>
X-Mailer: git-send-email 2.6.2
In-Reply-To: <1474257344-12962-1-git-send-email-peng.fan@nxp.com>
References: <1474257344-12962-1-git-send-email-peng.fan@nxp.com>
Cc: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 5/5] imx: mx6ullevk: correct boot device macro
X-BeenThere: u-boot@lists.denx.de
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: U-Boot discussion <u-boot.lists.denx.de>
List-Unsubscribe: <http://lists.denx.de/mailman/options/u-boot>,
	<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
List-Archive: <http://lists.denx.de/pipermail/u-boot/>
List-Post: <mailto:u-boot@lists.denx.de>
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
List-Subscribe: <http://lists.denx.de/mailman/listinfo/u-boot>,
	<mailto:u-boot-request@lists.denx.de?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Commit Message

Peng Fan Sept. 19, 2016, 3:55 a.m. UTC

From: Peng Fan <peng.fan@nxp.com>

Correct boot device macro according to kconfig entry
in common/Kconfig

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 board/freescale/mx6ullevk/imximage.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/freescale/mx6ullevk/imximage.cfg b/board/freescale/mx6ullevk/imximage.cfg
index 4604b62..e78e839 100644
--- a/board/freescale/mx6ullevk/imximage.cfg
+++ b/board/freescale/mx6ullevk/imximage.cfg
@@ -21,9 +21,9 @@  IMAGE_VERSION 2
  * spi/sd/nand/onenand, qspi/nor
  */
 
-#ifdef CONFIG_SYS_BOOT_QSPI
+#ifdef CONFIG_QSPI_BOOT
 BOOT_FROM	qspi
-#elif defined(CONFIG_SYS_BOOT_EIMNOR)
+#elif defined(CONFIG_NOR_BOOT)
 BOOT_FROM	nor
 #else
 BOOT_FROM	sd

[U-Boot,5/5] imx: mx6ullevk: correct boot device macro

Commit Message

Patch