{"id":813042,"url":"http://patchwork.ozlabs.org/api/patches/813042/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/ed9bb5ce0628da5d17da9f50d25aa3521f4bb718.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":"","list_archive_url":null,"date":"2017-09-12T20:02:23","name":"[U-Boot,v2,2/3] sunxi: Use sunxi_get_boot_device","commit_ref":"f4c3523c98588b528601f40c0c16106379ea6eda","pull_url":null,"state":"accepted","archived":false,"hash":"30b120cf7d0d69ca8b7480a02ea13660eb2b9603","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/ed9bb5ce0628da5d17da9f50d25aa3521f4bb718.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/813042/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813042/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 3xsG461vtvz9s7f\n\tfor ;\n\tWed, 13 Sep 2017 06:05:10 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 95995C2224E; Tue, 12 Sep 2017 20:03:01 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 91F6FC22194;\n\tTue, 12 Sep 2017 20:02:33 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 00779C22159; Tue, 12 Sep 2017 20:02:30 +0000 (UTC)","from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54])\n\tby lists.denx.de (Postfix) with ESMTP id BBEEBC21FDC\n\tfor ; Tue, 12 Sep 2017 20:02:28 +0000 (UTC)","by mail.free-electrons.com (Postfix, from userid 110)\n\tid 8AD9A20848; 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 628BA20834;\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:23 +0200","Message-Id":"","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 2/3] sunxi: Use sunxi_get_boot_device","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":"Our current board code duplicates a bit the sunxi_get_boot_device logic.\nNow that we can use that function in the full-flavoured U-Boot, remove that\nduplication and call the function instead.\n\nSigned-off-by: Maxime Ripard \n---\n board/sunxi/board.c | 6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)","diff":"diff --git a/board/sunxi/board.c b/board/sunxi/board.c\nindex 70e01437c4f4..9c7fc4168894 100644\n--- a/board/sunxi/board.c\n+++ b/board/sunxi/board.c\n@@ -32,6 +32,7 @@\n #include \n #include \n #include \n+#include \n #include \n #include \n \n@@ -720,11 +721,14 @@ static void setup_environment(const void *fdt)\n int misc_init_r(void)\n {\n \t__maybe_unused int ret;\n+\tuint boot;\n \n \tenv_set(\"fel_booted\", NULL);\n \tenv_set(\"fel_scriptaddr\", NULL);\n+\n+\tboot = sunxi_get_boot_device();\n \t/* determine if we are running in FEL mode */\n-\tif (!is_boot0_magic(SPL_ADDR + 4)) { /* eGON.BT0 */\n+\tif (boot == BOOT_DEVICE_BOARD) {\n \t\tenv_set(\"fel_booted\", \"1\");\n \t\tparse_spl_header(SPL_ADDR);\n \t}\n","prefixes":["U-Boot","v2","2/3"]}