mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 00:21:59 +00:00
49148020bc
Merge header files for m68k and m68knommu to the single location:
arch/m68k/include/asm
The majority of this patch was the result of the
script that is included in the changelog below.
The script was originally written by Arnd Bergman and
exten by me to cover a few more files.
When the header files differed the script uses the following:
The original m68k file is named <file>_mm.h [mm for memory manager]
The m68knommu file is named <file>_no.h [no for no memory manager]
The files uses the following include guard:
This include gaurd works as the m68knommu toolchain set
the __uClinux__ symbol - so this should work in userspace too.
Merging the header files for m68k and m68knommu exposes the
(unexpected?) ABI differences thus it is easier to actually
identify these and thus to fix them.
The commit has been build tested with both a m68k and
a m68knommu toolchain - with success.
The commit has also been tested with "make headers_check"
and this patch fixes make headers_check for m68knommu.
The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm
INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"
EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"
NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"
FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"
mergefile() {
BASE=${1%.h}
git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h
cat << EOF > ${TARGET}/$1
EOF
git add ${TARGET}/$1
}
set -e
mkdir -p ${TARGET}
git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k
git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do
git rm ${SOURCE}/$F
done
for F in $NOMUUFILES; do
git mv ${SOURCE}/$F ${TARGET}/$F
done
for F in $FILES ; do
mergefile $F
done
rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
54 lines
3.3 KiB
C
54 lines
3.3 KiB
C
#ifndef _M68K_CONTREGS_H
|
|
#define _M68K_CONTREGS_H
|
|
|
|
/* contregs.h: Addresses of registers in the ASI_CONTROL alternate address
|
|
* space. These are for the mmu's context register, etc.
|
|
*
|
|
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
|
|
*/
|
|
|
|
/* 3=sun3
|
|
4=sun4 (as in sun4 sysmaint student book)
|
|
c=sun4c (according to davem) */
|
|
|
|
#define AC_IDPROM 0x00000000 /* 34 ID PROM, R/O, byte, 32 bytes */
|
|
#define AC_PAGEMAP 0x10000000 /* 3 Pagemap R/W, long */
|
|
#define AC_SEGMAP 0x20000000 /* 3 Segment map, byte */
|
|
#define AC_CONTEXT 0x30000000 /* 34c current mmu-context */
|
|
#define AC_SENABLE 0x40000000 /* 34c system dvma/cache/reset enable reg*/
|
|
#define AC_UDVMA_ENB 0x50000000 /* 34 Not used on Sun boards, byte */
|
|
#define AC_BUS_ERROR 0x60000000 /* 34 Not cleared on read, byte. */
|
|
#define AC_SYNC_ERR 0x60000000 /* c fault type */
|
|
#define AC_SYNC_VA 0x60000004 /* c fault virtual address */
|
|
#define AC_ASYNC_ERR 0x60000008 /* c asynchronous fault type */
|
|
#define AC_ASYNC_VA 0x6000000c /* c async fault virtual address */
|
|
#define AC_LEDS 0x70000000 /* 34 Zero turns on LEDs, byte */
|
|
#define AC_CACHETAGS 0x80000000 /* 34c direct access to the VAC tags */
|
|
#define AC_CACHEDDATA 0x90000000 /* 3 c direct access to the VAC data */
|
|
#define AC_UDVMA_MAP 0xD0000000 /* 4 Not used on Sun boards, byte */
|
|
#define AC_VME_VECTOR 0xE0000000 /* 4 For non-Autovector VME, byte */
|
|
#define AC_BOOT_SCC 0xF0000000 /* 34 bypass to access Zilog 8530. byte.*/
|
|
|
|
/* s=Swift, h=Ross_HyperSPARC, v=TI_Viking, t=Tsunami, r=Ross_Cypress */
|
|
#define AC_M_PCR 0x0000 /* shv Processor Control Reg */
|
|
#define AC_M_CTPR 0x0100 /* shv Context Table Pointer Reg */
|
|
#define AC_M_CXR 0x0200 /* shv Context Register */
|
|
#define AC_M_SFSR 0x0300 /* shv Synchronous Fault Status Reg */
|
|
#define AC_M_SFAR 0x0400 /* shv Synchronous Fault Address Reg */
|
|
#define AC_M_AFSR 0x0500 /* hv Asynchronous Fault Status Reg */
|
|
#define AC_M_AFAR 0x0600 /* hv Asynchronous Fault Address Reg */
|
|
#define AC_M_RESET 0x0700 /* hv Reset Reg */
|
|
#define AC_M_RPR 0x1000 /* hv Root Pointer Reg */
|
|
#define AC_M_TSUTRCR 0x1000 /* s TLB Replacement Ctrl Reg */
|
|
#define AC_M_IAPTP 0x1100 /* hv Instruction Access PTP */
|
|
#define AC_M_DAPTP 0x1200 /* hv Data Access PTP */
|
|
#define AC_M_ITR 0x1300 /* hv Index Tag Register */
|
|
#define AC_M_TRCR 0x1400 /* hv TLB Replacement Control Reg */
|
|
#define AC_M_SFSRX 0x1300 /* s Synch Fault Status Reg prim */
|
|
#define AC_M_SFARX 0x1400 /* s Synch Fault Address Reg prim */
|
|
#define AC_M_RPR1 0x1500 /* h Root Pointer Reg (entry 2) */
|
|
#define AC_M_IAPTP1 0x1600 /* h Instruction Access PTP (entry 2) */
|
|
#define AC_M_DAPTP1 0x1700 /* h Data Access PTP (entry 2) */
|
|
|
|
#endif /* _M68K_CONTREGS_H */
|