m68k,m68knommu: merge header files

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>

1 files changed, 0 insertions, 113 deletions

diff --git a/include/asm-m68k/amigaints.h b/include/asm-m68k/amigaints.h
deleted file mode 100644
index b1bcdb835ab9..000000000000
--- a/include/asm-m68k/amigaints.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-** amigaints.h -- Amiga Linux interrupt handling structs and prototypes
-**
-** Copyright 1992 by Greg Harp
-**
-** This file is subject to the terms and conditions of the GNU General Public
-** License.  See the file COPYING in the main directory of this archive
-** for more details.
-**
-** Created 10/2/92 by Greg Harp
-*/
-
-#ifndef _ASMm68k_AMIGAINTS_H_
-#define _ASMm68k_AMIGAINTS_H_
-
-#include <asm/irq.h>
-
-/*
-** Amiga Interrupt sources.
-**
-*/
-
-#define AUTO_IRQS           (8)
-#define AMI_STD_IRQS        (14)
-#define CIA_IRQS            (5)
-#define AMI_IRQS            (32) /* AUTO_IRQS+AMI_STD_IRQS+2*CIA_IRQS */
-
-/* builtin serial port interrupts */
-#define IRQ_AMIGA_TBE           (IRQ_USER+0)
-#define IRQ_AMIGA_RBF           (IRQ_USER+11)
-
-/* floppy disk interrupts */
-#define IRQ_AMIGA_DSKBLK        (IRQ_USER+1)
-#define IRQ_AMIGA_DSKSYN        (IRQ_USER+12)
-
-/* software interrupts */
-#define IRQ_AMIGA_SOFT          (IRQ_USER+2)
-
-/* interrupts from external hardware */
-#define IRQ_AMIGA_PORTS         IRQ_AUTO_2
-#define IRQ_AMIGA_EXTER         IRQ_AUTO_6
-
-/* copper interrupt */
-#define IRQ_AMIGA_COPPER        (IRQ_USER+4)
-
-/* vertical blanking interrupt */
-#define IRQ_AMIGA_VERTB         (IRQ_USER+5)
-
-/* Blitter done interrupt */
-#define IRQ_AMIGA_BLIT          (IRQ_USER+6)
-
-/* Audio interrupts */
-#define IRQ_AMIGA_AUD0          (IRQ_USER+7)
-#define IRQ_AMIGA_AUD1          (IRQ_USER+8)
-#define IRQ_AMIGA_AUD2          (IRQ_USER+9)
-#define IRQ_AMIGA_AUD3          (IRQ_USER+10)
-
-/* CIA interrupt sources */
-#define IRQ_AMIGA_CIAA          (IRQ_USER+14)
-#define IRQ_AMIGA_CIAA_TA       (IRQ_USER+14)
-#define IRQ_AMIGA_CIAA_TB       (IRQ_USER+15)
-#define IRQ_AMIGA_CIAA_ALRM     (IRQ_USER+16)
-#define IRQ_AMIGA_CIAA_SP       (IRQ_USER+17)
-#define IRQ_AMIGA_CIAA_FLG      (IRQ_USER+18)
-#define IRQ_AMIGA_CIAB          (IRQ_USER+19)
-#define IRQ_AMIGA_CIAB_TA       (IRQ_USER+19)
-#define IRQ_AMIGA_CIAB_TB       (IRQ_USER+20)
-#define IRQ_AMIGA_CIAB_ALRM     (IRQ_USER+21)
-#define IRQ_AMIGA_CIAB_SP       (IRQ_USER+22)
-#define IRQ_AMIGA_CIAB_FLG      (IRQ_USER+23)
-
-
-/* INTREQR masks */
-#define IF_SETCLR   0x8000      /* set/clr bit */
-#define IF_INTEN    0x4000      /* master interrupt bit in INT* registers */
-#define IF_EXTER    0x2000      /* external level 6 and CIA B interrupt */
-#define IF_DSKSYN   0x1000      /* disk sync interrupt */
-#define IF_RBF      0x0800      /* serial receive buffer full interrupt */
-#define IF_AUD3     0x0400      /* audio channel 3 done interrupt */
-#define IF_AUD2     0x0200      /* audio channel 2 done interrupt */
-#define IF_AUD1     0x0100      /* audio channel 1 done interrupt */
-#define IF_AUD0     0x0080      /* audio channel 0 done interrupt */
-#define IF_BLIT     0x0040      /* blitter done interrupt */
-#define IF_VERTB    0x0020      /* vertical blanking interrupt */
-#define IF_COPER    0x0010      /* copper interrupt */
-#define IF_PORTS    0x0008      /* external level 2 and CIA A interrupt */
-#define IF_SOFT     0x0004      /* software initiated interrupt */
-#define IF_DSKBLK   0x0002      /* diskblock DMA finished */
-#define IF_TBE      0x0001      /* serial transmit buffer empty interrupt */
-
-/* CIA interrupt control register bits */
-
-#define CIA_ICR_TA      0x01
-#define CIA_ICR_TB      0x02
-#define CIA_ICR_ALRM    0x04
-#define CIA_ICR_SP      0x08
-#define CIA_ICR_FLG     0x10
-#define CIA_ICR_ALL     0x1f
-#define CIA_ICR_SETCLR  0x80
-
-extern void amiga_init_IRQ(void);
-
-/* to access the interrupt control registers of CIA's use only
-** these functions, they behave exactly like the amiga os routines
-*/
-
-extern struct ciabase ciaa_base, ciab_base;
-
-extern void cia_init_IRQ(struct ciabase *base);
-extern unsigned char cia_set_irq(struct ciabase *base, unsigned char mask);
-extern unsigned char cia_able_irq(struct ciabase *base, unsigned char mask);
-
-#endif /* asm-m68k/amigaints.h */