{"id":813040,"url":"http://patchwork.ozlabs.org/api/patches/813040/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/7c8317f3ea8169b31efb21440441eac5875a9f37.1505246502.git-series.maxime.ripard@free-electrons.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<7c8317f3ea8169b31efb21440441eac5875a9f37.1505246502.git-series.maxime.ripard@free-electrons.com>","list_archive_url":null,"date":"2017-09-12T20:02:22","name":"[U-Boot,v2,1/3] arm: sunxi: Move spl_boot_device in a separate function","commit_ref":"8829076a5b1001ee20009528931383e912496fcd","pull_url":null,"state":"accepted","archived":false,"hash":"13bd2b09da8bc8a9b751c01a026132acea7daf44","submitter":{"id":12916,"url":"http://patchwork.ozlabs.org/api/people/12916/?format=json","name":"Maxime Ripard","email":"maxime.ripard@free-electrons.com"},"delegate":{"id":17739,"url":"http://patchwork.ozlabs.org/api/users/17739/?format=json","username":"jagan","first_name":"Jagannadha Sutradharudu","last_name":"Teki","email":"jagannadh.teki@gmail.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/7c8317f3ea8169b31efb21440441eac5875a9f37.1505246502.git-series.maxime.ripard@free-electrons.com/mbox/","series":[{"id":2765,"url":"http://patchwork.ozlabs.org/api/series/2765/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=2765","date":"2017-09-12T20:02:21","name":"mmc: sunxi: index hack removal","version":2,"mbox":"http://patchwork.ozlabs.org/series/2765/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813040/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813040/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xsG1k0Mdzz9s7f\n\tfor ;\n\tWed, 13 Sep 2017 06:03:06 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid CEF6AC220C5; Tue, 12 Sep 2017 20:02:46 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 8B1AFC2210B;\n\tTue, 12 Sep 2017 20:02:31 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid DED3FC22080; Tue, 12 Sep 2017 20:02:28 +0000 (UTC)","from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54])\n\tby lists.denx.de (Postfix) with ESMTP id 6455CC21F97\n\tfor ; Tue, 12 Sep 2017 20:02:28 +0000 (UTC)","by mail.free-electrons.com (Postfix, from userid 110)\n\tid 3613820846; Tue, 12 Sep 2017 22:02:28 +0200 (CEST)","from localhost (LFbn-TOU-1-209-191.w86-201.abo.wanadoo.fr\n\t[86.201.56.191])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id 0BE2320834;\n\tTue, 12 Sep 2017 22:02:28 +0200 (CEST)"],"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\n\tautolearn_force=no version=3.4.0","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":["",""],"Cc":"u-boot@lists.denx.de, Jagan Teki ,\n\tMaxime Ripard ","Subject":"[U-Boot] [PATCH v2 1/3] arm: sunxi: Move spl_boot_device in a\n\tseparate function","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"U-Boot itself might need to identify the boot device, for example to be\nable to tell where to load the kernel from when several options are\npossible.\n\nMove the logic of spl_boot_device to a function that is compiled both for\nthe SPL and the main binary.\n\nTested-by: Chen-Yu Tsai \nSigned-off-by: Maxime Ripard \n---\n arch/arm/include/asm/arch-sunxi/spl.h | 2 ++\n arch/arm/mach-sunxi/board.c | 11 ++++++++---\n 2 files changed, 10 insertions(+), 3 deletions(-)","diff":"diff --git a/arch/arm/include/asm/arch-sunxi/spl.h b/arch/arm/include/asm/arch-sunxi/spl.h\nindex 9358397da27a..a70b1797e5d7 100644\n--- a/arch/arm/include/asm/arch-sunxi/spl.h\n+++ b/arch/arm/include/asm/arch-sunxi/spl.h\n@@ -78,4 +78,6 @@ typedef char boot_file_head_not_multiple_of_32[1 - 2*(sizeof(struct boot_file_he\n \n #define is_boot0_magic(addr)\t(memcmp((void *)addr, BOOT0_MAGIC, 8) == 0)\n \n+uint32_t sunxi_get_boot_device(void);\n+\n #endif\ndiff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c\nindex 65b1ebd83787..0c60ee04da54 100644\n--- a/arch/arm/mach-sunxi/board.c\n+++ b/arch/arm/mach-sunxi/board.c\n@@ -14,9 +14,7 @@\n #include \n #include \n #include \n-#ifdef CONFIG_SPL_BUILD\n #include \n-#endif\n #include \n #include \n #include \n@@ -212,11 +210,12 @@ void s_init(void)\n \n #ifdef CONFIG_SPL_BUILD\n DECLARE_GLOBAL_DATA_PTR;\n+#endif\n \n /* The sunxi internal brom will try to loader external bootloader\n * from mmc0, nand flash, mmc2.\n */\n-u32 spl_boot_device(void)\n+uint32_t sunxi_get_boot_device(void)\n {\n \tint boot_source;\n \n@@ -255,6 +254,12 @@ u32 spl_boot_device(void)\n \treturn -1;\t\t/* Never reached */\n }\n \n+#ifdef CONFIG_SPL_BUILD\n+u32 spl_boot_device(void)\n+{\n+\treturn sunxi_get_boot_device();\n+}\n+\n /* No confirmation data available in SPL yet. Hardcode bootmode */\n u32 spl_boot_mode(const u32 boot_device)\n {\n","prefixes":["U-Boot","v2","1/3"]}