From patchwork Sun Feb 5 22:36:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1737807 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.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=SvvSw1Ed; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P94Kc22vCz23fc for ; Mon, 6 Feb 2023 09:47:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BA647859F1; Sun, 5 Feb 2023 23:41:16 +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="SvvSw1Ed"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 954FC859F1; Sun, 5 Feb 2023 23:40:06 +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.1 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-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 CD4D4859C0 for ; Sun, 5 Feb 2023 23:39:31 +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-io1-xd31.google.com with SMTP id r6so3890442ioj.5 for ; Sun, 05 Feb 2023 14:39:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J4+VFvwg7QfrovApdTzZ6W0DMft1xo2MSLubENzZx1E=; b=SvvSw1EdnSuYRNqlSo2fJ2PDkWuFZXhBNNnv/EtDKCz3s+yKK6ua35/hn1olmRn7iw rvxfLFnzzS5zirtEeQt3TSsslAXCCypv0XY44K34O9UmFFf6IEDdrv6j7ndBrbk30dg+ CBzd0U90iRcBd660MAXZdUIO3uAqBK1Ls8w8U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J4+VFvwg7QfrovApdTzZ6W0DMft1xo2MSLubENzZx1E=; b=z1F+hLg+fAag+HmfFJ9+wre74nwcKhRlSjtgvSFpzmsQKrOiGegc66EEUQK10QqCQ7 IreSzntCFWcZFwLfJKWpVhOFx1zpRi28/fUcR30cR/uXX9Omwc4S5XEvQmQC6XtMGDZS iloojhDjMWN7X/jknwsqtyRsypIwep7mCQmiB9WZduRPje3auyGBWTJgZ2CK6pFAa5s2 ur0R/Xr9Yfk7gIqOgxG1xVV+tposoySh6WftP7x/g2DXiCHO3rrmJv9sBpB0837OtJj7 nND0UUzfZLnzoR08oCnBpOyY3tYhMisF5J5X9qggzrHrMtZinyVJO1wF1cvLD+xfyu2v HNmA== X-Gm-Message-State: AO0yUKVeOuCmn85fCpoF1MmY77ZvXVcrdkM/xTCEwZmiwtJ9QQ0sWk4b CgSCpWjJ1Cs0eOHFLwDUN7kJ1Tu8c2Ca5zVY X-Google-Smtp-Source: AK7set+KObzrJoJzSD+uFE2I0vj0UdCJFfdxSMXyslVwBQj8XiT8rQZ/IQs1d/U03IxgrKm+n7ZIgg== X-Received: by 2002:a5d:9d89:0:b0:71c:9462:fdde with SMTP id ay9-20020a5d9d89000000b0071c9462fddemr21596236iob.17.1675636769535; Sun, 05 Feb 2023 14:39:29 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:29 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 044/169] Correct SPL uses of CMD_FDT Date: Sun, 5 Feb 2023 15:36:30 -0700 Message-Id: <20230205223836.231657-45-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean This converts 2 usages of this option to the non-SPL form, since there is no SPL_CMD_FDT defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) boot/bootm.c | 2 +- boot/image-fdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootm.c b/boot/bootm.c index 56b82bbb8b7..2eec60ec7b5 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -313,7 +313,7 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start, return 1; } - if (CONFIG_IS_ENABLED(CMD_FDT)) + if (IS_ENABLED(CONFIG_CMD_FDT)) set_working_fdt_addr(map_to_sysmem(images.ft_addr)); #endif diff --git a/boot/image-fdt.c b/boot/image-fdt.c index b830a0ab418..408abce096f 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -272,7 +272,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) *of_flat_tree = of_start; *of_size = of_len; - if (CONFIG_IS_ENABLED(CMD_FDT)) + if (IS_ENABLED(CONFIG_CMD_FDT)) set_working_fdt_addr(map_to_sysmem(*of_flat_tree)); return 0;