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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A34B3C433EF for ; Sun, 26 Sep 2021 01:46:59 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1E0E360184 for ; Sun, 26 Sep 2021 01:46:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1E0E360184 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 66323835A2; Sun, 26 Sep 2021 03:46:25 +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="P1Udfa/3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 055D983571; Sun, 26 Sep 2021 03:44:56 +0200 (CEST) Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) (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 737B6835BD for ; Sun, 26 Sep 2021 03:44:10 +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-ot1-x330.google.com with SMTP id 97-20020a9d006a000000b00545420bff9eso18893134ota.8 for ; Sat, 25 Sep 2021 18:44:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LNNgkNvX886OVyJHhwF2rtl970fCT/VdRcAloekh1SI=; b=P1Udfa/3uThu2uMro2eUWD6xE4Zg5knjsjVL4kVm4Ci4im/j5v2zDI5H3HToSABX83 hp4qkaO9YTTGVy6TczwSfi+16dRXUmOuzVqnDfejTT269cnWnMpQpsbzFmTp6eBc/5qn mR7GGc2qz6l9vWYFDM1KzJj5Wj3wdtYHMajm8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LNNgkNvX886OVyJHhwF2rtl970fCT/VdRcAloekh1SI=; b=vmGu5GFq+56zgxRy1Ks6h6PQS3EuXocrG8aBu6BFxb3FmstU8OKSjs384Ep/oJ0pOt f9UJsH0xY066gXGhpQttecCGWRUjnP6EgKt+6ziTDPorpOV0+s9ZcxAaILFpO1GAB7E0 B79wHiQ081T28H6DVVKjLvVtsxznSaPgL09roP/cIt7U2ysiSzzcpDYmrIW0fCXd6oRq No4Lg+OXsf7OU6fivmQowqIDcgOpulBj0tLCyq/fuY1IlhsQly3zaIpo65AC7NJWsLlh XVb7NATWLHAYHh4WDM3L9/ERGl4p7csaRfaQG13FQjE7/VePjoNyFpbD/ByJ1W24Ges4 RfQg== X-Gm-Message-State: AOAM530n2FofF0IaOaDty6BtLeNdpYl7fkyMU5SbYomwx+47B192yBNw X4RI3ic5FZT3x5aBMj7hqPj5HOJtGPrTsQ== X-Google-Smtp-Source: ABdhPJxeoLEumD8TDZwHD/BuWOE3gof/WY1y+cMHMOSBakcEhWQOB4SBtT1zLTWiTr4GWHZoWJ3/8A== X-Received: by 2002:a05:6830:4195:: with SMTP id r21mr11637151otu.162.1632620648947; Sat, 25 Sep 2021 18:44:08 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id c18sm330378otr.72.2021.09.25.18.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 18:44:08 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Alexandru Gagniuc , Andre Przywara , Rasmus Villemoes , Robert Marko , Masahiro Yamada , Tom Rini , Simon Glass , Joe Hershberger , Marek Vasut Subject: [PATCH v5 19/29] image: Tidy up fit_unsupported_reset() Date: Sat, 25 Sep 2021 19:43:32 -0600 Message-Id: <20210926014342.127913-13-sjg@chromium.org> X-Mailer: git-send-email 2.33.0.685.g46640cef36-goog In-Reply-To: <20210926014342.127913-1-sjg@chromium.org> References: <20210926014342.127913-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean This function is only used in one place and does not need to use the preprocessor. Move it to the C file and convert it to a normal function. Drop fit_unsupported() since it is not used. Signed-off-by: Simon Glass --- (no changes since v1) common/bootm_os.c | 8 ++++++++ include/image.h | 13 ------------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/common/bootm_os.c b/common/bootm_os.c index d635037064a..39623f9126b 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -58,6 +58,14 @@ static void copy_args(char *dest, int argc, char *const argv[], char delim) } #endif +static void __maybe_unused fit_unsupported_reset(const char *msg) +{ + if (CONFIG_IS_ENABLED(FIT_VERBOSE)) { + printf("! FIT images not supported for '%s' - must reset board to recover!\n", + msg); + } +} + #ifdef CONFIG_BOOTM_NETBSD static int do_bootm_netbsd(int flag, int argc, char *const argv[], bootm_headers_t *images) diff --git a/include/image.h b/include/image.h index 75a63db4c1a..0dd8481611e 100644 --- a/include/image.h +++ b/include/image.h @@ -1413,19 +1413,6 @@ int fit_image_cipher_get_algo(const void *fit, int noffset, char **algo); struct cipher_algo *image_get_cipher_algo(const char *full_name); -#if CONFIG_IS_ENABLED(FIT_VERBOSE) -#define fit_unsupported(msg) printf("! %s:%d " \ - "FIT images not supported for '%s'\n", \ - __FILE__, __LINE__, (msg)) - -#define fit_unsupported_reset(msg) printf("! %s:%d " \ - "FIT images not supported for '%s' " \ - "- must reset board to recover!\n", \ - __FILE__, __LINE__, (msg)) -#else -#define fit_unsupported(msg) -#define fit_unsupported_reset(msg) -#endif /* FIT_VERBOSE */ #endif /* CONFIG_FIT */ #if !defined(USE_HOSTCC) -- 2.33.0.685.g46640cef36-goog