From patchwork Tue Sep 12 20:02:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 112385 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp35992qgf; Tue, 12 Sep 2017 13:03:48 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4cKFGeYHcSsOFrWrseGgc5iZ9+DWo06BqySIIj4Q9P6qiHrCzCj4LJ0lKEPU/6sFZ7uNgV X-Received: by 10.80.190.13 with SMTP id a13mr13271705edi.2.1505246628788; Tue, 12 Sep 2017 13:03:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505246628; cv=none; d=google.com; s=arc-20160816; b=cBdmFFu6izl/VQrvoMDN5vjQFWPt+MZ9SxRT4n9ejubp905mJhO5hspxwLA8LBeKOp gTpJ/0L1oIk6PaS1Ck8gCJAUoC87W5gXUuPezOW4V1WjF23uEoiOqgpOBe4FTjbLPAGC EEFL5c74VKI/+oBAOp+Sm4xEHM/BBnJlgSjl11VepkKofuxjJD+wmEE/OHqQhfFZxkcz bJ4ZRBmn/j4NbiYzpg3K1xsHJWTvpGmB2cWy9cVqnOJjQkbRRuKeCwtW30ZUIOPIqBoL whk/MOKvIfHESDEuIOJnKhkhCi2IiI4b92zTrYS0PzEtxGKF+KUSUfs0Vl76dlhn6CRt xDFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:arc-authentication-results; bh=1EIj89vKZrGTiXZ6nYE8RubClNW5m/a8IWEQAGICJHc=; b=E+QJ3fASsP5iEDIFYqIOQWZCiAwyd9hEI9grb0Fi1c621K8MC6ds3pARNZbPDVHep4 r6mn242eeTPNqL+5kPUQ/xL1US89vygoE1SojAwWprg99ZXQSHu4dluuTiwKm0hP3vvE nBhfgkWw16DVEV72B74MEhwQjdv3+mPFV2nPrNJxOg7uGTXysNgW0zW/R8cEdCFjFNaw LNTt+29hfwV01hcT2zwsLqKEumn6qwtASrX+HfAKoca1qdS7s4MFL92U2fNw4wzy0z7d J8aN1Olk7nJPIA6/ekdUwWboiCUeUk9mw/YEwq6YnUIgia0dnD168x/+wn8gBTqco+hu f5BA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id p8si6465054edh.42.2017.09.12.13.03.48; Tue, 12 Sep 2017 13:03:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 213B5C221E8; Tue, 12 Sep 2017 20:02:45 +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=none 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 8B1AFC2210B; Tue, 12 Sep 2017 20:02:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DED3FC22080; Tue, 12 Sep 2017 20:02:28 +0000 (UTC) Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by lists.denx.de (Postfix) with ESMTP id 6455CC21F97 for ; Tue, 12 Sep 2017 20:02:28 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 3613820846; Tue, 12 Sep 2017 22:02:28 +0200 (CEST) Received: from localhost (LFbn-TOU-1-209-191.w86-201.abo.wanadoo.fr [86.201.56.191]) by mail.free-electrons.com (Postfix) with ESMTPSA id 0BE2320834; Tue, 12 Sep 2017 22:02:28 +0200 (CEST) From: Maxime Ripard To: Tom Rini Date: Tue, 12 Sep 2017 22:02:22 +0200 Message-Id: <7c8317f3ea8169b31efb21440441eac5875a9f37.1505246502.git-series.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: References: In-Reply-To: References: Cc: u-boot@lists.denx.de, Jagan Teki , Maxime Ripard Subject: [U-Boot] [PATCH v2 1/3] arm: sunxi: Move spl_boot_device in a separate function 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" U-Boot itself might need to identify the boot device, for example to be able to tell where to load the kernel from when several options are possible. Move the logic of spl_boot_device to a function that is compiled both for the SPL and the main binary. Tested-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard --- arch/arm/include/asm/arch-sunxi/spl.h | 2 ++ arch/arm/mach-sunxi/board.c | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-sunxi/spl.h b/arch/arm/include/asm/arch-sunxi/spl.h index 9358397da27a..a70b1797e5d7 100644 --- a/arch/arm/include/asm/arch-sunxi/spl.h +++ b/arch/arm/include/asm/arch-sunxi/spl.h @@ -78,4 +78,6 @@ typedef char boot_file_head_not_multiple_of_32[1 - 2*(sizeof(struct boot_file_he #define is_boot0_magic(addr) (memcmp((void *)addr, BOOT0_MAGIC, 8) == 0) +uint32_t sunxi_get_boot_device(void); + #endif diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 65b1ebd83787..0c60ee04da54 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -14,9 +14,7 @@ #include #include #include -#ifdef CONFIG_SPL_BUILD #include -#endif #include #include #include @@ -212,11 +210,12 @@ void s_init(void) #ifdef CONFIG_SPL_BUILD DECLARE_GLOBAL_DATA_PTR; +#endif /* The sunxi internal brom will try to loader external bootloader * from mmc0, nand flash, mmc2. */ -u32 spl_boot_device(void) +uint32_t sunxi_get_boot_device(void) { int boot_source; @@ -255,6 +254,12 @@ u32 spl_boot_device(void) return -1; /* Never reached */ } +#ifdef CONFIG_SPL_BUILD +u32 spl_boot_device(void) +{ + return sunxi_get_boot_device(); +} + /* No confirmation data available in SPL yet. Hardcode bootmode */ u32 spl_boot_mode(const u32 boot_device) {