From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [Linaro-uefi] [PATCH V2 11/12] Add fdt_create_empty_tree() function. Date: Tue, 22 Jul 2014 17:36:09 +0100 Message-ID: <53CE92F9.30709@linaro.org> References: <1405989815-25236-1-git-send-email-roy.franz@linaro.org> <1405989815-25236-12-git-send-email-roy.franz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1405989815-25236-12-git-send-email-roy.franz@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Roy Franz , xen-devel@lists.xen.org, ian.campbell@citrix.com, stefano.stabellini@citrix.com, tim@xen.org, jbeulich@suse.com, keir@xen.org Cc: linaro-uefi@lists.linaro.org List-Id: xen-devel@lists.xenproject.org Hi Roy, On 07/22/2014 01:43 AM, Roy Franz wrote: > Add fdt_create_empty_tree() function from v1.4.0 of libfdt taken from > git://git.jdl.com/software/dtc.git > This function was not present in v1.3.0, but is a relatively simple > helper function, and appears to work fine with the v1.3.0 that is > currently present in XEN. Shouldn't we update our internal libfdt to v1.4.0 rather than taking only the new file? Regards, > Signed-off-by: Roy Franz > --- > xen/common/libfdt/Makefile.libfdt | 2 +- > xen/common/libfdt/fdt_empty_tree.c | 84 ++++++++++++++++++++++++++++++++++++++ > xen/include/xen/libfdt/libfdt.h | 1 + > 3 files changed, 86 insertions(+), 1 deletion(-) > create mode 100644 xen/common/libfdt/fdt_empty_tree.c > > diff --git a/xen/common/libfdt/Makefile.libfdt b/xen/common/libfdt/Makefile.libfdt > index d55a6f8..4366627 100644 > --- a/xen/common/libfdt/Makefile.libfdt > +++ b/xen/common/libfdt/Makefile.libfdt > @@ -6,5 +6,5 @@ > LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).1 > LIBFDT_INCLUDES = fdt.h libfdt.h > LIBFDT_VERSION = version.lds > -LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c > +LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c > LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) > diff --git a/xen/common/libfdt/fdt_empty_tree.c b/xen/common/libfdt/fdt_empty_tree.c > new file mode 100644 > index 0000000..f72d13b > --- /dev/null > +++ b/xen/common/libfdt/fdt_empty_tree.c > @@ -0,0 +1,84 @@ > +/* > + * libfdt - Flat Device Tree manipulation > + * Copyright (C) 2012 David Gibson, IBM Corporation. > + * > + * libfdt is dual licensed: you can use it either under the terms of > + * the GPL, or the BSD license, at your option. > + * > + * a) This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public > + * License along with this library; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, > + * MA 02110-1301 USA > + * > + * Alternatively, > + * > + * b) Redistribution and use in source and binary forms, with or > + * without modification, are permitted provided that the following > + * conditions are met: > + * > + * 1. Redistributions of source code must retain the above > + * copyright notice, this list of conditions and the following > + * disclaimer. > + * 2. Redistributions in binary form must reproduce the above > + * copyright notice, this list of conditions and the following > + * disclaimer in the documentation and/or other materials > + * provided with the distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND > + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, > + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF > + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE > + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR > + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT > + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; > + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR > + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, > + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + */ > +#include "libfdt_env.h" > + > +#include > +#include > + > +#include "libfdt_internal.h" > + > +int fdt_create_empty_tree(void *buf, int bufsize) > +{ > + int err; > + > + err = fdt_create(buf, bufsize); > + if (err) > + return err; > + > + err = fdt_finish_reservemap(buf); > + if (err) > + return err; > + > + err = fdt_begin_node(buf, ""); > + if (err) > + return err; > + > + err = fdt_end_node(buf); > + if (err) > + return err; > + > + err = fdt_finish(buf); > + if (err) > + return err; > + > + return fdt_open_into(buf, buf, bufsize); > +} > + > diff --git a/xen/include/xen/libfdt/libfdt.h b/xen/include/xen/libfdt/libfdt.h > index 6086047..f4539fc 100644 > --- a/xen/include/xen/libfdt/libfdt.h > +++ b/xen/include/xen/libfdt/libfdt.h > @@ -959,6 +959,7 @@ int fdt_finish(void *fdt); > /* Read-write functions */ > /**********************************************************************/ > > +int fdt_create_empty_tree(void *buf, int bufsize); > int fdt_open_into(const void *fdt, void *buf, int bufsize); > int fdt_pack(void *fdt); > > -- Julien Grall