From patchwork Sat Aug 1 16:08:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1339754 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=pass (p=none dis=none) header.from=chromium.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=My5jtZ8Q; 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 4BJpxV4D9Cz9sSt for ; Sun, 2 Aug 2020 02:09:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3E8A981E39; Sat, 1 Aug 2020 18:08:46 +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="My5jtZ8Q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 52C7381D71; Sat, 1 Aug 2020 18:08:39 +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,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-ot1-x341.google.com (mail-ot1-x341.google.com [IPv6:2607:f8b0:4864:20::341]) (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 0794481BA8 for ; Sat, 1 Aug 2020 18:08:34 +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-ot1-x341.google.com with SMTP id 93so14756922otx.2 for ; Sat, 01 Aug 2020 09:08:33 -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=wh7T2UomnYk3Oc0ipOZGRGzNjAZxTqK2BEVyFHDjNz0=; b=My5jtZ8QyoPTZgLj8whpPrSiNCxq9Jog6oUgLUg/7gWYlBQZWovA+Jr3AOAy1dxpBE CpG2AostZLXs6eScu2dqlDb9ypj0bcZ6MsmtD/arPcv0K64acgn/aisrj3jr1wbikJnP B+smcgcdLJx1IDUEmkR3DLroSd2jDi62GLUB0= 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=wh7T2UomnYk3Oc0ipOZGRGzNjAZxTqK2BEVyFHDjNz0=; b=ByZ42f6KK1mVKMNjbZVSqkA4RmD+JdMwjK0USkcFQM9EPpnSEbuOe9chnUPLj4cuFx oQzealtST5ci+we8IqPLE/pHbweRKHM7sYOX+tsNoRbTxUlqAbfeZHFo9eTCCMDvEb43 KMJAm5dmJRfqPDOyXn9xyQIf6fdbHBTAPAjvryujgGo1O4AywP7hsORsA+eRnVpMKHN4 f5UK9R2QVyWa/c//cY8phOdfQKXmphPDlKeZsJG/dI6WLfTtV1Zxh6tzSsKjAMyKMo/D rUSgbXAqMD5+pmi/BuViR/v6HUD0xTWsNk34ju7FARz45bgJjlbaP3B5Yimdwy2jB2fe Wvyw== X-Gm-Message-State: AOAM531+byqvrhoj2GmyOPL+5rvDWvRg4WjNgvejQ3uEhpzZdt+iEqvf Na5C2Xz/P5MOnxQMvNfW7EEnzPbmv/Ryvg== X-Google-Smtp-Source: ABdhPJx9jqur/KfJiht2nw9IhaVndQSd/S5Uyujn9tjBFSSVR5i6kTGU9TANwb0ewSzwXu6n5SNhPQ== X-Received: by 2002:a9d:3c6:: with SMTP id f64mr7554558otf.364.1596298112655; Sat, 01 Aug 2020 09:08:32 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id a14sm1911907otf.41.2020.08.01.09.08.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2020 09:08:32 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Andy Shevchenko , Bin Meng , Joe Hershberger , Wolfgang Wallner Subject: [PATCH 03/16] x86: zimage: Avoid using #ifdef Date: Sat, 1 Aug 2020 10:08:11 -0600 Message-Id: <20200801160824.17486-4-sjg@chromium.org> X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6-goog In-Reply-To: <20200801160824.17486-1-sjg@chromium.org> References: <20200801160824.17486-1-sjg@chromium.org> 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.3 at phobos.denx.de X-Virus-Status: Clean Use IS_ENABLED() instead of #ifdef in this file. Signed-off-by: Simon Glass Reviewed-by: Wolfgang Wallner --- arch/x86/lib/zimage.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index a79971f052c..3c8081a48bb 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -303,21 +303,17 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, build_command_line(cmd_line, auto_boot); } -#ifdef CONFIG_INTEL_MID - if (bootproto >= 0x0207) + if (IS_ENABLED(CONFIG_INTEL_MID) && bootproto >= 0x0207) hdr->hardware_subarch = X86_SUBARCH_INTEL_MID; -#endif -#ifdef CONFIG_GENERATE_ACPI_TABLE - setup_base->acpi_rsdp_addr = acpi_get_rsdp_addr(); -#endif + if (IS_ENABLED(CONFIG_GENERATE_ACPI_TABLE)) + setup_base->acpi_rsdp_addr = acpi_get_rsdp_addr(); setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0)); setup_video(&setup_base->screen_info); -#ifdef CONFIG_EFI_STUB - setup_efi_info(&setup_base->efi_info); -#endif + if (IS_ENABLED(CONFIG_EFI_STUB)) + setup_efi_info(&setup_base->efi_info); return 0; }