From patchwork Sat Dec 7 04:42:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1205393 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.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="G5T3r33V"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 47VHHr6RDsz9sPL for ; Sat, 7 Dec 2019 15:57:12 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C090281760; Sat, 7 Dec 2019 05:50:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="G5T3r33V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E4CA8176E; Sat, 7 Dec 2019 05:49:58 +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=-0.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) (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 6FEFE81746 for ; Sat, 7 Dec 2019 05:49:55 +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-il1-x142.google.com with SMTP id r81so8156028ilk.0 for ; Fri, 06 Dec 2019 20:49:55 -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=CNKvWDnTTB2OkJ4A76jp/enw9vBsxVMPV05ZQmDkugA=; b=G5T3r33VHYND5jMHR1G5MZCmjSoT2My4PNOf9X0dXdJp5My7ZtdRJAkDkSf1AYceWV jsXZkrjqy5HytmsWiokR/tEhFCZHVgVfi3pF8ZSC2IhtfhN4QK2yDVJz/ad5Twk+Hqgu 4W09tQkkM3pEmc1lg1RBRDnLiH0VRzcgx9+Vw= 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=CNKvWDnTTB2OkJ4A76jp/enw9vBsxVMPV05ZQmDkugA=; b=RFN1beTHPVKc5bhEFZ85A+55ybk/c/N9wg/oY05juOcynTRFQCuZxOdYjbDzSKDRwe iCLIgDUsT2FhTVkpw/aOmAQu1nCa6iZKsp2Sv/lwbr+xvkezCoiyHSio8+lB8+kakEqj J2Qay1ABY8HgE21XX3eiE2WQADOTm5ZJvN0VirG2S98JNG6kUjIM5n5pJC3ysSUzTSqI 2czxDl8AcgGHf0BK9F8pw138vtPEIIr9Ndc+d1a+qYMrsvx3qBFDBsqW/crCB72mUlAW jVJfB6vZhnVp8t4r1lvFp5WzlfKM7z+F1qnMXhQB1gN/FhbiDoQWAJwN+Xk3wvDDKvc3 Sflg== X-Gm-Message-State: APjAAAVyg9yBXJPXRyaD6hzxZy1cbVVseKTJ8lLfFJHJ3WPLjzUECfkm zzTrLfmfsIKW/UCXR19hvXGzV6NLkxY= X-Google-Smtp-Source: APXvYqygEg2xjReuyE4VoS5Rjq+dT3vXLKbHEPTBPyaooOphE1vx8EwTMYpIoIChfYP5pe0VBA/Oeg== X-Received: by 2002:a05:6e02:8eb:: with SMTP id n11mr16101461ilt.26.1575694194292; Fri, 06 Dec 2019 20:49:54 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id o7sm4549410ilo.58.2019.12.06.20.49.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2019 20:49:54 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Subject: [PATCH v6 059/102] x86: Don't repeat microcode in U-Boot if not needed Date: Fri, 6 Dec 2019 21:42:32 -0700 Message-Id: <20191206213936.v6.59.I7e4d9db0141141a71865369b131bc54d8ca23985@changeid> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog In-Reply-To: <20191207044315.51770-1-sjg@chromium.org> References: <20191207044315.51770-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 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.101.4 at phobos.denx.de X-Virus-Status: Clean 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. Reviewed-by: Bin Meng Signed-off-by: Simon Glass --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None 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 5ebff4f407..e0cca58640 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -63,9 +63,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 {