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 6C311ECAAA2 for ; Sun, 28 Aug 2022 18:33:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3BF8B847EF; Sun, 28 Aug 2022 20:33:28 +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="DV9kZru0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 566C384932; Sun, 28 Aug 2022 20:33:20 +0200 (CEST) Received: from mail-oi1-x235.google.com (mail-oi1-x235.google.com [IPv6:2607:f8b0:4864:20::235]) (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 178D2845B0 for ; Sun, 28 Aug 2022 20:33:14 +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-oi1-x235.google.com with SMTP id r124so8129363oig.11 for ; Sun, 28 Aug 2022 11:33:14 -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=UpvFJznBQebz1NI3wjhJiUA4HD77u56hajqr5gjknbM=; b=DV9kZru04dU3e6qDCXlMzafve/V2xGEhoaBAszhsaypnGzbGYwEgrSwtLTOE/U6k5j F38pwMqVz8/B/AXIDsqavX7GyGwe+oEf2e/PqXxAg34kLAoVoeVGENqy/5fLBSNM41cR SdY5gM2zCHF5Mu5dU+CWNWjgr3VC8zkiFxah8= 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=UpvFJznBQebz1NI3wjhJiUA4HD77u56hajqr5gjknbM=; b=2W/pb1F6DwHRhcUD0Q+tV4A8ad6MOg4qVxlT7gP71SMzz1eU3cAMv1fhsEF5DbJVbU qV9eEbsMAcBLWAMC1Ni8z4x76AJxE//MUQRaDASmLM2ruGwfXuGlEyTZj3x1O0EqLKl0 yeOmlXpcLRo2hp3MbSbj3012umxVOSoa4P/PkXN5aUmztxQAVtTDBNYBVp1YRQvUcOVc owG4+KgUYcASJuYkvN52EcaKVvpFcDV7tHXmOw/TMFQpS1F0KTcPS5udWyFDEHI5gLaW CTA3xWLN6BMC4U4SLsRChE4DBEYUXMiwr5q5C9kapJpeDxjy+s2ysW7PZqtBMpASWe8N YDug== X-Gm-Message-State: ACgBeo2zSTadmC2T0sqOFzUUxkJ1/gZvi4qiq5QZ0+06ZbizHd8UBZDz kTBKsDz/tcfZtTyp/xjqYv1mwB83mdrfRQ== X-Google-Smtp-Source: AA6agR6PTnNpqg9dw7ZHmnhhx+v0jg96h51vFn+kSVi5onCLg4EQis1CLBgk3XZpOBgwAH43vsKMHQ== X-Received: by 2002:a05:6808:aa9:b0:345:b145:1c5e with SMTP id r9-20020a0568080aa900b00345b1451c5emr5989588oij.84.1661711592584; Sun, 28 Aug 2022 11:33:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Aug 2022 11:33:12 -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 4/8] image: Drop one #ifdef for FIT Date: Sun, 28 Aug 2022 12:32:49 -0600 Message-Id: <20220828183253.822815-5-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 #ifdef from near the end of select_ramdisk(). Move some variables to the top of the function to make this work. Signed-off-by: Simon Glass --- boot/image-board.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/boot/image-board.c b/boot/image-board.c index a80ad08b15f..07b7e467cc4 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -322,14 +322,16 @@ int genimg_has_config(bootm_headers_t *images) static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch, ulong *rd_datap, ulong *rd_lenp) { + const char *fit_uname_config; + const char *fit_uname_ramdisk; bool done = false; + int rd_noffset; ulong rd_addr; char *buf; #if CONFIG_IS_ENABLED(FIT) - const char *fit_uname_config = images->fit_uname_cfg; - const char *fit_uname_ramdisk = NULL; - int rd_noffset; + fit_uname_config = images->fit_uname_cfg; + fit_uname_ramdisk = NULL; if (select) { ulong default_addr; @@ -403,24 +405,23 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch, done = true; } break; -#if CONFIG_IS_ENABLED(FIT) case IMAGE_FORMAT_FIT: - rd_noffset = fit_image_load(images, - rd_addr, &fit_uname_ramdisk, - &fit_uname_config, arch, - IH_TYPE_RAMDISK, - BOOTSTAGE_ID_FIT_RD_START, - FIT_LOAD_OPTIONAL_NON_ZERO, - rd_datap, rd_lenp); - if (rd_noffset < 0) - return rd_noffset; - - images->fit_hdr_rd = map_sysmem(rd_addr, 0); - images->fit_uname_rd = fit_uname_ramdisk; - images->fit_noffset_rd = rd_noffset; - done = true; + if (CONFIG_IS_ENABLED(FIT)) { + rd_noffset = fit_image_load(images, rd_addr, + &fit_uname_ramdisk, &fit_uname_config, + arch, IH_TYPE_RAMDISK, + BOOTSTAGE_ID_FIT_RD_START, + FIT_LOAD_OPTIONAL_NON_ZERO, + rd_datap, rd_lenp); + if (rd_noffset < 0) + return rd_noffset; + + images->fit_hdr_rd = map_sysmem(rd_addr, 0); + images->fit_uname_rd = fit_uname_ramdisk; + images->fit_noffset_rd = rd_noffset; + done = true; + } break; -#endif case IMAGE_FORMAT_ANDROID: if (IS_ENABLED(CONFIG_ANDROID_BOOT_IMAGE)) { void *ptr = map_sysmem(images->os.start, 0); -- 2.37.2.672.g94769d06f0-goog