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>
This commit is contained in:
@@ -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
|
||||
|
||||
|
@@ -1,44 +0,0 @@
|
||||
/*
|
||||
* linux/arch/arm/lib/ecard.S
|
||||
*
|
||||
* Copyright (C) 1995, 1996 Russell King
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* 27/03/03 Ian Molton Clean up CONFIG_CPU
|
||||
*
|
||||
*/
|
||||
#include <linux/linkage.h>
|
||||
#include <asm/assembler.h>
|
||||
|
||||
#define CPSR2SPSR(rt) \
|
||||
mrs rt, cpsr; \
|
||||
msr spsr_cxsf, rt
|
||||
|
||||
@ Purpose: call an expansion card loader to read bytes.
|
||||
@ Proto : char read_loader(int offset, char *card_base, char *loader);
|
||||
@ Returns: byte read
|
||||
|
||||
ENTRY(ecard_loader_read)
|
||||
stmfd sp!, {r4 - r12, lr}
|
||||
mov r11, r1
|
||||
mov r1, r0
|
||||
CPSR2SPSR(r0)
|
||||
mov lr, pc
|
||||
mov pc, r2
|
||||
ldmfd sp!, {r4 - r12, pc}
|
||||
|
||||
@ Purpose: call an expansion card loader to reset the card
|
||||
@ Proto : void read_loader(int card_base, char *loader);
|
||||
@ Returns: byte read
|
||||
|
||||
ENTRY(ecard_loader_reset)
|
||||
stmfd sp!, {r4 - r12, lr}
|
||||
mov r11, r0
|
||||
CPSR2SPSR(r0)
|
||||
mov lr, pc
|
||||
add pc, r1, #8
|
||||
ldmfd sp!, {r4 - r12, pc}
|
||||
|
@@ -1,32 +0,0 @@
|
||||
/*
|
||||
* linux/arch/arm/lib/floppydma.S
|
||||
*
|
||||
* Copyright (C) 1995, 1996 Russell King
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
#include <linux/linkage.h>
|
||||
#include <asm/assembler.h>
|
||||
.text
|
||||
|
||||
.global floppy_fiqin_end
|
||||
ENTRY(floppy_fiqin_start)
|
||||
subs r9, r9, #1
|
||||
ldrbgt r12, [r11, #-4]
|
||||
ldrble r12, [r11], #0
|
||||
strb r12, [r10], #1
|
||||
subs pc, lr, #4
|
||||
floppy_fiqin_end:
|
||||
|
||||
.global floppy_fiqout_end
|
||||
ENTRY(floppy_fiqout_start)
|
||||
subs r9, r9, #1
|
||||
ldrbge r12, [r10], #1
|
||||
movlt r12, #0
|
||||
strble r12, [r11], #0
|
||||
subsle pc, lr, #4
|
||||
strb r12, [r11, #-4]
|
||||
subs pc, lr, #4
|
||||
floppy_fiqout_end:
|
@@ -1,32 +0,0 @@
|
||||
/*
|
||||
* linux/arch/arm/lib/io-acorn.S
|
||||
*
|
||||
* Copyright (C) 1995, 1996 Russell King
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* 27/03/03 Ian Molton Clean up CONFIG_CPU
|
||||
*
|
||||
*/
|
||||
#include <linux/linkage.h>
|
||||
#include <linux/kern_levels.h>
|
||||
#include <asm/assembler.h>
|
||||
|
||||
.text
|
||||
.align
|
||||
|
||||
.Liosl_warning:
|
||||
.ascii KERN_WARNING "insl/outsl not implemented, called from %08lX\0"
|
||||
.align
|
||||
|
||||
/*
|
||||
* These make no sense on Acorn machines.
|
||||
* Print a warning message.
|
||||
*/
|
||||
ENTRY(insl)
|
||||
ENTRY(outsl)
|
||||
adr r0, .Liosl_warning
|
||||
mov r1, lr
|
||||
b printk
|
Reference in New Issue
Block a user