diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-05-21 15:31:42 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-06-11 17:42:36 +0100 |
| commit | 12290cc462c24deee503e84e87dea622b40ea15d (patch) | |
| tree | 845768ee87936136dfb63d3a7cc145b2a51a1fae | |
| parent | e579201a832cb796a474ef743d131eff2730cfa7 (diff) | |
ARM: riscpc: move RiscPC assembly files from arch/arm/lib to mach-rpc
Move the assembly files for RiscPC from arch/arm/lib to mach-rpc so
that we contain RiscPC bits in one subdirectory.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | arch/arm/lib/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-rpc/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/mach-rpc/ecard-loader.S (renamed from arch/arm/lib/ecard.S) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-rpc/floppydma.S (renamed from arch/arm/lib/floppydma.S) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-rpc/io-acorn.S (renamed from arch/arm/lib/io-acorn.S) | 0 |
6 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2c2fce72e694..e1ff69fd5bb7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1183,7 +1183,7 @@ F: Documentation/gpu/afbc.rst ARM MFM AND FLOPPY DRIVERS M: Ian Molton <spyro@f2s.com> S: Maintained -F: arch/arm/lib/floppydma.S +F: arch/arm/mach-rpc/floppydma.S F: arch/arm/include/asm/floppy.h ARM PMU PROFILING AND DEBUGGING diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 0bff0176db2c..b25c54585048 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -31,7 +31,6 @@ else endif ifeq ($(CONFIG_ARCH_RPC),y) - lib-y += ecard.o io-acorn.o floppydma.o AFLAGS_delay-loop.o += -march=armv4 endif diff --git a/arch/arm/mach-rpc/Makefile b/arch/arm/mach-rpc/Makefile index 2ebc6875aeb8..ab964a66ea2a 100644 --- a/arch/arm/mach-rpc/Makefile +++ b/arch/arm/mach-rpc/Makefile @@ -4,4 +4,5 @@ # Object file lists. -obj-y := dma.o ecard.o fiq.o irq.o riscpc.o time.o +obj-y :=dma.o ecard.o ecard-loader.o fiq.o floppydma.o io-acorn.o irq.o \ + riscpc.o time.o diff --git a/arch/arm/lib/ecard.S b/arch/arm/mach-rpc/ecard-loader.S index e6057fa851bb..e6057fa851bb 100644 --- a/arch/arm/lib/ecard.S +++ b/arch/arm/mach-rpc/ecard-loader.S diff --git a/arch/arm/lib/floppydma.S b/arch/arm/mach-rpc/floppydma.S index de68d3b343e3..de68d3b343e3 100644 --- a/arch/arm/lib/floppydma.S +++ b/arch/arm/mach-rpc/floppydma.S diff --git a/arch/arm/lib/io-acorn.S b/arch/arm/mach-rpc/io-acorn.S index 69719bad674d..69719bad674d 100644 --- a/arch/arm/lib/io-acorn.S +++ b/arch/arm/mach-rpc/io-acorn.S |