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 C83D6ECAAD5 for ; Sun, 28 Aug 2022 18:33:53 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1BEAE84915; Sun, 28 Aug 2022 20:33:31 +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="XwfkqeNe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4A24A845BE; Sun, 28 Aug 2022 20:33:23 +0200 (CEST) Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) (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 3AD598491E for ; Sun, 28 Aug 2022 20:33:15 +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-oa1-x35.google.com with SMTP id 586e51a60fabf-11d2dcc31dbso8147392fac.7 for ; Sun, 28 Aug 2022 11:33:15 -0700 (PDT) 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; bh=aOabUUPwmZ1RJCMcl9yrFYpRcmXr3U6GXisdgv+DVy0=; b=XwfkqeNeVD+YeycYuHw+WkylJpxU0KQ7FCgFQyIsa+YU5BkdIFht5ZHU+u0VE/EeQA HcLlqJpC7JzeXcCgirlf9kmS/tlRpfdI1XNWMs19AOlJjxtpkSGamzKp5ejV9pEDHgD3 wXZzGnAuZSDPErb8iUrp3GGQjdoqfDojyyFN4= 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; bh=aOabUUPwmZ1RJCMcl9yrFYpRcmXr3U6GXisdgv+DVy0=; b=YSnt+qp7Q8N5Aua/HAJpgFVVkg3i1cokCZPGUfM0Xt7I6g9kqqnSNr4idY6mPCT2Um XgW0CpN4hMNbr4YeBpkA6nXJ2DE3cvdhsoPOAXnXD/RWlIoYiKrKJBkwIVSGZqrOS0ci XTUYIKHb2peSeQteQxyUPQ/E/cCDV/iqdIW91cOyTIZNUNm5n9g/ewGjaUJKBdZX4ZB1 Pc7flAp8Yj2sAQjnj3SM8W/XGGc6fv5LVLz1oWoj4UFTR5JT7msKFY6mnLhWok0YZbO6 Ge0EzWn4x4zlULIQBvkM82aPD5agNlRybJr+NfZFI7OH9oCobz5IaQC/vSLJXRX4h/rp 7Odg== X-Gm-Message-State: ACgBeo0brJw5qXZA9dIF4soye9ki5ps3YNa+OFTRQLFwwJ0Uv+XzwIaj BS6PRxllw8MnSxxD9y+YK7eft3u0834ljg== X-Google-Smtp-Source: AA6agR7x9T8AhqYcgQyeAske5KwB1IGG/JDidvMcQ8v7d8K81BxbzIxR8FfO3NGlX0I8BS4B0vOBrQ== X-Received: by 2002:a05:6870:899a:b0:10e:f8cd:8ec with SMTP id f26-20020a056870899a00b0010ef8cd08ecmr6180439oaq.82.1661711593485; Sun, 28 Aug 2022 11:33:13 -0700 (PDT) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id 91-20020a9d0de4000000b006339b36127dsm4299771ots.3.2022.08.28.11.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Aug 2022 11:33:13 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Neil Armstrong , Simon Glass , Alexandru Gagniuc , Artem Lapkin , Joe Hershberger , Leo Yu-Chi Liang , Marek Vasut , Michal Simek Subject: [PATCH 5/8] image: Drop another #ifdef for FIT Date: Sun, 28 Aug 2022 12:32:50 -0600 Message-Id: <20220828183253.822815-6-sjg@chromium.org> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog In-Reply-To: <20220828183253.822815-1-sjg@chromium.org> References: <20220828183253.822815-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 Drop the prenultimate one of these from select_ramdisk(). Signed-off-by: Simon Glass --- boot/image-board.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/boot/image-board.c b/boot/image-board.c index 07b7e467cc4..8858a2fe126 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -363,7 +363,9 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch, rd_addr); } #if CONFIG_IS_ENABLED(FIT) - } else { + } +#endif + if (CONFIG_IS_ENABLED(FIT) && !select) { /* use FIT configuration provided in first bootm * command argument. If the property is not defined, * quit silently (with -ENOPKG) @@ -377,7 +379,6 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch, else if (rd_noffset < 0) return rd_noffset; } -#endif /* * Check if there is an initrd image at the -- 2.37.2.672.g94769d06f0-goog