{"id":812308,"url":"http://patchwork.ozlabs.org/api/patches/812308/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1505126892-32867-1-git-send-email-philipp.tomsich@theobroma-systems.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":"<1505126892-32867-1-git-send-email-philipp.tomsich@theobroma-systems.com>","list_archive_url":null,"date":"2017-09-11T10:48:12","name":"[U-Boot] rockchip: rk3399: spl: convert to using BOOT_DEVICE_BOOTROM","commit_ref":"cbe18f10e6943db628e779da03dad97a93c627f3","pull_url":null,"state":"accepted","archived":false,"hash":"c14fe883cb11a343786443ff518fa66f50c9d3d8","submitter":{"id":53488,"url":"http://patchwork.ozlabs.org/api/people/53488/?format=json","name":"Philipp Tomsich","email":"philipp.tomsich@theobroma-systems.com"},"delegate":{"id":69486,"url":"http://patchwork.ozlabs.org/api/users/69486/?format=json","username":"ptomsich","first_name":"Philipp","last_name":"Tomsich","email":"philipp.tomsich@theobroma-systems.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1505126892-32867-1-git-send-email-philipp.tomsich@theobroma-systems.com/mbox/","series":[{"id":2477,"url":"http://patchwork.ozlabs.org/api/series/2477/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=2477","date":"2017-09-11T10:48:12","name":"[U-Boot] rockchip: rk3399: spl: convert to using BOOT_DEVICE_BOOTROM","version":1,"mbox":"http://patchwork.ozlabs.org/series/2477/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812308/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812308/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 3xrPmv6Fb7z9s83\n\tfor ;\n\tMon, 11 Sep 2017 20:49:03 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 8FECDC21F72; Mon, 11 Sep 2017 10:48:38 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 54B7CC21F45;\n\tMon, 11 Sep 2017 10:48:36 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid B04C9C21DEF; Mon, 11 Sep 2017 10:48:22 +0000 (UTC)","from mail.theobroma-systems.com (vegas.theobroma-systems.com\n\t[144.76.126.164])\n\tby lists.denx.de (Postfix) with ESMTPS id D742DC21C72\n\tfor ; Mon, 11 Sep 2017 10:48:18 +0000 (UTC)","from [86.59.122.178] (port=59020 helo=android.lan)\n\tby mail.theobroma-systems.com with esmtpsa\n\t(TLS1.2:RSA_AES_128_CBC_SHA256:128)\n\t(Exim 4.80) (envelope-from )\n\tid 1drMGG-0003hJ-Va; Mon, 11 Sep 2017 12:48:17 +0200"],"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":"Philipp Tomsich ","To":"u-boot@lists.denx.de","Date":"Mon, 11 Sep 2017 12:48:12 +0200","Message-Id":"<1505126892-32867-1-git-send-email-philipp.tomsich@theobroma-systems.com>","X-Mailer":"git-send-email 2.1.4","Cc":"Albert Aribaud ","Subject":"[U-Boot] [PATCH] rockchip: rk3399: spl: convert to using\n\tBOOT_DEVICE_BOOTROM","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":"Instead of directly calling into the back-to-bootrom code, the RK3399\ncommon SPL implementation now uses BOOT_DEVICE_BOOTROM to trigger a\ntransfer back into the bootrom.\n\nWith this factored out, the spl_board_init function can not be\ncustomised for each RK3399 board.\n\nSigned-off-by: Philipp Tomsich \n---\n\n arch/arm/mach-rockchip/rk3399-board-spl.c | 18 +++++++++++++-----\n 1 file changed, 13 insertions(+), 5 deletions(-)","diff":"diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c b/arch/arm/mach-rockchip/rk3399-board-spl.c\nindex 3406156..1c39d9b 100644\n--- a/arch/arm/mach-rockchip/rk3399-board-spl.c\n+++ b/arch/arm/mach-rockchip/rk3399-board-spl.c\n@@ -1,10 +1,12 @@\n /*\n * (C) Copyright 2016 Rockchip Electronics Co., Ltd\n+ * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH\n *\n * SPDX-License-Identifier: GPL-2.0+\n */\n \n #include \n+#include \n #include \n #include \n #include \n@@ -19,9 +21,19 @@\n \n DECLARE_GLOBAL_DATA_PTR;\n \n+void board_return_to_bootrom(void)\n+{\n+\tback_to_bootrom();\n+}\n+\n u32 spl_boot_device(void)\n {\n-\treturn BOOT_DEVICE_MMC1;\n+\tu32 boot_device = BOOT_DEVICE_MMC1;\n+\n+\tif (CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM))\n+\t\treturn BOOT_DEVICE_BOOTROM;\n+\n+\treturn boot_device;\n }\n \n u32 spl_boot_mode(const u32 boot_device)\n@@ -156,10 +168,6 @@ void spl_board_init(void)\n \t}\n \n \tpreloader_console_init();\n-#if CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM)\n-\tback_to_bootrom();\n-#endif\n-\n \treturn;\n err:\n \tprintf(\"spl_board_init: Error %d\\n\", ret);\n","prefixes":["U-Boot"]}