From d354a6076228de4bc3899afe07b4c405967dc65a Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Sun, 29 Dec 2019 20:52:34 +0200 Subject: [PATCH] Remove obsolete patches These have landed in RC5. Signed-off-by: David Abdurachmanov --- ...e-stdout-path-with-options-correctly.patch | 174 ------------------ riscv-increase-stack-size-to-16KiB.patch | 29 --- uboot-tools.spec | 9 - 3 files changed, 212 deletions(-) delete mode 100644 dm-serial-handle-stdout-path-with-options-correctly.patch delete mode 100644 riscv-increase-stack-size-to-16KiB.patch diff --git a/dm-serial-handle-stdout-path-with-options-correctly.patch b/dm-serial-handle-stdout-path-with-options-correctly.patch deleted file mode 100644 index bd60fac..0000000 --- a/dm-serial-handle-stdout-path-with-options-correctly.patch +++ /dev/null @@ -1,174 +0,0 @@ -From patchwork Mon Nov 18 16:12:46 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Bin Meng -X-Patchwork-Id: 1196837 -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (no SPF record) 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=fail (p=none dis=none) header.from=gmail.com -Authentication-Results: ozlabs.org; - dkim=fail reason="signature verification failed" (2048-bit key; - unprotected) header.d=gmail.com header.i=@gmail.com - header.b="OjF0bL3R"; dkim-atps=neutral -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 47GvBQ1thQz9sPj - for ; - Tue, 19 Nov 2019 03:13:02 +1100 (AEDT) -Received: by lists.denx.de (Postfix, from userid 105) - id CF63AC21DAF; Mon, 18 Nov 2019 16:12:57 +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=FREEMAIL_FROM, - RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, - 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 4238DC21D65; - Mon, 18 Nov 2019 16:12:55 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id DFF15C21D65; Mon, 18 Nov 2019 16:12:53 +0000 (UTC) -Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com - [209.85.210.195]) - by lists.denx.de (Postfix) with ESMTPS id 41033C21D4A - for ; Mon, 18 Nov 2019 16:12:53 +0000 (UTC) -Received: by mail-pf1-f195.google.com with SMTP id b19so10615163pfd.3 - for ; Mon, 18 Nov 2019 08:12:53 -0800 (PST) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; - h=from:to:cc:subject:date:message-id; - bh=wLl6NpGINaKIYKy2LP5M7R7tHtWE6jnwp3GjsfXla7o=; - b=OjF0bL3RmJtgd2oKWNzXl0UucN0ckNM2XHPzeb7ZN+W/7S387MnTW0GDaymHu0v6+L - nqn1KNCqwM+SIVHnhTyG2B1Eenu5vuop3r4wLRcG63FAbz+biwokj3mgETFsx6xhxiX2 - UHTPZFDBC7lFVAyldxo0Q7OiRYIr1L3sfHRgYQiPbFLIypY1pJfrBe6MqvOToRMrEbRK - 6WTneEYxvP73Eh6xdIccN5BoYdGK0BCzwvboiszTzGKd+S5yNoeGM/34UAMXdoTaDN1V - LTva10288B9NDvqSm3IrLffxQWGmFGDsqJVnBi+o3EZDKS0hIN42tbioYe4gh3CXAQjz - Vjkg== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id; - bh=wLl6NpGINaKIYKy2LP5M7R7tHtWE6jnwp3GjsfXla7o=; - b=hxn2/041i3sxZE3rFMcGF65fSXFTW57PM1TQmp0XaRaG/FiYEkwSJq2MdNEtcXu56L - d/Ghg5fVPFSWi5d1zT3CwSUZwlzQjf7d+ja3M9I/yx0ynFFbUlmOm8dva0if3EtPfdyO - QuhYh+nOi3MvN25/zfBy8eRNg+THeKD97IfBiZWHJXM8Vru/T1hPcYx7csLPvQEdgZra - EzcGa0qWQjEmP7QeQMt6SNpjxbI5Nz7oTwE2TJWG3yw+nMZweYoPR8m+VEkB/9Vl6mGj - FB3a3sCfqZkPX/+CCJJejlWP7x0aiREovNwHjnVc89RsrGLSVi6/JElKriQ97sFqnj10 - jiIw== -X-Gm-Message-State: APjAAAVHRzo2rnfXHEjpeUCK/mF9q6vy5ssWXQ2jSl74PmYZ9KollzUn - ItB8fUHEYlGDqd5avq6J58Q= -X-Google-Smtp-Source: APXvYqxW/z20Ow9ejZUX2iP8/GfuQqxED5cKQDicTxDRUHgAV1NUPqhEna3HhuvPuMFSJXz77pwkgA== -X-Received: by 2002:aa7:870c:: with SMTP id b12mr99642pfo.30.1574093570928; - Mon, 18 Nov 2019 08:12:50 -0800 (PST) -Received: from localhost.localdomain (unknown-224-80.windriver.com. - [147.11.224.80]) by smtp.gmail.com with ESMTPSA id - e198sm22152112pfh.83.2019.11.18.08.12.50 - (version=TLS1 cipher=AES128-SHA bits=128/128); - Mon, 18 Nov 2019 08:12:50 -0800 (PST) -From: Bin Meng -To: Simon Glass , U-Boot Mailing List -Date: Mon, 18 Nov 2019 08:12:46 -0800 -Message-Id: <1574093566-1771-1-git-send-email-bmeng.cn@gmail.com> -X-Mailer: git-send-email 1.7.1 -Subject: [U-Boot] [PATCH] dm: serial: Handle "stdout-path" with ":options" - correctly -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" - -With commit f0921f5098d8 ("fdt: Sync up to the latest libfdt"), -SiFive Unleashed board does not boot any more. This was due to -the U-Boot local changes commit 77d7fff8cec2 ("fdt: Fix handling -of paths with options in them") to libfdt/fdt_ro.c was dropped -during the libfdt upgrade. - ->From the history [1] it was mentioned that the U-Boot changes -commit 77d7fff8cec2 ("fdt: Fix handling of paths with options in -them") was rejected by libfdt upstream, hence we need find another -way to fix the things. - -This commit uses another method, by updating serial_check_stdout() -directly to handle the situation of "stdout-path" with ":options". -A simpler way is to change the logic in fdtdec_get_chosen_node() -to do similar thing, but I feel that not every property in chosen -node may have the option in them, hence it would make more sense -to do the special handling in serial_check_stdout() directly. - -[1]: http://patchwork.ozlabs.org/patch/462756/ - -Signed-off-by: Bin Meng -Reviewed-by: Simon Glass ---- - - drivers/serial/serial-uclass.c | 36 ++++++++++++++++++++---------------- - 1 file changed, 20 insertions(+), 16 deletions(-) - -diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c -index dcdaede..391f4a1 100644 ---- a/drivers/serial/serial-uclass.c -+++ b/drivers/serial/serial-uclass.c -@@ -30,28 +30,32 @@ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE; - static int serial_check_stdout(const void *blob, struct udevice **devp) - { - int node; -+ const char *str, *p, *name; -+ int namelen; - - /* Check for a chosen console */ -- node = fdtdec_get_chosen_node(blob, "stdout-path"); -- if (node < 0) { -- const char *str, *p, *name; -- -- /* -- * Deal with things like -- * stdout-path = "serial0:115200n8"; -- * -- * We need to look up the alias and then follow it to the -- * correct node. -- */ -- str = fdtdec_get_chosen_prop(blob, "stdout-path"); -- if (str) { -- p = strchr(str, ':'); -- name = fdt_get_alias_namelen(blob, str, -- p ? p - str : strlen(str)); -+ str = fdtdec_get_chosen_prop(blob, "stdout-path"); -+ if (str) { -+ p = strchr(str, ':'); -+ namelen = p ? p - str : strlen(str); -+ node = fdt_path_offset_namelen(blob, str, namelen); -+ -+ if (node < 0) { -+ /* -+ * Deal with things like -+ * stdout-path = "serial0:115200n8"; -+ * -+ * We need to look up the alias and then follow it to -+ * the correct node. -+ */ -+ name = fdt_get_alias_namelen(blob, str, namelen); - if (name) - node = fdt_path_offset(blob, name); - } -+ } else { -+ node = -1; - } -+ - if (node < 0) - node = fdt_path_offset(blob, "console"); - if (!uclass_get_device_by_of_offset(UCLASS_SERIAL, node, devp)) diff --git a/riscv-increase-stack-size-to-16KiB.patch b/riscv-increase-stack-size-to-16KiB.patch deleted file mode 100644 index 037a546..0000000 --- a/riscv-increase-stack-size-to-16KiB.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 942d0cd249300365271b37d9173e05677f141368 Mon Sep 17 00:00:00 2001 -From: Your Name -Date: Thu, 17 Oct 2019 07:25:17 +0000 -Subject: [PATCH] riscv: increase stack size to 16KiB - -There are posibilit that 8KiB is not enough and causes illegal -instruction while bringing up harts online. - -See: https://lore.kernel.org/linux-riscv/mvm5zkrhe8q.fsf@suse.de/T/#t ---- - arch/riscv/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig -index 01975d7c..85e15ebf 100644 ---- a/arch/riscv/Kconfig -+++ b/arch/riscv/Kconfig -@@ -224,7 +224,7 @@ config XIP - - config STACK_SIZE_SHIFT - int -- default 13 -+ default 14 - - config SPL_LDSCRIPT - default "arch/riscv/cpu/u-boot-spl.lds" --- -2.23.0 - diff --git a/uboot-tools.spec b/uboot-tools.spec index e4f198a..9fcd92b 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -52,11 +52,6 @@ Patch21: riscv-bootargs-preboot.patch # See: https://patchwork.ozlabs.org/patch/1174807/ Patch23: image-add-image.gz-parsing-support-in-booti.patch -# Not upstream -# See: https://lore.kernel.org/linux-riscv/mvm5zkrhe8q.fsf@suse.de/T/#t -# Increase stack from 8KiB to 16KiB to avoid issues bringing up harts online -Patch24: riscv-increase-stack-size-to-16KiB.patch - # Not upstream # Add 'addappend' label to PXE/EXTLINUX configuration Patch25: uboot-addappend.patch @@ -65,10 +60,6 @@ Patch25: uboot-addappend.patch # Define kernel_comp_addr_r and filesize for booti Image.gz support Patch26: uboot-riscv-def-kernel_comp_addr_r.patch -# Not upstream (but posted) -# See: https://patchwork.ozlabs.org/patch/1196837/ -Patch27: dm-serial-handle-stdout-path-with-options-correctly.patch - # Match CPU number with what in Linux config Patch28: riscv-nr-cpus-32.patch