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 83232C6FA8E for ; Fri, 24 Feb 2023 18:20:09 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E6FC385B78; Fri, 24 Feb 2023 19:18:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="Rw+duBB8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9E38D85B99; Fri, 24 Feb 2023 19:11:43 +0100 (CET) Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) (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 ED8C8857C1 for ; Fri, 24 Feb 2023 19:11:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=troykiskyboundary@gmail.com Received: by mail-pj1-x102d.google.com with SMTP id y15-20020a17090aa40f00b00237ad8ee3a0so47803pjp.2 for ; Fri, 24 Feb 2023 10:11:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=udnCJxfKMgTIlsmTbLo0qPLSxqJYu9FfdV6HSIB3/sk=; b=Rw+duBB88LXnQQfr2EtP+2DOqC0K8/kKJmFcOU75Zq6PkyqOXdJZTjP3tCg4wNKn3t 6NGDW12NwgTn81IusFB170fg3ZgGl5pQvrwKOsw/Uy7aLBi6Yivpl4Fm8WgW74OZEOnj fqdZYZSTaovSEI0OyNf/DRbdftCnOdSnCGdVdbKMcVLdRnl0VlK8zLKnT8dxm3xQ+aiL cTw92HY1PDuKlDBTKhXtrgCRHMIyN8ZPrhL55AZmE1/GlkHel+1217aWbBB/y0ttDjMg fMek9Y2jQBYKukBCvbTzAea+vf9CLbpOv2MRCITxWxbkwfhUd6YkezyodRhgFEy4jW2M beYw== 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 :subject:date:message-id:reply-to; bh=udnCJxfKMgTIlsmTbLo0qPLSxqJYu9FfdV6HSIB3/sk=; b=bATW04sv74K1l+ybxwWPhGp3aqLLQdkSxipGahF16J3i0OhDEqpqxBi6AX4Zf8NdXE N+3aU8C2IXL/H7rzCP9CHz1P9TPMzjYYwNZnsiyUOtRxsfV+Jys+QRnR4jkUuI1pXciM +JHg10e1Z1GbJocIRrVBqHg5Oy+mOPENFq9r6BtpsiuSc/xIc3fkeZK08x5IkPj13Neu XzKXiZWjxIeW/rNrTMIBC1kUwbh0h688cjuDbqgeE3yUJH+jMrztbZBibxiAskJ/Ol6G +zsendsusKS8dBqZ9wX+BUt6qUP5ShhwsqCr5KxO+I+/l2tIsnYPw2TMtQH3x9XUNwLw AhaQ== X-Gm-Message-State: AO0yUKUDPC70qOw4L2Tv7mykeh15Ovbt4JKKH6cSEkCd4kj7rSn6fiAg CRWuxcbRGpksjafDUl4C9oE= X-Google-Smtp-Source: AK7set+8XEuI4dJZoUj+EySuQYpQIyKeuA/Shp41pvD97de5zohxFGXxoUynqNoQdtO11bEDkPyOZg== X-Received: by 2002:a17:902:e888:b0:19a:95ab:6b2b with SMTP id w8-20020a170902e88800b0019a95ab6b2bmr19880024plg.69.1677262277697; Fri, 24 Feb 2023 10:11:17 -0800 (PST) Received: from OS2.boundarydevices.com. (wsip-184-189-120-117.oc.oc.cox.net. [184.189.120.117]) by smtp.gmail.com with ESMTPSA id o1-20020a170902bcc100b0019c922911a2sm7513957pls.40.2023.02.24.10.11.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 10:11:17 -0800 (PST) From: Troy Kisky To: sjg@chromium.org, trini@konsulko.com, u-boot@lists.denx.de Cc: gary.bisson@lairdconnect.com, Troy Kisky , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH v2 15/26] fdt_support: always define fdt_fixup_mtdparts Date: Fri, 24 Feb 2023 10:10:36 -0800 Message-Id: <20230224181047.2775829-16-troykiskyboundary@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224181047.2775829-1-troykiskyboundary@gmail.com> References: <20230224181047.2775829-1-troykiskyboundary@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 SPL code wants fdt_fixup_mtdparts defined as a NOP when the function isn't linked in. Prepare for ifdef CONFIG_OF_LIBFDT being converted to if CONFIG_IS_ENABLED(OF_LIBFDT) Signed-off-by: Troy Kisky Reviewed-by: Simon Glass --- (no changes since v1) include/fdt_support.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/include/fdt_support.h b/include/fdt_support.h index eeb83e6251d..94497d755a3 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -245,16 +245,6 @@ int fdt_increase_size(void *fdt, int add_len); int fdt_delete_disabled_nodes(void *blob); struct node_info; -#if defined(CONFIG_FDT_FIXUP_PARTITIONS) -void fdt_fixup_mtdparts(void *fdt, const struct node_info *node_info, - int node_info_size); -#else -static inline void fdt_fixup_mtdparts(void *fdt, - const struct node_info *node_info, - int node_info_size) -{ -} -#endif void fdt_del_node_and_alias(void *blob, const char *alias); @@ -412,6 +402,19 @@ int fdt_get_cells_len(const void *blob, char *nr_cells_name); #endif /* ifdef CONFIG_OF_LIBFDT */ +#if CONFIG_IS_ENABLED(OF_LIBFDT) && defined(CONFIG_FDT_FIXUP_PARTITIONS) +struct node_info; +void fdt_fixup_mtdparts(void *fdt, const struct node_info *node_info, + int node_info_size); +#else +struct node_info; +static inline void fdt_fixup_mtdparts(void *fdt, + const struct node_info *node_info, + int node_info_size) +{ +} +#endif + #ifdef USE_HOSTCC int fdtdec_get_int(const void *blob, int node, const char *prop_name, int default_val); -- 2.34.1