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 5EF11C636CD for ; Sun, 5 Feb 2023 22:48:30 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 22B3685A16; Sun, 5 Feb 2023 23:41:27 +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="Lw+Z4udI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4542F859E6; Sun, 5 Feb 2023 23:39:58 +0100 (CET) Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 9BA29859B1 for ; Sun, 5 Feb 2023 23:39:26 +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-x134.google.com with SMTP id k12so4106602ilv.10 for ; Sun, 05 Feb 2023 14:39:26 -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=jxDHzVb6Q97UNzWotq8PoEXg8x/V09sB+aZjOW3WPU8=; b=Lw+Z4udIzPrzFdY8pNCUXSlsZsDuNaW1qE8n0LfYxd2zX6eEZQgBQ8hro7EERnxMz7 sdEFfzEWhHHi6YgrKAZWWND5aBXpFvs5Vb74gB+y47114GmtEHfnisTzjVd4eZG+XyKL Uw40Dzx6QEQV9/btXA35TRnja3jKdeC9n+0tk= 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=jxDHzVb6Q97UNzWotq8PoEXg8x/V09sB+aZjOW3WPU8=; b=sYzZEaszwpRvwj3IAQXQeQnPZzc3u2YO74/SA89YFQpuNwm7oqtygSdvFA8RiTthS/ wEJgvk3xj56ZS0kU773bLYiUrQO5GRM2D3iH1CvNazT9v38WduvBNvUh+pxMUTn0iO+T s90S1k9+Jpi47byW8CIjRKFfl7MtEPKU0V7x/+NQ8demAS4hdJ0lpJOALKwWB96CKh3C ZgeDiXCOyNGkDdKbptWB4KPhOszoOpyelRho9+1AH7awgwYiQrGAayzYq73iQR0O8exJ VSwE2hEZuszDF9EFoltK+6Go9PmkDc1djKGRRqUXHaFOwi2i363z+mPPpyOlSxQNyy5D IGjg== X-Gm-Message-State: AO0yUKVHgV8IgKj99HgvjfScvCnzbCpt7RKKn0Ks7oBwPRVf5Iocpbyu xlgBe2kqWA64I+VNTqcKLQGapueYho9lXJ3F X-Google-Smtp-Source: AK7set/dntAgL45C3ay7aOmHR6HXAN2VuMoPmECCQL01JpEcBMWgTtiRHy6jP3tAtIBObIVP6/GcCw== X-Received: by 2002:a05:6e02:1b83:b0:313:cb9e:8038 with SMTP id h3-20020a056e021b8300b00313cb9e8038mr199847ili.11.1675636763676; Sun, 05 Feb 2023 14:39:23 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:23 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 037/169] Correct SPL use of CMD_BOOTI Date: Sun, 5 Feb 2023 15:36:23 -0700 Message-Id: <20230205223836.231657-38-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 1 usage of this option to the non-SPL form, since there is no SPL_CMD_BOOTI defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) boot/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootm.c b/boot/bootm.c index 15fce8ad95e..e6715ae6b14 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -226,7 +226,7 @@ static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc, } if (images.os.type == IH_TYPE_KERNEL_NOLOAD) { - if (CONFIG_IS_ENABLED(CMD_BOOTI) && + if (IS_ENABLED(CONFIG_CMD_BOOTI) && images.os.arch == IH_ARCH_ARM64) { ulong image_addr; ulong image_size; -- 2.39.1.519.gcb327c4b5f-goog