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 CB88DC636CC for ; Sun, 5 Feb 2023 22:50:42 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A4DF485A66; Sun, 5 Feb 2023 23:42:07 +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="LIWpmOFg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C0557859F7; Sun, 5 Feb 2023 23:40:09 +0100 (CET) Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (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 0483B8597E for ; Sun, 5 Feb 2023 23:39:24 +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-xd2f.google.com with SMTP id y7so3881010iob.6 for ; Sun, 05 Feb 2023 14:39:24 -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=fBl33rgqmjH8AM82LhHohAxYnNPAQ5izu/K3JQIzxpk=; b=LIWpmOFg/lPh12KmWJ7EnKVPc82xg8VhFe+Qsg0ZVi/axhZfE21QmCKtS5LfuB+FVk 2Qk0tXfF+GGgM4PGmfR17BvrMkjmTT6HUGXDDwbuBLxYE4vbQC2Tk/iTpvOBlfcnIyu4 4XS7YI/kIunShE0gyb4ZTKlui56mk/Qa0SbbY= 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=fBl33rgqmjH8AM82LhHohAxYnNPAQ5izu/K3JQIzxpk=; b=Y8yEM1zV4DizW1QSSspenAW4aY1uTq+yb3tYv/yuuPWEVRFTPMvJpnjTJRZljwP/ta SxveKmznE0Hz1lB9nC48UQ5K/tsQt2YxCnv0IUZ7LOEVLpr4n5DeQi8Vdep+40/UsMLA TEom2FCfMhIHjPDTWXRBzTMrH5r/i3tV32mGWrabkJBUG+b4F1klpCDK42alNa+02G9A Hs7tXz4xCXXi/jzJmFdYUGLm6J1MswQDAnCQ1/Cl6xlDfxS0RdO+OW6PAbztwvXd6A5j q3CXV2Yf/aR6UIsArbGNkhY1Giu1mWUuCSWsv6cP/HSXfdqvdfM0BHw8F8cxu0crSqxW wGVA== X-Gm-Message-State: AO0yUKUmocGeNkcBCcyjFZkWbz7s7Z6zIH61jvl0kbjY63l6/5rPoQ2b PFLez6MAXwjMO7qqiH/hu1iNvZwGTXTNyB8F X-Google-Smtp-Source: AK7set+hztl8rGA5sWxcWyN7JhflzuEnpo7GXT7SAZI8T9eSa4d5ysXVL6HnO3zxgv14QMhr9p3Dmw== X-Received: by 2002:a05:6602:3687:b0:704:b905:e652 with SMTP id bf7-20020a056602368700b00704b905e652mr16871417iob.11.1675636764482; Sun, 05 Feb 2023 14:39:24 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:24 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 038/169] Correct SPL uses of CMD_BOOTM_PRE_LOAD Date: Sun, 5 Feb 2023 15:36:24 -0700 Message-Id: <20230205223836.231657-39-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 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 --- (no changes since v1) 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.519.gcb327c4b5f-goog