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, 162 deletions

diff --git a/include/asm-m68k/mac_iop.h b/include/asm-m68k/mac_iop.h
deleted file mode 100644
index a2c7e6fcca38..000000000000
--- a/include/asm-m68k/mac_iop.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * I/O Processor (IOP) defines and structures, mostly snagged from A/UX
- * header files.
- *
- * The original header from which this was taken is copyrighted. I've done some
- * rewriting (in fact my changes make this a bit more readable, IMHO) but some
- * more should be done.
- */
-
-/*
- * This is the base address of the IOPs. Use this as the address of
- * a "struct iop" (see below) to see where the actual registers fall.
- */
-
-#define SCC_IOP_BASE_IIFX       (0x50F04000)
-#define ISM_IOP_BASE_IIFX       (0x50F12000)
-
-#define SCC_IOP_BASE_QUADRA     (0x50F0C000)
-#define ISM_IOP_BASE_QUADRA     (0x50F1E000)
-
-/* IOP status/control register bits: */
-
-#define IOP_BYPASS      0x01    /* bypass-mode hardware access */
-#define IOP_AUTOINC     0x02    /* allow autoincrement of ramhi/lo */
-#define IOP_RUN         0x04    /* set to 0 to reset IOP chip */
-#define IOP_IRQ         0x08    /* generate IRQ to IOP if 1 */
-#define IOP_INT0        0x10    /* intr priority from IOP to host */
-#define IOP_INT1        0x20    /* intr priority from IOP to host */
-#define IOP_HWINT       0x40    /* IRQ from hardware; bypass mode only */
-#define IOP_DMAINACTIVE 0x80    /* no DMA request active; bypass mode only */
-
-#define NUM_IOPS        2
-#define NUM_IOP_CHAN    7
-#define NUM_IOP_MSGS    NUM_IOP_CHAN*8
-#define IOP_MSG_LEN     32
-
-/* IOP reference numbers, used by the globally-visible iop_xxx functions */
-
-#define IOP_NUM_SCC     0
-#define IOP_NUM_ISM     1
-
-/* IOP channel states */
-
-#define IOP_MSG_IDLE            0       /* idle                         */
-#define IOP_MSG_NEW             1       /* new message sent             */
-#define IOP_MSG_RCVD            2       /* message received; processing */
-#define IOP_MSG_COMPLETE        3       /* message processing complete  */
-
-/* IOP message status codes */
-
-#define IOP_MSGSTATUS_UNUSED    0       /* Unusued message structure       */
-#define IOP_MSGSTATUS_WAITING   1       /* waiting for channel             */
-#define IOP_MSGSTATUS_SENT      2       /* message sent, awaiting reply    */
-#define IOP_MSGSTATUS_COMPLETE  3       /* message complete and reply rcvd */
-#define IOP_MSGSTATUS_UNSOL     6       /* message is unsolicited          */
-
-/* IOP memory addresses of the members of the mac_iop_kernel structure. */
-
-#define IOP_ADDR_MAX_SEND_CHAN  0x0200
-#define IOP_ADDR_SEND_STATE     0x0201
-#define IOP_ADDR_PATCH_CTRL     0x021F
-#define IOP_ADDR_SEND_MSG       0x0220
-#define IOP_ADDR_MAX_RECV_CHAN  0x0300
-#define IOP_ADDR_RECV_STATE     0x0301
-#define IOP_ADDR_ALIVE          0x031F
-#define IOP_ADDR_RECV_MSG       0x0320
-
-#ifndef __ASSEMBLY__
-
-/*
- * IOP Control registers, staggered because in usual Apple style they were
- * too lazy to decode the A0 bit. This structure is assumed to begin at
- * one of the xxx_IOP_BASE addresses given above.
- */
-
-struct mac_iop {
-    __u8        ram_addr_hi;    /* shared RAM address hi byte */
-    __u8        pad0;
-    __u8        ram_addr_lo;    /* shared RAM address lo byte */
-    __u8        pad1;
-    __u8        status_ctrl;    /* status/control register */
-    __u8        pad2[3];
-    __u8        ram_data;       /* RAM data byte at ramhi/lo */
-
-    __u8        pad3[23];
-
-    /* Bypass-mode hardware access registers */
-
-    union {
-        struct {                /* SCC registers */
-            __u8 sccb_cmd;      /* SCC B command reg */
-            __u8 pad4;
-            __u8 scca_cmd;      /* SCC A command reg */
-            __u8 pad5;
-            __u8 sccb_data;     /* SCC B data */
-            __u8 pad6;
-            __u8 scca_data;     /* SCC A data */
-        } scc_regs;
-
-        struct {                /* ISM registers */
-            __u8 wdata;         /* write a data byte */
-            __u8 pad7;
-            __u8 wmark;         /* write a mark byte */
-            __u8 pad8;
-            __u8 wcrc;          /* write 2-byte crc to disk */
-            __u8 pad9;
-            __u8 wparams;       /* write the param regs */
-            __u8 pad10;
-            __u8 wphase;        /* write the phase states & dirs */
-            __u8 pad11;
-            __u8 wsetup;        /* write the setup register */
-            __u8 pad12;
-            __u8 wzeroes;       /* mode reg: 1's clr bits, 0's are x */
-            __u8 pad13;
-            __u8 wones;         /* mode reg: 1's set bits, 0's are x */
-            __u8 pad14;
-            __u8 rdata;         /* read a data byte */
-            __u8 pad15;
-            __u8 rmark;         /* read a mark byte */
-            __u8 pad16;
-            __u8 rerror;        /* read the error register */
-            __u8 pad17;
-            __u8 rparams;       /* read the param regs */
-            __u8 pad18;
-            __u8 rphase;        /* read the phase states & dirs */
-            __u8 pad19;
-            __u8 rsetup;        /* read the setup register */
-            __u8 pad20;
-            __u8 rmode;         /* read the mode register */
-            __u8 pad21;
-            __u8 rhandshake;    /* read the handshake register */
-        } ism_regs;
-    } b;
-};
-
-/* This structure is used to track IOP messages in the Linux kernel */
-
-struct iop_msg {
-        struct iop_msg  *next;          /* next message in queue or NULL     */
-        uint    iop_num;                /* IOP number                        */
-        uint    channel;                /* channel number                    */
-        void    *caller_priv;           /* caller private data               */
-        int     status;                 /* status of this message            */
-        __u8    message[IOP_MSG_LEN];   /* the message being sent/received   */
-        __u8    reply[IOP_MSG_LEN];     /* the reply to the message          */
-        void    (*handler)(struct iop_msg *);
-                                        /* function to call when reply recvd */
-};
-
-extern int iop_scc_present,iop_ism_present;
-
-extern int iop_listen(uint, uint,
-                        void (*handler)(struct iop_msg *),
-                        const char *);
-extern int iop_send_message(uint, uint, void *, uint, __u8 *,
-                            void (*)(struct iop_msg *));
-extern void iop_complete_message(struct iop_msg *);
-extern void iop_upload_code(uint, __u8 *, uint, __u16);
-extern void iop_download_code(uint, __u8 *, uint, __u16);
-extern __u8 *iop_compare_code(uint, __u8 *, uint, __u16);
-
-#endif /* __ASSEMBLY__ */