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 B2B97C61DA3 for ; Wed, 22 Feb 2023 01:41:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6244C85AA2; Wed, 22 Feb 2023 02:39:52 +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="WL2lXsZU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D1F9685A76; Wed, 22 Feb 2023 02:39:12 +0100 (CET) Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) (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 2DC4C80BA3 for ; Wed, 22 Feb 2023 02:38:58 +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-pg1-x52b.google.com with SMTP id 130so937227pgg.3 for ; Tue, 21 Feb 2023 17:38:58 -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=ZUQHqwIbmu2GGYrClYKKq3l3xe3M5Ydt49d+w1Lb+/A=; b=WL2lXsZUS7WtWIGkSm33Lrvs95/moOZqVQYLTU4RY0G2LUJThCo1DUguof9PHd/uQ7 nxdC0L2w8hseV796g30XYEO2Q6GrX1twViKFl3ruJMWTHz/Ch19BeW7rxW9lYm1PeOej kC+ub72egmXh5KGhoXt8Jyw1gUHxiS0Ib/xYqaSj9Idh4ikhNQpgXhY53gyLZfxoG5ti JzQiaQFQTut82rINGYFl9Xa/cbxwA0+51YT6XaqNszxC5jX5vQn1UL/NJvDim/jaaSRH dNgYS2xeyF2v6bQ9WnJT2gvm0PHUNLMC1taIC2ClGkgh4ry9cP5UQTjEFLYFnTB6zgEG 0OWQ== 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=ZUQHqwIbmu2GGYrClYKKq3l3xe3M5Ydt49d+w1Lb+/A=; b=uXijUPnw1OJwxls1JJZU5JBgDA8DGYJ16Ps7/59mKXS/txjJ3lZb1HwkGD2Gg73ySZ /WcSnOcSoz2fyX5tY7+fq6uuPj81lNTLTn/QQT7O9Ya0kzpwzElpDtzeozuDpsX+z01i 2rQ6YniqbJzHlE/gj5Nu/DRoG78heh8JbNTELOpQF6exCDQ8caxFPVI0buCpW22TR0aQ QgiBuaTV3HCeeWHRfXGSkmh+f6evYai61BlbSl8swOyngBY4r0nl4gOkwS7ZNOk/NH8F gtpLkDBKJDkttZC5e8TJmx9j6iJcbOHYROZdHpjHOKUmsoPJM2o1sRaqlpJIxkau6Vh8 oIfA== X-Gm-Message-State: AO0yUKVjg3dzxWMNGr4idqkGBEzSWtsNLH+NyDCmiKBjj2PaPsbjV6tu 0bSnKcYYbeqG1ej2LGcnqQs= X-Google-Smtp-Source: AK7set/ieLvFHSXpb8vXIrEELjnw+b1eQb0WOBAsFsvKJnzw/viWUHuLlEav3b1EBtMLvbvb//FNDQ== X-Received: by 2002:a62:79c5:0:b0:5a9:4af:b05b with SMTP id u188-20020a6279c5000000b005a904afb05bmr5365548pfc.12.1677029936127; Tue, 21 Feb 2023 17:38:56 -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 d6-20020aa78e46000000b005accb31201fsm4200976pfr.26.2023.02.21.17.38.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 17:38:55 -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 v1 14/24] fdt_support: always define fdt_fixup_mtdparts Date: Tue, 21 Feb 2023 17:38:11 -0800 Message-Id: <20230222013821.1144691-15-troykiskyboundary@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230222013821.1144691-1-troykiskyboundary@gmail.com> References: <20230222013821.1144691-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 --- 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