From patchwork Tue May 2 18:27:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 757769 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wHVHx6DSwz9s7j for ; Wed, 3 May 2017 04:31:57 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 93724C21C5E; Tue, 2 May 2017 18:30:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D7F9BC21CBB; Tue, 2 May 2017 18:28:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 14613C21CBC; Tue, 2 May 2017 18:28:21 +0000 (UTC) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by lists.denx.de (Postfix) with ESMTPS id A7135C21C62 for ; Tue, 2 May 2017 18:28:15 +0000 (UTC) Received: from mail.nefkom.net (unknown [192.168.6.184]) by mail-out.m-online.net (Postfix) with ESMTP id 3wHVCg3SH4z1qsdy; Tue, 2 May 2017 20:28:15 +0200 (CEST) X-Auth-Info: HXHXXlC0bJPCv5ApSlhCudSnD0IqfaFwv6bB3x4Rtbs= Received: from kurokawa.lan (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3wHVCg15CXzvdWQ; Tue, 2 May 2017 20:28:15 +0200 (CEST) From: Marek Vasut To: u-boot@lists.denx.de Date: Tue, 2 May 2017 20:27:47 +0200 Message-Id: <20170502182750.8907-8-marex@denx.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170502182750.8907-1-marex@denx.de> References: <20170502182750.8907-1-marex@denx.de> MIME-Version: 1.0 Cc: Marek Vasut Subject: [U-Boot] [PATCH 08/11] ARM: at91: ma5d4: Boot from MMC2 when using SAM-BA X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Continue loading U-Boot from MMC2 when the SPL was loaded using SAM-BA loader. This allows the board to boot system from the removable media instead of the eMMC, which is useful for commissioning purposes. When booting from the eMMC, always boot from it as it is not possible to boot from the SD interface directly. Signed-off-by: Marek Vasut Cc: Andreas Bießmann --- board/aries/ma5d4evk/ma5d4evk.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/board/aries/ma5d4evk/ma5d4evk.c b/board/aries/ma5d4evk/ma5d4evk.c index 0293b29d0e..6393948c49 100644 --- a/board/aries/ma5d4evk/ma5d4evk.c +++ b/board/aries/ma5d4evk/ma5d4evk.c @@ -22,6 +22,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; @@ -345,6 +346,23 @@ void spl_board_init(void) #endif } +void board_boot_order(u32 *spl_boot_list) +{ + spl_boot_list[0] = spl_boot_device(); + + switch (spl_boot_list[0]) { + case BOOT_DEVICE_MMC1: + case BOOT_DEVICE_MMC2: + spl_boot_list[0] = BOOT_DEVICE_MMC1; + break; + case BOOT_DEVICE_SPI: + break; + case BOOT_DEVICE_USB: + spl_boot_list[0] = BOOT_DEVICE_MMC2; + break; + } +} + static void ddr2_conf(struct atmel_mpddrc_config *ddr2) { ddr2->md = (ATMEL_MPDDRC_MD_DBW_32_BITS | ATMEL_MPDDRC_MD_DDR2_SDRAM);