From patchwork Wed Sep 25 15:00:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1167507 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="FCw25rqJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dkCC0J8Pz9sNx for ; Thu, 26 Sep 2019 02:33:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AF0ECC221CF; Wed, 25 Sep 2019 16:20:05 +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=RCVD_IN_MSPIKE_H2, 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 59DACC22260; Wed, 25 Sep 2019 15:07:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 45D6DC22260; Wed, 25 Sep 2019 15:07:18 +0000 (UTC) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by lists.denx.de (Postfix) with ESMTPS id 68C66C22156 for ; Wed, 25 Sep 2019 15:02:25 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id q10so14701743iop.2 for ; Wed, 25 Sep 2019 08:02:25 -0700 (PDT) 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=w9N3E3xRvIL3jTw5VfZfNy5xUPBG9Nk3RcFJBwO6PGU=; b=FCw25rqJL9kwYfSXX+tHwc+kCAS2suJXVC9WGHZdRgcdliJ0cAOuH6PCJ7SMhAm6ZA A6qlm6Q8t+aD4oHrXgz+eoyQPY0Mn6ZmG6Icp8q6E7NDY6Yq6TEGdA52hhAlb2kYA4Bj kvPAgnnuIhNCtezm76W9r4a85LcENQc2z+Egg= 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=w9N3E3xRvIL3jTw5VfZfNy5xUPBG9Nk3RcFJBwO6PGU=; b=sb1gQFB5XhzoH3V7oAbgp5YwnG0dpYt3+yvcbZGGcUnAD5FDEmLx9FNzKIPMFOkgBw u40KgTM3uRuKDF+EQF8XbZ9coi7nV2BoB6zTXHm9quZ6fDmIGkfNn3r/fvdFo5H6wwlJ krQewflWyjlI32K8dNoQ01vKy2qWilBJUT/WEPhBR0Sqy5m9oqfPfHUF5w9pmiGdA2u6 payClxgMkGXxFLuT6TsU2FH3aBFzYDf0y8rqgXfgXY7vo57HF4LVzv+/pYxrb0Govih4 7tztmppACwN0l1s4b74BEDJl+2sVyQHjF6bIHTJuC+TCw/qijo1/bsy3q1jSd87KLdFR oU+Q== X-Gm-Message-State: APjAAAXdNLNaV6mLE5GJxei1q6NxdAsu5nLGg2HnNPkzgysJvDyYNnNA yV4HWF9un8ZO2qOXHiKAe3esv70IJ3g= X-Google-Smtp-Source: APXvYqzMJkiNXMGOvX412V4P9Sp2qFIOvCoLvt0/pU+LR1njZO8VHgUTTVFpwV99jMcW1l8WHcKYAw== X-Received: by 2002:a92:4891:: with SMTP id j17mr848578ilg.35.1569423744238; Wed, 25 Sep 2019 08:02:24 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id 197sm6758613ioc.78.2019.09.25.08.02.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 08:02:23 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 09:00:33 -0600 Message-Id: <20190925150052.201698-108-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925150052.201698-102-sjg@chromium.org> References: <20190925150052.201698-102-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 107/126] x86: Don't repeat microcode in U-Boot if not needed 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" At present if SPL sets up the microcode then it is still included in U-Boot as well. This is wasteful as microcode is large. Adjust the logic in the image to prevent this. Signed-off-by: Simon Glass --- arch/x86/dts/u-boot.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index f2fb4c2abaa..d9a4ca1184e 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -67,9 +67,16 @@ offset = ; }; #else +# ifdef CONFIG_SPL + u-boot { + offset = ; + }; +# else + /* If there is no SPL then we need to put microcode in U-Boot */ u-boot-with-ucode-ptr { offset = ; }; +# endif #endif #ifdef CONFIG_HAVE_MICROCODE u-boot-dtb-with-ucode {