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

diff --git a/include/asm-m68k/bvme6000hw.h b/include/asm-m68k/bvme6000hw.h
deleted file mode 100644
index f40d2f8510ee..000000000000
--- a/include/asm-m68k/bvme6000hw.h
+++ /dev/null
@@ -1,150 +0,0 @@
-#ifndef _M68K_BVME6000HW_H_
-#define _M68K_BVME6000HW_H_
-
-#include <asm/irq.h>
-
-/*
- * PIT structure
- */
-
-#define BVME_PIT_BASE   0xffa00000
-
-typedef struct {
-        unsigned char
-        pad_a[3], pgcr,
-        pad_b[3], psrr,
-        pad_c[3], paddr,
-        pad_d[3], pbddr,
-        pad_e[3], pcddr,
-        pad_f[3], pivr,
-        pad_g[3], pacr,
-        pad_h[3], pbcr,
-        pad_i[3], padr,
-        pad_j[3], pbdr,
-        pad_k[3], paar,
-        pad_l[3], pbar,
-        pad_m[3], pcdr,
-        pad_n[3], psr,
-        pad_o[3], res1,
-        pad_p[3], res2,
-        pad_q[3], tcr,
-        pad_r[3], tivr,
-        pad_s[3], res3,
-        pad_t[3], cprh,
-        pad_u[3], cprm,
-        pad_v[3], cprl,
-        pad_w[3], res4,
-        pad_x[3], crh,
-        pad_y[3], crm,
-        pad_z[3], crl,
-        pad_A[3], tsr,
-        pad_B[3], res5;
-} PitRegs_t, *PitRegsPtr;
-
-#define bvmepit   ((*(volatile PitRegsPtr)(BVME_PIT_BASE)))
-
-#define BVME_RTC_BASE   0xff900000
-
-typedef struct {
-        unsigned char
-        pad_a[3], msr,
-        pad_b[3], t0cr_rtmr,
-        pad_c[3], t1cr_omr,
-        pad_d[3], pfr_icr0,
-        pad_e[3], irr_icr1,
-        pad_f[3], bcd_tenms,
-        pad_g[3], bcd_sec,
-        pad_h[3], bcd_min,
-        pad_i[3], bcd_hr,
-        pad_j[3], bcd_dom,
-        pad_k[3], bcd_mth,
-        pad_l[3], bcd_year,
-        pad_m[3], bcd_ujcc,
-        pad_n[3], bcd_hjcc,
-        pad_o[3], bcd_dow,
-        pad_p[3], t0lsb,
-        pad_q[3], t0msb,
-        pad_r[3], t1lsb,
-        pad_s[3], t1msb,
-        pad_t[3], cmp_sec,
-        pad_u[3], cmp_min,
-        pad_v[3], cmp_hr,
-        pad_w[3], cmp_dom,
-        pad_x[3], cmp_mth,
-        pad_y[3], cmp_dow,
-        pad_z[3], sav_sec,
-        pad_A[3], sav_min,
-        pad_B[3], sav_hr,
-        pad_C[3], sav_dom,
-        pad_D[3], sav_mth,
-        pad_E[3], ram,
-        pad_F[3], test;
-} RtcRegs_t, *RtcPtr_t;
-
-
-#define BVME_I596_BASE  0xff100000
-
-#define BVME_ETHIRQ_REG 0xff20000b
-
-#define BVME_LOCAL_IRQ_STAT  0xff20000f
-
-#define BVME_ETHERR          0x02
-#define BVME_ABORT_STATUS    0x08
-
-#define BVME_NCR53C710_BASE     0xff000000
-
-#define BVME_SCC_A_ADDR 0xffb0000b
-#define BVME_SCC_B_ADDR 0xffb00003
-#define BVME_SCC_RTxC   7372800
-
-#define BVME_CONFIG_REG 0xff500003
-
-#define config_reg_ptr  (volatile unsigned char *)BVME_CONFIG_REG
-
-#define BVME_CONFIG_SW1 0x08
-#define BVME_CONFIG_SW2 0x04
-#define BVME_CONFIG_SW3 0x02
-#define BVME_CONFIG_SW4 0x01
-
-
-#define BVME_IRQ_TYPE_PRIO      0
-
-#define BVME_IRQ_PRN            (IRQ_USER+20)
-#define BVME_IRQ_TIMER          (IRQ_USER+25)
-#define BVME_IRQ_I596           IRQ_AUTO_2
-#define BVME_IRQ_SCSI           IRQ_AUTO_3
-#define BVME_IRQ_RTC            IRQ_AUTO_6
-#define BVME_IRQ_ABORT          IRQ_AUTO_7
-
-/* SCC interrupts */
-#define BVME_IRQ_SCC_BASE               IRQ_USER
-#define BVME_IRQ_SCCB_TX                IRQ_USER
-#define BVME_IRQ_SCCB_STAT              (IRQ_USER+2)
-#define BVME_IRQ_SCCB_RX                (IRQ_USER+4)
-#define BVME_IRQ_SCCB_SPCOND            (IRQ_USER+6)
-#define BVME_IRQ_SCCA_TX                (IRQ_USER+8)
-#define BVME_IRQ_SCCA_STAT              (IRQ_USER+10)
-#define BVME_IRQ_SCCA_RX                (IRQ_USER+12)
-#define BVME_IRQ_SCCA_SPCOND            (IRQ_USER+14)
-
-/* Address control registers */
-
-#define BVME_ACR_A32VBA         0xff400003
-#define BVME_ACR_A32MSK         0xff410003
-#define BVME_ACR_A24VBA         0xff420003
-#define BVME_ACR_A24MSK         0xff430003
-#define BVME_ACR_A16VBA         0xff440003
-#define BVME_ACR_A32LBA         0xff450003
-#define BVME_ACR_A24LBA         0xff460003
-#define BVME_ACR_ADDRCTL        0xff470003
-
-#define bvme_acr_a32vba         *(volatile unsigned char *)BVME_ACR_A32VBA
-#define bvme_acr_a32msk         *(volatile unsigned char *)BVME_ACR_A32MSK
-#define bvme_acr_a24vba         *(volatile unsigned char *)BVME_ACR_A24VBA
-#define bvme_acr_a24msk         *(volatile unsigned char *)BVME_ACR_A24MSK
-#define bvme_acr_a16vba         *(volatile unsigned char *)BVME_ACR_A16VBA
-#define bvme_acr_a32lba         *(volatile unsigned char *)BVME_ACR_A32LBA
-#define bvme_acr_a24lba         *(volatile unsigned char *)BVME_ACR_A24LBA
-#define bvme_acr_addrctl        *(volatile unsigned char *)BVME_ACR_ADDRCTL
-
-#endif