Skip to content

Commit

Permalink
ARM: vexpress: Remove non-DT code
Browse files Browse the repository at this point in the history
Now, with the CLCD DT support available, there is no
more reason to keep the non-DT support for V2P-CA9.

Removed, together with "some" supporting code. It was
necessary to make PLAT_VERSATILE_SCHED_CLOCK optional
and selected by the machines still interested in it.

Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Pawel Moll authored and Arnd Bergmann committed Nov 28, 2014
1 parent ad77b79 commit 81cc3f8
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 943 deletions.
2 changes: 2 additions & 0 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ config ARCH_REALVIEW
select ICST
select NEED_MACH_MEMORY_H
select PLAT_VERSATILE
select PLAT_VERSATILE_SCHED_CLOCK
help
This enables support for ARM Ltd RealView boards.

Expand All @@ -365,6 +366,7 @@ config ARCH_VERSATILE
select ICST
select PLAT_VERSATILE
select PLAT_VERSATILE_CLOCK
select PLAT_VERSATILE_SCHED_CLOCK
select VERSATILE_FPGA_IRQ
help
This enables support for ARM Ltd Versatile board.
Expand Down
3 changes: 0 additions & 3 deletions arch/arm/mach-vexpress/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
build a working kernel, you must also enable relevant core
tile support or Flattened Device Tree based support options.

config ARCH_VEXPRESS_CA9X4
bool "Versatile Express Cortex-A9x4 tile"

config ARCH_VEXPRESS_DCSCB
bool "Dual Cluster System Control Block (DCSCB) support"
depends on MCPM
Expand Down
3 changes: 1 addition & 2 deletions arch/arm/mach-vexpress/Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#
# Makefile for the linux kernel.
#
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := \
-I$(srctree)/arch/arm/plat-versatile/include

obj-y := v2m.o
obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o
obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o
CFLAGS_dcscb.o += -march=armv7-a
CFLAGS_REMOVE_dcscb.o = -pg
Expand Down
7 changes: 0 additions & 7 deletions arch/arm/mach-vexpress/core.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
/* 2MB large area for motherboard's peripherals static mapping */
#define V2M_PERIPH 0xf8000000

/* Tile's peripherals static mappings should start here */
#define V2T_PERIPH 0xf8200000

bool vexpress_smp_init_ops(void);

extern struct smp_operations vexpress_smp_ops;
extern struct smp_operations vexpress_smp_dt_ops;

extern void vexpress_cpu_die(unsigned int cpu);
212 changes: 0 additions & 212 deletions arch/arm/mach-vexpress/ct-ca9x4.c

This file was deleted.

47 changes: 0 additions & 47 deletions arch/arm/mach-vexpress/include/mach/ct-ca9x4.h

This file was deleted.

1 change: 0 additions & 1 deletion arch/arm/mach-vexpress/include/mach/hardware.h

This file was deleted.

6 changes: 0 additions & 6 deletions arch/arm/mach-vexpress/include/mach/irqs.h

This file was deleted.

Loading

0 comments on commit 81cc3f8

Please sign in to comment.