Message ID | 20210307193148.1513733-15-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Simon Glass |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=GXh3s72A; 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 4Dts9V5VB5z9sW5 for <incoming@patchwork.ozlabs.org>; Mon, 8 Mar 2021 06:34:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 303FB8287F; Sun, 7 Mar 2021 20:32:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="GXh3s72A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F36FA8281E; Sun, 7 Mar 2021 20:32:10 +0100 (CET) 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) (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 2325A827B1 for <u-boot@lists.denx.de>; Sun, 7 Mar 2021 20:32:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oi1-x22e.google.com with SMTP id v192so1193334oia.5 for <u-boot@lists.denx.de>; Sun, 07 Mar 2021 11:32:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EcHcGuJPbglXJNDcRZB+mCAkLP42beHaFU1e63wI1uk=; b=GXh3s72Aj6vPQGR/SK1z3C/MqXd2T/hwCTPrvPpSp1vIZB9BsgTILzrKWtfhUATY6R Zp08BmLKggXmsM9iOssgE+3PPh659nfT4eibbflXdNwQgSIXjxHP44JbnBJVT1EyfszT sJrZNkPpbfVmWOcYYpAukwwF8G9bUMExvU4XU= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=EcHcGuJPbglXJNDcRZB+mCAkLP42beHaFU1e63wI1uk=; b=npHL+6yqp1d5gQf7fnVivyBm/dQNovBGvdsD5uagZzd0jm+bhnHpjtozqGW/l+M2tb ihoaJAKNuhMBlIv6hCAJSKan3bjallsiIGMmQp0rjz4RV6ESpOYi9CTo6wPt12ETBaK6 GO7kXiRj6Y/mT8+J+FjA4VXcJXj1mG8l6TfKctc3d/v1gjUc38T/HNO+f+rmq38mvct9 mrEM8aDH/VmBtXA/ZJLLMkAxQWmed8YNWTaS4tOztGkd2I8Hm8yM9s2tMzegHYUtkw43 RkT6gV/cJ4mPCLPm9tWrzfAEd/wCaz3ym39+c7L2Csg24TlFrQcleS3P9VGteG6q81AY lS0w== X-Gm-Message-State: AOAM5305VA9nxjmdgRUYGeDRiEpw3J+TU8RdYRZHYvOKEpVVpiejhIx0 KoCC6L22sRhRQp2RLeb5Qj4nUMP2kVJl5LmU X-Google-Smtp-Source: ABdhPJxC8blQF4XDEU/EUu6/KEUeAnRd5pT3f0GTfYtY5GKXAItyn2JMrGPTO7kRugSROdpPTO+yKA== X-Received: by 2002:aca:c792:: with SMTP id x140mr14854709oif.86.1615145525802; Sun, 07 Mar 2021 11:32:05 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id z8sm891074otp.14.2021.03.07.11.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 11:32:05 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Simon Glass <sjg@chromium.org>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Bin Meng <bmeng.cn@gmail.com> Subject: [PATCH 14/20] x86: dts: Drop unused CONFIG_SPL Date: Sun, 7 Mar 2021 12:31:41 -0700 Message-Id: <20210307193148.1513733-15-sjg@chromium.org> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210307193148.1513733-1-sjg@chromium.org> References: <20210307193148.1513733-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
binman: Support devicetree update in all entries
|
expand
|
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index 50134b2fe00..ca84d18ad90 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -55,11 +55,7 @@ offset = <CONFIG_X86_OFFSET_U_BOOT>; }; #else -# ifdef CONFIG_SPL - u-boot { - offset = <CONFIG_SYS_TEXT_BASE>; - }; -# elif defined(CONFIG_HAVE_MICROCODE) +# ifdef CONFIG_HAVE_MICROCODE /* If there is no SPL then we need to put microcode in U-Boot */ u-boot-with-ucode-ptr { offset = <CONFIG_X86_OFFSET_U_BOOT>;
This cannot be used since the previous #elif has already dealt with SPL. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/x86/dts/u-boot.dtsi | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)