From patchwork Mon Jun 8 21:24:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 482011 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 86C2C140213 for ; Tue, 9 Jun 2015 07:25:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 441A84B6DA; Mon, 8 Jun 2015 23:25:24 +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 kbAb9_7e7HF7; Mon, 8 Jun 2015 23:25:24 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5FAA24B6DE; Mon, 8 Jun 2015 23:25:20 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8991F4B6B3 for ; Mon, 8 Jun 2015 23:25:18 +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 Xf_i5xsRhTyU for ; Mon, 8 Jun 2015 23:25:18 +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 gagarine.paulk.fr (gagarine.paulk.fr [109.190.93.129]) by theia.denx.de (Postfix) with ESMTPS id 585CF4B693 for ; Mon, 8 Jun 2015 23:25:15 +0200 (CEST) Received: by gagarine.paulk.fr (Postfix, from userid 65534) id D3FA51FE57; Mon, 8 Jun 2015 23:25:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on gagarine.paulk.fr X-Spam-Level: * X-Spam-Status: No, score=1.3 required=5.0 tests=RDNS_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from armstrong.paulk.fr (armstrong.paulk.fr [82.233.88.171]) by gagarine.paulk.fr (Postfix) with ESMTPS id 654141FE59; Mon, 8 Jun 2015 23:24:39 +0200 (CEST) Received: from localhost.localdomain (unknown [192.168.0.2]) by armstrong.paulk.fr (Postfix) with ESMTP id 5526337829; Mon, 8 Jun 2015 23:24:37 +0200 (CEST) From: Paul Kocialkowski To: u-boot@lists.denx.de Date: Mon, 8 Jun 2015 23:24:21 +0200 Message-Id: <1433798667-9171-4-git-send-email-contact@paulk.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433798667-9171-1-git-send-email-contact@paulk.fr> References: <1433351007-1704-2-git-send-email-contact@paulk.fr> <1433798667-9171-1-git-send-email-contact@paulk.fr> Cc: Marek Vasut , Tom Rini , =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [U-Boot] [PATCH v2 3/8] omap-common: Boot device define instead of hardcoded value 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" Now that SPL boot devices are clearly defined, we can use BOOT_DEVICE_QSPI_4 instead of a hardcoded value. Signed-off-by: Paul Kocialkowski --- arch/arm/cpu/armv7/omap-common/boot-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 10714d7..944b6e4 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -48,14 +48,14 @@ void save_omap_boot_params(void) if (boot_device == BOOT_DEVICE_NAND_I2C) boot_device = BOOT_DEVICE_NAND; #endif -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#ifdef BOOT_DEVICE_QSPI_4 /* * We get different values for QSPI_1 and QSPI_4 being used, but * don't actually care about this difference. Rather than * mangle the later code, if we're coming in as QSPI_4 just * change to the QSPI_1 value. */ - if (boot_device == 11) + if (boot_device == BOOT_DEVICE_QSPI_4) boot_device = BOOT_DEVICE_SPI; #endif