From patchwork Tue Aug 20 14:09:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1150174 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O7HjGxBD"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46CXjm56ysz9sN1 for ; Wed, 21 Aug 2019 00:09:48 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 43472C21F92; Tue, 20 Aug 2019 14:09:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2B12EC21EB1; Tue, 20 Aug 2019 14:09:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EE624C21EB1; Tue, 20 Aug 2019 14:09:38 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 91E99C21D83 for ; Tue, 20 Aug 2019 14:09:38 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id o4so2763478wmh.2 for ; Tue, 20 Aug 2019 07:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0MdmrastBY1p9jiOS+r/dnEL0zvT8PZE12OrXglCdHk=; b=O7HjGxBDJV8zjdH+CEMVoYTpcNCwC7Eapapidl0E1XhOFehXBFpbmC7RJpT2TwOndo aU3fO85SYQcBagYVqgZgxcBXyT3G9qKy/JVArpSNyo9B+X50cOL7RPoVSne2LjW2Aoh5 OKTQXoTyMbTpZlJfM1Wn/h3N1A97tf4bSz50Y9gwuWP6oke2/TkcZ+2GH8lqrEAD7VIV 1Y34nJNunRRDOyckAgGmQRAzMcTotF7yYTkkzV44dO3WIWKC/SpabusuO/YcV+RA2R99 eqiZt6OcdrmI4oivbKIXtemYE804yydovvMld7i1nyV3xgiYZ6nAnolvoCqFtoLKnhDw Ft0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0MdmrastBY1p9jiOS+r/dnEL0zvT8PZE12OrXglCdHk=; b=h2HKnOb0bXj6jwmB/mzVi9dQql0KikCoQAmcP7026Cfse8vFfhi39gj06GDmZzRBYi GYBjtb8k2eEDVuj1yyTvSrWXrpPxK1M12nMUACP8HSlbpuLr48ksttvvt5BPpun1/Ner Cw61octdqGE5WdsFgfCqrBIH/L495XtCzEbva0GC9zPH3vZ4TbQI7KdelDnGyrDBbJfP vaK29jjrwv4EKJYRjSg7t69GMvWFuLoSCkeQ8HCp08LBF/PTodKmiunPn0MeCli6fU6o sxkbodRNyC3C0P5z56cjAong9CwbPqcLOMDG2ilh6SBcnY9SAxD3vO7DHge7HnthVlu1 DuQA== X-Gm-Message-State: APjAAAViLI60q9vUXTr7QnWwRcQKQMS13fPmDuDppwjzQ/uiM28W9e+m xrmFB8lT+aY66r13PjfL9DsH2z2GOTQ= X-Google-Smtp-Source: APXvYqxYizqsT8ouW2eJB3ZbYCUcPlMWRwVBo4oBnu0MADgNKtvG1/rlfSGKsFifOV2rEck+2Vtj5w== X-Received: by 2002:a1c:c5c2:: with SMTP id v185mr167823wmf.161.1566310177859; Tue, 20 Aug 2019 07:09:37 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id u186sm216615wmu.26.2019.08.20.07.09.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Aug 2019 07:09:37 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Tue, 20 Aug 2019 17:09:32 +0300 Message-Id: <20190820140932.17912-1-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Cc: Igor Opaniuk , Joe Hershberger , Marcel Ziswiler , Peter Ujfalusi , Breno Matheus Lima , Julius Werner Subject: [U-Boot] [PATCH v1] common: fix building image.c X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Igor Opaniuk Wrap image_decomp() and all dependent functions with !ifdef(USE_HOSTCC) macro, as this function isn't used by any tool from /tools. Without this it leads to compilation issues (because of CONFIG_LZMA from newly added #include statement, which pulls all these definitions): In file included from tools/common/image.c:1:0: ./tools/../common/image.c: In function ‘image_decomp’: ./tools/../common/image.c:428:9: warning: implicit declaration of function ‘gunzip’; did you mean ‘munmap’? [-Wimplicit-function-declaration] ret = gunzip(load_buf, unc_len, image_buf, &image_len); ^~~~~~ munmap ./tools/../common/image.c:450:3: error: unknown type name ‘SizeT’; did you mean ‘size_t’? SizeT lzma_len = unc_len; ^~~~~ size_t ./tools/../common/image.c:452:9: warning: implicit declaration of function ‘lzmaBuffToBuffDecompress’ [-Wimplicit-function-declaration] ret = lzmaBuffToBuffDecompress(load_buf, &lzma_len, ^~~~~~~~~~~~~~~~~~~~~~~~ scripts/Makefile.host:114: recipe for target 'tools/common/image.o' failed Fixes: 2aa7f0fa51 ("habv4: tools: Avoid hardcoded CSF size for SPL target") Signed-off-by: Igor Opaniuk --- common/image-fit.c | 5 ++++- common/image.c | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/image-fit.c b/common/image-fit.c index 5c63c769de..72b19f889b 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1728,6 +1728,7 @@ int fit_conf_get_prop_node(const void *fit, int noffset, return fit_conf_get_prop_node_index(fit, noffset, prop_name, 0); } +#ifndef USE_HOSTCC static int fit_image_select(const void *fit, int rd_noffset, int verify) { fit_image_print(fit, rd_noffset, " "); @@ -1743,6 +1744,7 @@ static int fit_image_select(const void *fit, int rd_noffset, int verify) return 0; } +#endif /* USE_HOSTCC */ int fit_get_node_from_config(bootm_headers_t *images, const char *prop_name, ulong addr) @@ -1771,6 +1773,7 @@ int fit_get_node_from_config(bootm_headers_t *images, const char *prop_name, return noffset; } +#ifndef USE_HOSTCC /** * fit_get_image_type_property() - get property name for IH_TYPE_... * @@ -2010,6 +2013,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr, } else { loadbuf = map_sysmem(load, max_decomp_len); } + if (image_decomp(comp, load, data, image_type, loadbuf, buf, len, max_decomp_len, &load_end)) { printf("Error decompressing %s\n", prop_name); @@ -2065,7 +2069,6 @@ int boot_get_setup_fit(bootm_headers_t *images, uint8_t arch, return ret; } -#ifndef USE_HOSTCC int boot_get_fdt_fit(bootm_headers_t *images, ulong addr, const char **fit_unamep, const char **fit_uname_configp, int arch, ulong *datap, ulong *lenp) diff --git a/common/image.c b/common/image.c index e94bbcf108..27a412e2c8 100644 --- a/common/image.c +++ b/common/image.c @@ -384,6 +384,7 @@ void image_print_contents(const void *ptr) } } +#ifndef USE_HOSTCC /** * print_decomp_msg() - Print a suitable decompression/loading message * @@ -484,8 +485,6 @@ int image_decomp(int comp, ulong load, ulong image_start, int type, return ret; } - -#ifndef USE_HOSTCC #if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT) /** * image_get_ramdisk - get and verify ramdisk image