From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B42EBC54EED for ; Mon, 30 Jan 2023 14:59:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A5FF7858E2; Mon, 30 Jan 2023 15:59:38 +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="VicpI7OK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5D06A857F1; Mon, 30 Jan 2023 15:53:42 +0100 (CET) Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 6CE0685856 for ; Mon, 30 Jan 2023 15:53:18 +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-x12e.google.com with SMTP id u8so5174723ilq.13 for ; Mon, 30 Jan 2023 06:53:16 -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=CJBOtjjfqtXjwuE71RKrSXjaH9ZSps/76Cvq0ML4nEk=; b=VicpI7OKZFMJShGWopD61S6kWuuPXDaof20WfCOIMZcifWNQvD7JuJxImtjeLlgRVm uAiLXvHZyZodbaq62/fc0YJUZ0XvTuEmbuja+wbns5sePPcGE81VUmYzGE/VYq6aS+Fi YSeDXzZGH3X7SGumZS0IP8ZnUZDaHm18mFHcM= 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=CJBOtjjfqtXjwuE71RKrSXjaH9ZSps/76Cvq0ML4nEk=; b=AX/p3FXoZbXP8qJ7AsxHY4KoXcYtr3d8/HN6iPOD83VTq372MYvvsE7xhel8R39W7f IXbdFHAThcn/tdCEe24ZKcBpzwJl6rpLAMh83TPl/Qp0MjSikBaQBGJs4zu91nLNMAGV XDwQvsx3m3LYMkI90IFf0641ClulTzSdwRr8rYQiQoEDLYmXSOuxILNGJqk39/IgkLz/ Y1/fmiQo9KSZp+Dr3Yy+yXTYacZfHIGywNGCZye4ozYN8Ai7HWDMcXGMBl6BvjIV+CbT O0DtGVsLtKxi/b8cwLesLAZvagdNUxHZv20u/YrvtsKqoMwdB84qVyFQZYtS1Ji+jhMC LMiQ== X-Gm-Message-State: AO0yUKWiQM3aj2N9PFZnXg+zwNQgYGkm/NTYJTFxvPXC6nGT9p5k36dD VBRkXmzG3MguSYUhrnWrid+pkkWdxhc920ZX X-Google-Smtp-Source: AK7set+axeB05IjUMK0u+f/9F1oAs1DDjs6B2CP3zt5E1+ldSHhlNy2RO1nK9nVXKtqqm8oj48eKvA== X-Received: by 2002:a05:6e02:144c:b0:311:478:f273 with SMTP id p12-20020a056e02144c00b003110478f273mr968052ilo.11.1675090392254; Mon, 30 Jan 2023 06:53:12 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Daniel Golle , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Philippe Reynes , Sean Anderson Subject: [PATCH 040/171] Correct SPL uses of CMD_BOOTM_PRE_LOAD Date: Mon, 30 Jan 2023 07:41:13 -0700 Message-Id: <20230130144324.206208-41-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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_BOOTM_PRE_LOAD defined in Kconfig Signed-off-by: Simon Glass --- boot/bootm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootm.c b/boot/bootm.c index e6715ae6b14..56b82bbb8b7 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -100,7 +100,7 @@ static int bootm_pre_load(struct cmd_tbl *cmdtp, int flag, int argc, ulong data_addr = bootm_data_addr(argc, argv); int ret = 0; - if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD)) + if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD)) ret = image_pre_load(data_addr); if (ret) @@ -893,7 +893,7 @@ static const void *boot_get_kernel(struct cmd_tbl *cmdtp, int flag, int argc, &fit_uname_config, &fit_uname_kernel); - if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD)) + if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD)) img_addr += image_load_offset; bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC); -- 2.39.1.456.gfc5497dd1b-goog