Message ID | 20210917161741.1275871-3-sjg@chromium.org |
---|---|
State | RFC |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org 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=ez3qd4Ls; dkim-atps=neutral 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>) 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 4H9zdp0rWWz9sVw for <incoming@patchwork.ozlabs.org>; Sat, 18 Sep 2021 02:18:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3933883252; Fri, 17 Sep 2021 18:18:04 +0200 (CEST) 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="ez3qd4Ls"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 71B2683245; Fri, 17 Sep 2021 18:17:58 +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.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) (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 32D5883227 for <u-boot@lists.denx.de>; Fri, 17 Sep 2021 18:17:51 +0200 (CEST) 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-wr1-x436.google.com with SMTP id u15so16049437wru.6 for <u-boot@lists.denx.de>; Fri, 17 Sep 2021 09:17:51 -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=hFj0O6+u82wVs+KJ5YK/4+6wdnInAyNP1CUbr8d25Pc=; b=ez3qd4LsF1g1QDU695vHX25Josy9XoOTv0o0CVN4uwkytVCdR/jhfERgcJ924j9QKi L4kNy1LCrcC3qzZSWVDHZwupNvXsDh6PkC+P2pUZXIiX0+z+e9eiPmbtq5/GBARJ3Js3 uxMsUX0G/euKHH/S/lNxk7IATEeZb9bxRYZZo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hFj0O6+u82wVs+KJ5YK/4+6wdnInAyNP1CUbr8d25Pc=; b=uK2bUWTJvNkZr+sjtvz8Dc3FwkFrjWY6Kd6PpbSYh1E1z2MzmloNO27e6RDGFN3sy6 NVTuWjpaEFVKGytNB/scM3iMMkkbWPyBjoMM92vnQsYWBObwsoG9AZcDaSkPraR8Hyye RijqyBXDfggEIS4zNJe/uO4AcHIP9uYgBzK9YiH1HmXHRYXPAIAEELMtmtVv09M1xSsf 1o2umAxYBAbTQvLtUPLf+BU0ID8R1sAhYn6A9xLkXzWa0kWT9czO5UDbL+GwWl26fosE Yp4Mj2Ng+IW+lmfT2LcXO7uN8AJgc8U6zD+w3CuQYaunAn3NMOoZblX4WTnf4TmFvnF2 irUg== X-Gm-Message-State: AOAM531HcUJTJ5pRtySne94zm6wZcTdtOizQzOz+9kK+46qpkj6WSzEA eBw6cGMXoQ1ZiudjByQjAub5/TYfkFONPLqQ X-Google-Smtp-Source: ABdhPJzqeX2Yf1TXPHq9lgG4NVM5hVbk3xHVdz2xYoIoCuTzh2bjLqDLTzoQ5mFwisFd75LNXnqGqg== X-Received: by 2002:a5d:6d8e:: with SMTP id l14mr13066087wrs.26.1631895470063; Fri, 17 Sep 2021 09:17:50 -0700 (PDT) Received: from sjg1.COMFAST (host-92-2-168-81.as13285.net. [92.2.168.81]) by smtp.gmail.com with ESMTPSA id 48sm7699906wrc.14.2021.09.17.09.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:17:49 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Masahiro Yamada <yamada.masahiro@socionext.com>, Simon Glass <sjg@chromium.org>, Bin Meng <bmeng.cn@gmail.com> Subject: [PATCH 02/17] x86: Fix qemu condition for arch_cpu_init() Date: Fri, 17 Sep 2021 10:17:25 -0600 Message-Id: <20210917161741.1275871-3-sjg@chromium.org> X-Mailer: git-send-email 2.33.0.309.g3052b89438-goog In-Reply-To: <20210917161741.1275871-1-sjg@chromium.org> References: <20210917161741.1275871-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.103.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
RFC: Split configs between U-Boot proper and SPL builds
|
expand
|
diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index e54082df7f9..274978c023b 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -97,7 +97,7 @@ static void qemu_chipset_init(void) } } -#if !CONFIG_IS_ENABLED(SPL_X86_32BIT_INIT) +#if CONFIG_IS_ENABLED(X86_32BIT_INIT) int arch_cpu_init(void) { post_code(POST_CPU_INIT);
This is written incorrectly, since SPL_ should not be used with the CONFIG_IS_ENABLED macro. Fix it by dropping the prefix and inverting the logic, which produces the same result as now. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/x86/cpu/qemu/qemu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)