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>
63 lines
2.6 KiB
C
63 lines
2.6 KiB
C
/****************************************************************************/
|
|
|
|
/*
|
|
* m520xsim.h -- ColdFire 5207/5208 System Integration Module support.
|
|
*
|
|
* (C) Copyright 2005, Intec Automation (mike@steroidmicros.com)
|
|
*/
|
|
|
|
/****************************************************************************/
|
|
#ifndef m520xsim_h
|
|
#define m520xsim_h
|
|
/****************************************************************************/
|
|
|
|
|
|
/*
|
|
* Define the 5282 SIM register set addresses.
|
|
*/
|
|
#define MCFICM_INTC0 0x48000 /* Base for Interrupt Ctrl 0 */
|
|
#define MCFINTC_IPRH 0x00 /* Interrupt pending 32-63 */
|
|
#define MCFINTC_IPRL 0x04 /* Interrupt pending 1-31 */
|
|
#define MCFINTC_IMRH 0x08 /* Interrupt mask 32-63 */
|
|
#define MCFINTC_IMRL 0x0c /* Interrupt mask 1-31 */
|
|
#define MCFINTC_INTFRCH 0x10 /* Interrupt force 32-63 */
|
|
#define MCFINTC_INTFRCL 0x14 /* Interrupt force 1-31 */
|
|
#define MCFINTC_ICR0 0x40 /* Base ICR register */
|
|
|
|
#define MCFINT_VECBASE 64
|
|
#define MCFINT_UART0 26 /* Interrupt number for UART0 */
|
|
#define MCFINT_UART1 27 /* Interrupt number for UART1 */
|
|
#define MCFINT_UART2 28 /* Interrupt number for UART2 */
|
|
#define MCFINT_QSPI 31 /* Interrupt number for QSPI */
|
|
#define MCFINT_PIT1 4 /* Interrupt number for PIT1 (PIT0 in processor) */
|
|
|
|
/*
|
|
* SDRAM configuration registers.
|
|
*/
|
|
#define MCFSIM_SDMR 0x000a8000 /* SDRAM Mode/Extended Mode Register */
|
|
#define MCFSIM_SDCR 0x000a8004 /* SDRAM Control Register */
|
|
#define MCFSIM_SDCFG1 0x000a8008 /* SDRAM Configuration Register 1 */
|
|
#define MCFSIM_SDCFG2 0x000a800c /* SDRAM Configuration Register 2 */
|
|
#define MCFSIM_SDCS0 0x000a8110 /* SDRAM Chip Select 0 Configuration */
|
|
#define MCFSIM_SDCS1 0x000a8114 /* SDRAM Chip Select 1 Configuration */
|
|
|
|
|
|
#define MCF_GPIO_PAR_UART (0xA4036)
|
|
#define MCF_GPIO_PAR_FECI2C (0xA4033)
|
|
#define MCF_GPIO_PAR_FEC (0xA4038)
|
|
|
|
#define MCF_GPIO_PAR_UART_PAR_URXD0 (0x0001)
|
|
#define MCF_GPIO_PAR_UART_PAR_UTXD0 (0x0002)
|
|
|
|
#define MCF_GPIO_PAR_UART_PAR_URXD1 (0x0040)
|
|
#define MCF_GPIO_PAR_UART_PAR_UTXD1 (0x0080)
|
|
|
|
#define MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2 (0x02)
|
|
#define MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2 (0x04)
|
|
|
|
#define ICR_INTRCONF 0x05
|
|
#define MCFPIT_IMR MCFINTC_IMRL
|
|
#define MCFPIT_IMR_IBIT (1 << MCFINT_PIT1)
|
|
|
|
/****************************************************************************/
|
|
#endif /* m520xsim_h */
|