diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-03-01 14:21:16 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-03-01 14:21:16 +0100 |
commit | db6acc08ec78cd019da87b22ef925ba78028abf4 (patch) | |
tree | 895aea25c656698017bbfe0887a37316b5a0bf57 | |
parent | dc3ad581df75d2d002675bcdeba28fc36c49b102 (diff) | |
parent | be077c7512440d1e52f96210a6855f171579f6f5 (diff) | |
download | barebox-db6acc08ec78cd019da87b22ef925ba78028abf4.tar.gz barebox-db6acc08ec78cd019da87b22ef925ba78028abf4.tar.xz |
Merge branch 'for-next/misc'
-rw-r--r-- | arch/arm/mach-davinci/include/mach/debug_ll.h | 17 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/hardware.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/serial.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/time.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-davinci/time.c | 8 | ||||
-rw-r--r-- | drivers/of/fdt.c | 15 |
6 files changed, 27 insertions, 37 deletions
diff --git a/arch/arm/mach-davinci/include/mach/debug_ll.h b/arch/arm/mach-davinci/include/mach/debug_ll.h index d509e849f3..60a8d2a5f1 100644 --- a/arch/arm/mach-davinci/include/mach/debug_ll.h +++ b/arch/arm/mach-davinci/include/mach/debug_ll.h @@ -1,18 +1,5 @@ -/* - * Copyright (C) 2014 Antony Pavlov <antonynpavlov@gmail.com> - * - * This file is part of barebox. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program 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. - * - */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-FileCopyrightText: 2014 Antony Pavlov <antonynpavlov@gmail.com> */ /** @file * This File contains declaration for early output support diff --git a/arch/arm/mach-davinci/include/mach/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h index ea9f481844..8ab824800e 100644 --- a/arch/arm/mach-davinci/include/mach/hardware.h +++ b/arch/arm/mach-davinci/include/mach/hardware.h @@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-FileCopyrightText: 2007 Deep Root Systems, LLC. */ + /* * Hardware definitions common to all DaVinci family processors * * Author: Kevin Hilman, Deep Root Systems, LLC - * - * 2007 (c) Deep Root Systems, LLC. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. */ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/arch/arm/mach-davinci/include/mach/serial.h index bc7449f3d7..03e8ef43dd 100644 --- a/arch/arm/mach-davinci/include/mach/serial.h +++ b/arch/arm/mach-davinci/include/mach/serial.h @@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-FileCopyrightText: 2007 MontaVista Software, Inc. */ + /* * DaVinci serial device definitions * * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com> - * - * 2007 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. */ #ifndef __ASM_ARCH_SERIAL_H #define __ASM_ARCH_SERIAL_H diff --git a/arch/arm/mach-davinci/include/mach/time.h b/arch/arm/mach-davinci/include/mach/time.h index 34781b6ec5..6456205859 100644 --- a/arch/arm/mach-davinci/include/mach/time.h +++ b/arch/arm/mach-davinci/include/mach/time.h @@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-FileCopyrightText: 2007 MontaVista Software, Inc. */ + /* * Local header file for DaVinci time code. * * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com> - * - * 2007 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. */ #ifndef __ARCH_ARM_MACH_DAVINCI_TIME_H #define __ARCH_ARM_MACH_DAVINCI_TIME_H diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index 5b57fe6192..52b3ac3e68 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c @@ -1,12 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* SPDX-FileCopyrightText: 2007 MontaVista Software, Inc. */ + /* * DaVinci timer subsystem * * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com> - * - * 2007 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. */ #include <common.h> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index a31e2c348a..d98913e54a 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -184,10 +184,21 @@ static struct device_node *__of_unflatten_dtb(const void *infdt, bool constprops goto err; } - if (!node) + if (!node) { + /* The root node must have an empty name */ + if (*pathp) { + ret = -EINVAL; + goto err; + } node = root; - else + } else { + /* Only the root node may have an empty name */ + if (!*pathp) { + ret = -EINVAL; + goto err; + } node = of_new_node(node, pathp); + } dt_struct = dt_struct_advance(&f, dt_struct, sizeof(struct fdt_node_header) + len + 1); |