From patchwork Tue Jul 2 08:32:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1126068 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=socionext.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="poZ0NVb4"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45dHp76VBLz9s00 for ; Tue, 2 Jul 2019 18:43:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 933B4C21E0F; Tue, 2 Jul 2019 08:37:53 +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.0 required=5.0 tests=T_DKIM_INVALID 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 02C2AC21E44; Tue, 2 Jul 2019 08:34:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D21B1C21E1D; Tue, 2 Jul 2019 08:33:13 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id 85C81C21D56 for ; Tue, 2 Jul 2019 08:33:06 +0000 (UTC) Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x628Wdx2022428; Tue, 2 Jul 2019 17:32:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x628Wdx2022428 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562056365; bh=PsWpJN7AuZqQnYZADe09lOg5eY+caOhPN2/UFNi6y5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=poZ0NVb4hoT+jUClfgnoLi/ffvJ+5oBsOD8WpviaP3qE7MyxCbzKEm5On+78vxWe5 mX2FcOSKLP2+7F7vPF0obUA6Zfj7BI36DtaSLJ6uIxlAfUf6A5bolj9FIQD2YgepRF H+xaOtzh/M0vIuWHbUPkWHgP8a/3zbClfh8Zr5vXU2rdySl65xQLQ6AI8z6hZ66TY2 7B3cKR2PlN0KldarmbgOR5zus/nP9aAypAZ/5/mndtP8lKCUro4bm1TTj8yDdh+HbB QUHxg5GOFLXCqnCZVzh3nUd1NBa6Emhl6SSwD220GbjL+UofdBFhBhx2kUqd2tEYaC oBRvC6BPaOIzw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 2 Jul 2019 17:32:21 +0900 Message-Id: <20190702083228.16882-11-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190702083228.16882-1-yamada.masahiro@socionext.com> References: <20190702083228.16882-1-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 11/18] ARM: uniphier: detect SD boot mode 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The planned new SoC supports the SD boot mode. Detect and display it. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/board_late_init.c | 4 ++++ arch/arm/mach-uniphier/boot-device/boot-device.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 972dbe8ae553..86b128a91f95 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -68,6 +68,10 @@ int board_late_init(void) printf("eMMC Boot"); env_set("bootdev", "emmc"); break; + case BOOT_DEVICE_MMC2: + printf("SD Boot"); + env_set("bootdev", "sd"); + break; case BOOT_DEVICE_NAND: printf("NAND Boot"); env_set("bootdev", "nand"); diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c index 4533aff70df7..b0b39d8e02d4 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device.c @@ -21,6 +21,7 @@ struct uniphier_boot_device_info { unsigned int boot_device_sel_shift; const struct uniphier_boot_device *boot_device_table; const unsigned int *boot_device_count; + int (*boot_device_is_sd)(void); int (*boot_device_is_usb)(void); unsigned int (*boot_device_fixup)(unsigned int mode); int (*boot_is_swapped)(void); @@ -137,6 +138,9 @@ static unsigned int __uniphier_boot_device_raw( if (info->boot_is_swapped && info->boot_is_swapped()) return BOOT_DEVICE_NOR; + if (info->boot_device_is_sd && info->boot_device_is_sd()) + return BOOT_DEVICE_MMC2; + if (info->boot_device_is_usb && info->boot_device_is_usb()) return BOOT_DEVICE_USB; @@ -218,6 +222,10 @@ static int do_pinmon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("Boot Swap: %s\n", info->boot_is_swapped() ? "ON" : "OFF"); + if (info->boot_device_is_sd) + printf("SD Boot: %s\n", + info->boot_device_is_sd() ? "ON" : "OFF"); + if (info->boot_device_is_usb) printf("USB Boot: %s\n", info->boot_device_is_usb() ? "ON" : "OFF");