From patchwork Fri Jun 4 05:51:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1487582 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=p3d8hEWJ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FxBjR1mSMz9sRK for ; Fri, 4 Jun 2021 15:51:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7396283014; Fri, 4 Jun 2021 07:51:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="p3d8hEWJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9243883015; Fri, 4 Jun 2021 07:51:17 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6ED8D82FEE for ; Fri, 4 Jun 2021 07:51:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-ed1-x530.google.com with SMTP id dj8so9758116edb.6 for ; Thu, 03 Jun 2021 22:51:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qXFcBsVe72/Wc/k2HNjLep2JeMCWQ4RB+nHZOTzvqgE=; b=p3d8hEWJ71mfKPgX7HKzpGgu85y8LR6a3WKZiQNzEBjyDMvqT4FoyJ0NHPE3YIfDhV jOIzMOcaSybN0QUL+w27Ve/Auk8IcDQzZbl5aYAAMSyNNnJZqJvHSB3smJ2+S9F7F0OT IKJyCNd9ys6vtj85lxPSmSsK0cYUAJjnJmgWcmHyFyBEcBdgNS+a84OAu327T6HjxEIP j19yupSGN9yUPIxLNbPZJAg2p+4kpampOsdBvK6jtCP/YX2iNOeovmz0W3QiC5LfVPku 2yXHhTS5QqzNsjB1A2w1SNoB9HJMhr1YFQ9vQYpMHjttkeL7DSAG7nmMOERztLYymKDB JusQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qXFcBsVe72/Wc/k2HNjLep2JeMCWQ4RB+nHZOTzvqgE=; b=jrmghKGfRpACzJ6g8eRd3Y/4jQuflKb6Y97D6p+05KvYGH0/ABjqb3SqQnZMx3WkZf bdpqyiOXiLNHAGSjiwcUJK3yvxlFVtop2nAaqSHxQkan8yXJ61T/tPTOS4ZPkhdRJeY6 xa4mHWofCWSUgha2gcQDh+TCKsE3G5G4E4nQrPnDKv94M62594mB2p6ViVZKA9n2W1Wo cT5jxocykpn1vOhQYmIrmqaXRXxsnuhAEjjM1H8UYyj55BLrqfzLDlWciO/vLrYJNjXE 63HHG0DAvJHXTTeN64psre5nroML1x0hjFNn5vehDcfCmNCsQ/eAQ/1LhWDiIVugLL+d FUzA== X-Gm-Message-State: AOAM532NXe7+qc0DIvMU7REXefY2tDPYfC39lA9ga8a90v1TCdHVkQNy uZdtPeIIWzp941aYwe/jtMIJqGObkGSNaQ== X-Google-Smtp-Source: ABdhPJzySKSrPs9pITKVKAMFusjQ0GrCyeNXQrfwvunCRI15OgUGW5Gyb5wnzOYqjb04RjW7o9KIig== X-Received: by 2002:aa7:cb84:: with SMTP id r4mr2911887edt.187.1622785874166; Thu, 03 Jun 2021 22:51:14 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id o21sm1686080ejg.49.2021.06.03.22.51.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 22:51:13 -0700 (PDT) From: Bin Meng To: Rick Chen , Leo , U-Boot Mailing List Subject: [PATCH 5/5] riscv: ae350: dts: Add missing "u-boot, dm-spl" for SPL config Date: Fri, 4 Jun 2021 13:51:13 +0800 Message-Id: <20210604055113.3630286-5-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210604055113.3630286-1-bmeng.cn@gmail.com> References: <20210604055113.3630286-1-bmeng.cn@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean At present the AE350 SPL defconfig is using OF_PRIOR_STAGE. The intention was to use gdb to load device tree before running U-Boot SPL/proper from RAM. When we switch to OF_SEPARATE we will have to use our own DT but without "u-boot,dm-spl" in several essential nodes, SPL does not boot. Let's add all the required "u-boot,dm-spl" for SPL config. Signed-off-by: Bin Meng Reviewed-by: Rick Chen --- arch/riscv/dts/ae350-u-boot.dtsi | 52 ++++++++++++++++++++++++++++++++ arch/riscv/dts/ae350_32.dts | 1 + arch/riscv/dts/ae350_64.dts | 1 + 3 files changed, 54 insertions(+) create mode 100644 arch/riscv/dts/ae350-u-boot.dtsi diff --git a/arch/riscv/dts/ae350-u-boot.dtsi b/arch/riscv/dts/ae350-u-boot.dtsi new file mode 100644 index 0000000000..0d4201cfae --- /dev/null +++ b/arch/riscv/dts/ae350-u-boot.dtsi @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) + +/ { + cpus { + u-boot,dm-spl; + CPU0: cpu@0 { + u-boot,dm-spl; + CPU0_intc: interrupt-controller { + u-boot,dm-spl; + }; + }; + CPU1: cpu@1 { + u-boot,dm-spl; + CPU1_intc: interrupt-controller { + u-boot,dm-spl; + }; + }; + CPU2: cpu@2 { + u-boot,dm-spl; + CPU2_intc: interrupt-controller { + u-boot,dm-spl; + }; + }; + CPU3: cpu@3 { + u-boot,dm-spl; + CPU3_intc: interrupt-controller { + u-boot,dm-spl; + }; + }; + }; + + memory@0 { + u-boot,dm-spl; + }; + + soc { + u-boot,dm-spl; + + plic1: interrupt-controller@e6400000 { + u-boot,dm-spl; + }; + + plmt0@e6000000 { + u-boot,dm-spl; + }; + }; + + serial0: serial@f0300000 { + u-boot,dm-spl; + }; + +}; diff --git a/arch/riscv/dts/ae350_32.dts b/arch/riscv/dts/ae350_32.dts index 70576846f2..083f676333 100644 --- a/arch/riscv/dts/ae350_32.dts +++ b/arch/riscv/dts/ae350_32.dts @@ -3,6 +3,7 @@ /dts-v1/; #include "binman.dtsi" +#include "ae350-u-boot.dtsi" / { #address-cells = <1>; diff --git a/arch/riscv/dts/ae350_64.dts b/arch/riscv/dts/ae350_64.dts index 564e94a1db..74cff9122d 100644 --- a/arch/riscv/dts/ae350_64.dts +++ b/arch/riscv/dts/ae350_64.dts @@ -3,6 +3,7 @@ /dts-v1/; #include "binman.dtsi" +#include "ae350-u-boot.dtsi" / { #address-cells = <2>;