mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 05:01:48 +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>
65 lines
2.7 KiB
C
65 lines
2.7 KiB
C
/****************************************************************************/
|
|
|
|
/*
|
|
* mcfpit.h -- ColdFire internal PIT timer support defines.
|
|
*
|
|
* (C) Copyright 2003, Greg Ungerer (gerg@snapgear.com)
|
|
*/
|
|
|
|
/****************************************************************************/
|
|
#ifndef mcfpit_h
|
|
#define mcfpit_h
|
|
/****************************************************************************/
|
|
|
|
|
|
/*
|
|
* Get address specific defines for the 5270/5271, 5280/5282, and 5208.
|
|
*/
|
|
#if defined(CONFIG_M520x)
|
|
#define MCFPIT_BASE1 0x00080000 /* Base address of TIMER1 */
|
|
#define MCFPIT_BASE2 0x00084000 /* Base address of TIMER2 */
|
|
#else
|
|
#define MCFPIT_BASE1 0x00150000 /* Base address of TIMER1 */
|
|
#define MCFPIT_BASE2 0x00160000 /* Base address of TIMER2 */
|
|
#define MCFPIT_BASE3 0x00170000 /* Base address of TIMER3 */
|
|
#define MCFPIT_BASE4 0x00180000 /* Base address of TIMER4 */
|
|
#endif
|
|
|
|
/*
|
|
* Define the PIT timer register set addresses.
|
|
*/
|
|
#define MCFPIT_PCSR 0x0 /* PIT control register */
|
|
#define MCFPIT_PMR 0x2 /* PIT modulus register */
|
|
#define MCFPIT_PCNTR 0x4 /* PIT count register */
|
|
|
|
/*
|
|
* Bit definitions for the PIT Control and Status register.
|
|
*/
|
|
#define MCFPIT_PCSR_CLK1 0x0000 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK2 0x0100 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK4 0x0200 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK8 0x0300 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK16 0x0400 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK32 0x0500 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK64 0x0600 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK128 0x0700 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK256 0x0800 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK512 0x0900 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK1024 0x0a00 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK2048 0x0b00 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK4096 0x0c00 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK8192 0x0d00 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK16384 0x0e00 /* System clock divisor */
|
|
#define MCFPIT_PCSR_CLK32768 0x0f00 /* System clock divisor */
|
|
#define MCFPIT_PCSR_DOZE 0x0040 /* Clock run in doze mode */
|
|
#define MCFPIT_PCSR_HALTED 0x0020 /* Clock run in halt mode */
|
|
#define MCFPIT_PCSR_OVW 0x0010 /* Overwrite PIT counter now */
|
|
#define MCFPIT_PCSR_PIE 0x0008 /* Enable PIT interrupt */
|
|
#define MCFPIT_PCSR_PIF 0x0004 /* PIT interrupt flag */
|
|
#define MCFPIT_PCSR_RLD 0x0002 /* Reload counter */
|
|
#define MCFPIT_PCSR_EN 0x0001 /* Enable PIT */
|
|
#define MCFPIT_PCSR_DISABLE 0x0000 /* Disable PIT */
|
|
|
|
/****************************************************************************/
|
|
#endif /* mcfpit_h */
|