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>
81 lines
3.3 KiB
C
81 lines
3.3 KiB
C
/****************************************************************************/
|
|
|
|
/*
|
|
* mcftimer.h -- ColdFire internal TIMER support defines.
|
|
*
|
|
* (C) Copyright 1999-2006, Greg Ungerer <gerg@snapgear.com>
|
|
* (C) Copyright 2000, Lineo Inc. (www.lineo.com)
|
|
*/
|
|
|
|
/****************************************************************************/
|
|
#ifndef mcftimer_h
|
|
#define mcftimer_h
|
|
/****************************************************************************/
|
|
|
|
|
|
/*
|
|
* Get address specific defines for this ColdFire member.
|
|
*/
|
|
#if defined(CONFIG_M5206) || defined(CONFIG_M5206e)
|
|
#define MCFTIMER_BASE1 0x100 /* Base address of TIMER1 */
|
|
#define MCFTIMER_BASE2 0x120 /* Base address of TIMER2 */
|
|
#elif defined(CONFIG_M5272)
|
|
#define MCFTIMER_BASE1 0x200 /* Base address of TIMER1 */
|
|
#define MCFTIMER_BASE2 0x220 /* Base address of TIMER2 */
|
|
#define MCFTIMER_BASE3 0x240 /* Base address of TIMER4 */
|
|
#define MCFTIMER_BASE4 0x260 /* Base address of TIMER3 */
|
|
#elif defined(CONFIG_M5249) || defined(CONFIG_M5307) || defined(CONFIG_M5407)
|
|
#define MCFTIMER_BASE1 0x140 /* Base address of TIMER1 */
|
|
#define MCFTIMER_BASE2 0x180 /* Base address of TIMER2 */
|
|
#elif defined(CONFIG_M532x)
|
|
#define MCFTIMER_BASE1 0xfc070000 /* Base address of TIMER1 */
|
|
#define MCFTIMER_BASE2 0xfc074000 /* Base address of TIMER2 */
|
|
#define MCFTIMER_BASE3 0xfc078000 /* Base address of TIMER3 */
|
|
#define MCFTIMER_BASE4 0xfc07c000 /* Base address of TIMER4 */
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Define the TIMER register set addresses.
|
|
*/
|
|
#define MCFTIMER_TMR 0x00 /* Timer Mode reg (r/w) */
|
|
#define MCFTIMER_TRR 0x04 /* Timer Reference (r/w) */
|
|
#define MCFTIMER_TCR 0x08 /* Timer Capture reg (r/w) */
|
|
#define MCFTIMER_TCN 0x0C /* Timer Counter reg (r/w) */
|
|
#if defined(CONFIG_M532x)
|
|
#define MCFTIMER_TER 0x03 /* Timer Event reg (r/w) */
|
|
#else
|
|
#define MCFTIMER_TER 0x11 /* Timer Event reg (r/w) */
|
|
#endif
|
|
|
|
/*
|
|
* Bit definitions for the Timer Mode Register (TMR).
|
|
* Register bit flags are common accross ColdFires.
|
|
*/
|
|
#define MCFTIMER_TMR_PREMASK 0xff00 /* Prescalar mask */
|
|
#define MCFTIMER_TMR_DISCE 0x0000 /* Disable capture */
|
|
#define MCFTIMER_TMR_ANYCE 0x00c0 /* Capture any edge */
|
|
#define MCFTIMER_TMR_FALLCE 0x0080 /* Capture fallingedge */
|
|
#define MCFTIMER_TMR_RISECE 0x0040 /* Capture rising edge */
|
|
#define MCFTIMER_TMR_ENOM 0x0020 /* Enable output toggle */
|
|
#define MCFTIMER_TMR_DISOM 0x0000 /* Do single output pulse */
|
|
#define MCFTIMER_TMR_ENORI 0x0010 /* Enable ref interrupt */
|
|
#define MCFTIMER_TMR_DISORI 0x0000 /* Disable ref interrupt */
|
|
#define MCFTIMER_TMR_RESTART 0x0008 /* Restart counter */
|
|
#define MCFTIMER_TMR_FREERUN 0x0000 /* Free running counter */
|
|
#define MCFTIMER_TMR_CLKTIN 0x0006 /* Input clock is TIN */
|
|
#define MCFTIMER_TMR_CLK16 0x0004 /* Input clock is /16 */
|
|
#define MCFTIMER_TMR_CLK1 0x0002 /* Input clock is /1 */
|
|
#define MCFTIMER_TMR_CLKSTOP 0x0000 /* Stop counter */
|
|
#define MCFTIMER_TMR_ENABLE 0x0001 /* Enable timer */
|
|
#define MCFTIMER_TMR_DISABLE 0x0000 /* Disable timer */
|
|
|
|
/*
|
|
* Bit definitions for the Timer Event Registers (TER).
|
|
*/
|
|
#define MCFTIMER_TER_CAP 0x01 /* Capture event */
|
|
#define MCFTIMER_TER_REF 0x02 /* Refernece event */
|
|
|
|
/****************************************************************************/
|
|
#endif /* mcftimer_h */
|