mirror of
https://github.com/adulau/aha.git
synced 2024-12-30 20:56:23 +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>
131 lines
5.2 KiB
C
131 lines
5.2 KiB
C
/****************************************************************************/
|
|
|
|
/*
|
|
* m5206sim.h -- ColdFire 5206 System Integration Module support.
|
|
*
|
|
* (C) Copyright 1999, Greg Ungerer (gerg@snapgear.com)
|
|
* (C) Copyright 2000, Lineo Inc. (www.lineo.com)
|
|
*/
|
|
|
|
/****************************************************************************/
|
|
#ifndef m5206sim_h
|
|
#define m5206sim_h
|
|
/****************************************************************************/
|
|
|
|
|
|
/*
|
|
* Define the 5206 SIM register set addresses.
|
|
*/
|
|
#define MCFSIM_SIMR 0x03 /* SIM Config reg (r/w) */
|
|
#define MCFSIM_ICR1 0x14 /* Intr Ctrl reg 1 (r/w) */
|
|
#define MCFSIM_ICR2 0x15 /* Intr Ctrl reg 2 (r/w) */
|
|
#define MCFSIM_ICR3 0x16 /* Intr Ctrl reg 3 (r/w) */
|
|
#define MCFSIM_ICR4 0x17 /* Intr Ctrl reg 4 (r/w) */
|
|
#define MCFSIM_ICR5 0x18 /* Intr Ctrl reg 5 (r/w) */
|
|
#define MCFSIM_ICR6 0x19 /* Intr Ctrl reg 6 (r/w) */
|
|
#define MCFSIM_ICR7 0x1a /* Intr Ctrl reg 7 (r/w) */
|
|
#define MCFSIM_ICR8 0x1b /* Intr Ctrl reg 8 (r/w) */
|
|
#define MCFSIM_ICR9 0x1c /* Intr Ctrl reg 9 (r/w) */
|
|
#define MCFSIM_ICR10 0x1d /* Intr Ctrl reg 10 (r/w) */
|
|
#define MCFSIM_ICR11 0x1e /* Intr Ctrl reg 11 (r/w) */
|
|
#define MCFSIM_ICR12 0x1f /* Intr Ctrl reg 12 (r/w) */
|
|
#define MCFSIM_ICR13 0x20 /* Intr Ctrl reg 13 (r/w) */
|
|
#ifdef CONFIG_M5206e
|
|
#define MCFSIM_ICR14 0x21 /* Intr Ctrl reg 14 (r/w) */
|
|
#define MCFSIM_ICR15 0x22 /* Intr Ctrl reg 15 (r/w) */
|
|
#endif
|
|
|
|
#define MCFSIM_IMR 0x36 /* Interrupt Mask reg (r/w) */
|
|
#define MCFSIM_IPR 0x3a /* Interrupt Pend reg (r/w) */
|
|
|
|
#define MCFSIM_RSR 0x40 /* Reset Status reg (r/w) */
|
|
#define MCFSIM_SYPCR 0x41 /* System Protection reg (r/w)*/
|
|
|
|
#define MCFSIM_SWIVR 0x42 /* SW Watchdog intr reg (r/w) */
|
|
#define MCFSIM_SWSR 0x43 /* SW Watchdog service (r/w) */
|
|
|
|
#define MCFSIM_DCRR 0x46 /* DRAM Refresh reg (r/w) */
|
|
#define MCFSIM_DCTR 0x4a /* DRAM Timing reg (r/w) */
|
|
#define MCFSIM_DAR0 0x4c /* DRAM 0 Address reg(r/w) */
|
|
#define MCFSIM_DMR0 0x50 /* DRAM 0 Mask reg (r/w) */
|
|
#define MCFSIM_DCR0 0x57 /* DRAM 0 Control reg (r/w) */
|
|
#define MCFSIM_DAR1 0x58 /* DRAM 1 Address reg (r/w) */
|
|
#define MCFSIM_DMR1 0x5c /* DRAM 1 Mask reg (r/w) */
|
|
#define MCFSIM_DCR1 0x63 /* DRAM 1 Control reg (r/w) */
|
|
|
|
#define MCFSIM_CSAR0 0x64 /* CS 0 Address 0 reg (r/w) */
|
|
#define MCFSIM_CSMR0 0x68 /* CS 0 Mask 0 reg (r/w) */
|
|
#define MCFSIM_CSCR0 0x6e /* CS 0 Control reg (r/w) */
|
|
#define MCFSIM_CSAR1 0x70 /* CS 1 Address reg (r/w) */
|
|
#define MCFSIM_CSMR1 0x74 /* CS 1 Mask reg (r/w) */
|
|
#define MCFSIM_CSCR1 0x7a /* CS 1 Control reg (r/w) */
|
|
#define MCFSIM_CSAR2 0x7c /* CS 2 Address reg (r/w) */
|
|
#define MCFSIM_CSMR2 0x80 /* CS 2 Mask reg (r/w) */
|
|
#define MCFSIM_CSCR2 0x86 /* CS 2 Control reg (r/w) */
|
|
#define MCFSIM_CSAR3 0x88 /* CS 3 Address reg (r/w) */
|
|
#define MCFSIM_CSMR3 0x8c /* CS 3 Mask reg (r/w) */
|
|
#define MCFSIM_CSCR3 0x92 /* CS 3 Control reg (r/w) */
|
|
#define MCFSIM_CSAR4 0x94 /* CS 4 Address reg (r/w) */
|
|
#define MCFSIM_CSMR4 0x98 /* CS 4 Mask reg (r/w) */
|
|
#define MCFSIM_CSCR4 0x9e /* CS 4 Control reg (r/w) */
|
|
#define MCFSIM_CSAR5 0xa0 /* CS 5 Address reg (r/w) */
|
|
#define MCFSIM_CSMR5 0xa4 /* CS 5 Mask reg (r/w) */
|
|
#define MCFSIM_CSCR5 0xaa /* CS 5 Control reg (r/w) */
|
|
#define MCFSIM_CSAR6 0xac /* CS 6 Address reg (r/w) */
|
|
#define MCFSIM_CSMR6 0xb0 /* CS 6 Mask reg (r/w) */
|
|
#define MCFSIM_CSCR6 0xb6 /* CS 6 Control reg (r/w) */
|
|
#define MCFSIM_CSAR7 0xb8 /* CS 7 Address reg (r/w) */
|
|
#define MCFSIM_CSMR7 0xbc /* CS 7 Mask reg (r/w) */
|
|
#define MCFSIM_CSCR7 0xc2 /* CS 7 Control reg (r/w) */
|
|
#define MCFSIM_DMCR 0xc6 /* Default control */
|
|
|
|
#ifdef CONFIG_M5206e
|
|
#define MCFSIM_PAR 0xca /* Pin Assignment reg (r/w) */
|
|
#else
|
|
#define MCFSIM_PAR 0xcb /* Pin Assignment reg (r/w) */
|
|
#endif
|
|
|
|
#define MCFSIM_PADDR 0x1c5 /* Parallel Direction (r/w) */
|
|
#define MCFSIM_PADAT 0x1c9 /* Parallel Port Value (r/w) */
|
|
|
|
/*
|
|
* Some symbol defines for the Parallel Port Pin Assignment Register
|
|
*/
|
|
#ifdef CONFIG_M5206e
|
|
#define MCFSIM_PAR_DREQ0 0x100 /* Set to select DREQ0 input */
|
|
/* Clear to select T0 input */
|
|
#define MCFSIM_PAR_DREQ1 0x200 /* Select DREQ1 input */
|
|
/* Clear to select T0 output */
|
|
#endif
|
|
|
|
/*
|
|
* Some symbol defines for the Interrupt Control Register
|
|
*/
|
|
#define MCFSIM_SWDICR MCFSIM_ICR8 /* Watchdog timer ICR */
|
|
#define MCFSIM_TIMER1ICR MCFSIM_ICR9 /* Timer 1 ICR */
|
|
#define MCFSIM_TIMER2ICR MCFSIM_ICR10 /* Timer 2 ICR */
|
|
#define MCFSIM_UART1ICR MCFSIM_ICR12 /* UART 1 ICR */
|
|
#define MCFSIM_UART2ICR MCFSIM_ICR13 /* UART 2 ICR */
|
|
#ifdef CONFIG_M5206e
|
|
#define MCFSIM_DMA1ICR MCFSIM_ICR14 /* DMA 1 ICR */
|
|
#define MCFSIM_DMA2ICR MCFSIM_ICR15 /* DMA 2 ICR */
|
|
#endif
|
|
|
|
#if defined(CONFIG_M5206e)
|
|
#define MCFSIM_IMR_MASKALL 0xfffe /* All SIM intr sources */
|
|
#endif
|
|
|
|
/*
|
|
* Macro to get and set IMR register. It is 16 bits on the 5206.
|
|
*/
|
|
#define mcf_getimr() \
|
|
*((volatile unsigned short *) (MCF_MBAR + MCFSIM_IMR))
|
|
|
|
#define mcf_setimr(imr) \
|
|
*((volatile unsigned short *) (MCF_MBAR + MCFSIM_IMR)) = (imr)
|
|
|
|
#define mcf_getipr() \
|
|
*((volatile unsigned short *) (MCF_MBAR + MCFSIM_IPR))
|
|
|
|
/****************************************************************************/
|
|
#endif /* m5206sim_h */
|