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 44BE8C433F5 for ; Fri, 29 Oct 2021 05:55:57 +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 7E6A860FC0 for ; Fri, 29 Oct 2021 05:55:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7E6A860FC0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.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 42F9283480; Fri, 29 Oct 2021 07:55:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="euHd5HT1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2590A83564; Fri, 29 Oct 2021 07:55:52 +0200 (CEST) Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) (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 A23858331B for ; Fri, 29 Oct 2021 07:55:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-wm1-x336.google.com with SMTP id a20-20020a1c7f14000000b003231d13ee3cso11602946wmd.3 for ; Thu, 28 Oct 2021 22:55:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=YwvXqfxRD4Q+iplw9Y3trC1ypJY8FWczL3hJEDvfz8w=; b=euHd5HT1UQpf5UWMYnTj7VIJtJzsJRT643nV4nZ7AaPBQ5dOVvFuLVg6Hp7nDFQSSw qC10hAS6X8aQibXxbRXKTyWiX3J7BAU3fA/BarQbjjNACgIUtQsxl0R97GfIkq6dcW5D SkOCfzopVKgoGzmEKwccsX1zDK900+R8di8qykmVIbrG8i2RSIZsJLm2e2vn3ERbmc0a ISKWHo0EQeAXJ9nUQUocQFJYpbdUK4f/m+rrcuDrrvE8yqgU2DLz4YMpTN9X/wt8c4us UL6TQXyjyQBu/kF712sS2AsiDMZ4adpYLEQ/1768Urv4EAQZi+hvlTA6K9FGlvJ+Moxu Yz9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=YwvXqfxRD4Q+iplw9Y3trC1ypJY8FWczL3hJEDvfz8w=; b=oc3zIaSA4xp117pe1IEhzMDxhvwAOZs9vzh6sCcusn/GpMRh9DtNySkPqdXnvUP78L JY93540cozJPSxpEkYkYs9jpOoXAmISdRZ08n90VhhuHkphiL2QMh8AsdXa3n8xawYey M7DwEjTuj7sh44i5S2Q3QdMsgIRnEc+5HAi3PCowpQTwzWcJqZip4S5l2c+vMzMghFfT bxXlLoQZlTC2YDy4ebJ4iNN7I1Qx0sYT6DaH27XleiYZV6Vh/0uAmifcrZAjajrp+FVD UgHzJu3Tle62pTe94ghbbghJvl9NFFDjKQjDHauoLc6qDoL9asoYZwZUjjOwbA17mBQO pyMA== X-Gm-Message-State: AOAM530FJlnlPTgt2ZJEFDh/XIwT2rG5kNIouf+WUFfSkk4x4xfmnYDK GvVKbaTOGlH7anmJgJiuYnl0/Q== X-Google-Smtp-Source: ABdhPJxCr+UFfUqF6jeANej6NFM6lIGctjRVA7oJRxaJLatbbucMfEw1qXsTm4eGgOSDTtdwKFauWA== X-Received: by 2002:a1c:ac86:: with SMTP id v128mr9072471wme.3.1635486948193; Thu, 28 Oct 2021 22:55:48 -0700 (PDT) Received: from enceladus (ppp-94-66-220-13.home.otenet.gr. [94.66.220.13]) by smtp.gmail.com with ESMTPSA id m8sm4891058wri.33.2021.10.28.22.55.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 22:55:47 -0700 (PDT) Date: Fri, 29 Oct 2021 08:55:45 +0300 From: Ilias Apalodimas To: Simon Glass Cc: U-Boot Mailing List , Mark Kettenis , Heinrich Schuchardt , Tom Rini , Sean Anderson , Jerry Van Baren Subject: Re: [PATCH v5 20/26] fdt: Drop #ifdefs with MULTI_DTB_FIT Message-ID: References: <20211026002344.405160-1-sjg@chromium.org> <20211026002344.405160-21-sjg@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211026002344.405160-21-sjg@chromium.org> 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 Hi Simon, likewise, since this is a pretty big patchset split it of in refactoring/new code patchsets so we can actually review it. Thanks /Ilias On Mon, Oct 25, 2021 at 06:23:38PM -0600, Simon Glass wrote: > Refactor the code to drop the #ifdefs for this feature. > > Signed-off-by: Simon Glass > --- > > (no changes since v1) > > dts/Kconfig | 1 - > include/asm-generic/global_data.h | 8 ++++++++ > lib/fdtdec.c | 31 +++++++++++-------------------- > 3 files changed, 19 insertions(+), 21 deletions(-) > > diff --git a/dts/Kconfig b/dts/Kconfig > index 20ddc534a61..0f7e3ad7db7 100644 > --- a/dts/Kconfig > +++ b/dts/Kconfig > @@ -176,7 +176,6 @@ endchoice > > config MULTI_DTB_FIT_UNCOMPRESS_SZ > hex "Size of memory reserved to uncompress the DTBs" > - depends on (MULTI_DTB_FIT_GZIP || MULTI_DTB_FIT_LZO) > default 0x8000 > help > This is the size of this area where the DTBs are uncompressed. > diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h > index 16fd305a65c..99daa20c765 100644 > --- a/include/asm-generic/global_data.h > +++ b/include/asm-generic/global_data.h > @@ -512,6 +512,14 @@ static_assert(sizeof(struct global_data) == GD_SIZE); > #define gd_acpi_ctx() NULL > #endif > > +#if CONFIG_IS_ENABLED(MULTI_DTB_FIT) > +#define gd_multi_dtb_fit() gd->multi_dtb_fit > +#define gd_set_multi_dtb_fit(_dtb) gd->multi_dtb_fit = _dtb > +#else > +#define gd_multi_dtb_fit() NULL > +#define gd_set_multi_dtb_fit(_dtb) > +#endif > + > /** > * enum gd_flags - global data flags > * > diff --git a/lib/fdtdec.c b/lib/fdtdec.c > index 58ea8f70cfe..15a990e5b98 100644 > --- a/lib/fdtdec.c > +++ b/lib/fdtdec.c > @@ -1146,11 +1146,10 @@ int fdtdec_setup_mem_size_base_lowest(void) > return 0; > } > > -#if CONFIG_IS_ENABLED(MULTI_DTB_FIT) > -# if CONFIG_IS_ENABLED(MULTI_DTB_FIT_GZIP) ||\ > - CONFIG_IS_ENABLED(MULTI_DTB_FIT_LZO) > static int uncompress_blob(const void *src, ulong sz_src, void **dstp) > { > +#if CONFIG_IS_ENABLED(MULTI_DTB_FIT_GZIP) ||\ > + CONFIG_IS_ENABLED(MULTI_DTB_FIT_LZO) > size_t sz_out = CONFIG_VAL(MULTI_DTB_FIT_UNCOMPRESS_SZ); > bool gzip = 0, lzo = 0; > ulong sz_in = sz_src; > @@ -1175,11 +1174,11 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp) > return -ENOMEM; > } > } else { > -# if CONFIG_IS_ENABLED(MULTI_DTB_FIT_USER_DEFINED_AREA) > +# if CONFIG_IS_ENABLED(MULTI_DTB_FIT_USER_DEFINED_AREA) > dst = (void *)CONFIG_VAL(MULTI_DTB_FIT_USER_DEF_ADDR); > -# else > +# else > return -ENOTSUPP; > -# endif > +# endif > } > > if (CONFIG_IS_ENABLED(GZIP) && gzip) > @@ -1197,16 +1196,12 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp) > return -EBADMSG; > } > *dstp = dst; > - return 0; > -} > -# else > -static int uncompress_blob(const void *src, ulong sz_src, void **dstp) > -{ > +#else > + *dstp = (void *)src; > *dstp = (void *)src; > +#endif > return 0; > } > -# endif > -#endif > > #if defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE) > /* > @@ -1603,7 +1598,6 @@ __weak int fdtdec_board_setup(const void *fdt_blob) > */ > static void setup_multi_dtb_fit(void) > { > -# if CONFIG_IS_ENABLED(MULTI_DTB_FIT) > void *blob; > > /* > @@ -1621,10 +1615,9 @@ static void setup_multi_dtb_fit(void) > */ > blob = locate_dtb_in_fit(gd->fdt_blob); > if (blob) { > - gd->multi_dtb_fit = gd->fdt_blob; > + gd_set_multi_dtb_fit(gd->fdt_blob); > gd->fdt_blob = blob; > } > -#endif /* # MULTI_DTB_FIT */ > } > > int fdtdec_setup(void) > @@ -1659,7 +1652,6 @@ int fdtdec_setup(void) > return ret; > } > > -#if CONFIG_IS_ENABLED(MULTI_DTB_FIT) > int fdtdec_resetup(int *rescan) > { > void *fdt_blob; > @@ -1670,8 +1662,8 @@ int fdtdec_resetup(int *rescan) > * FIT image stillpresent there. Save the time and space > * required to uncompress it again. > */ > - if (gd->multi_dtb_fit) { > - fdt_blob = locate_dtb_in_fit(gd->multi_dtb_fit); > + if (gd_multi_dtb_fit()) { > + fdt_blob = locate_dtb_in_fit(gd_multi_dtb_fit()); > > if (fdt_blob == gd->fdt_blob) { > /* > @@ -1695,7 +1687,6 @@ int fdtdec_resetup(int *rescan) > *rescan = 0; > return 0; > } > -#endif > > int fdtdec_decode_ram_size(const void *blob, const char *area, int board_id, > phys_addr_t *basep, phys_size_t *sizep, > -- > 2.33.0.1079.g6e70778dc9-goog >