diff options
author | Rob Herring <robh@kernel.org> | 2018-01-05 17:09:38 -0500 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2018-01-30 12:15:54 -0500 |
commit | 0fbc0b67a89d756ae3a839be01440e54348159a0 (patch) | |
tree | 12a7369248d6e290cc06fd5887a4f9b630094528 /arch/cris | |
parent | 5fbd55d21e562977773217828fcfa33cc44b16ac (diff) |
cris: remove arch specific early DT functions
Now that the DT core code handles bootmem arches, we can remove the cris
specific early_init_dt_alloc_memory_arch function. As the default
early_init_dt_add_memory_arch just does a WARN, we can just remove the
entire devicetree.c file.
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: linux-cris-kernel@axis.com
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/kernel/Makefile | 19 | ||||
-rw-r--r-- | arch/cris/kernel/devicetree.c | 15 |
2 files changed, 0 insertions, 34 deletions
diff --git a/arch/cris/kernel/Makefile b/arch/cris/kernel/Makefile index af075a5fb9aa..e69de29bb2d1 100644 --- a/arch/cris/kernel/Makefile +++ b/arch/cris/kernel/Makefile | |||
@@ -1,19 +0,0 @@ | |||
1 | # SPDX-License-Identifier: GPL-2.0 | ||
2 | # $Id: Makefile,v 1.12 2004/10/19 13:07:43 starvik Exp $ | ||
3 | # | ||
4 | # Makefile for the linux kernel. | ||
5 | # | ||
6 | |||
7 | CPPFLAGS_vmlinux.lds := -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) | ||
8 | extra-y := vmlinux.lds | ||
9 | |||
10 | obj-y := process.o traps.o irq.o ptrace.o setup.o time.o sys_cris.o | ||
11 | obj-y += devicetree.o | ||
12 | obj-y += stacktrace.o | ||
13 | |||
14 | obj-$(CONFIG_MODULES) += crisksyms.o | ||
15 | obj-$(CONFIG_MODULES) += module.o | ||
16 | obj-$(CONFIG_SYSTEM_PROFILER) += profile.o | ||
17 | |||
18 | clean: | ||
19 | |||
diff --git a/arch/cris/kernel/devicetree.c b/arch/cris/kernel/devicetree.c deleted file mode 100644 index 36e1c658229f..000000000000 --- a/arch/cris/kernel/devicetree.c +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0 | ||
2 | #include <linux/init.h> | ||
3 | #include <linux/bootmem.h> | ||
4 | #include <linux/printk.h> | ||
5 | |||
6 | void __init early_init_dt_add_memory_arch(u64 base, u64 size) | ||
7 | { | ||
8 | pr_err("%s(%llx, %llx)\n", | ||
9 | __func__, base, size); | ||
10 | } | ||
11 | |||
12 | void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) | ||
13 | { | ||
14 | return alloc_bootmem_align(size, align); | ||
15 | } | ||