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>
49 lines
1.1 KiB
C
49 lines
1.1 KiB
C
#ifndef _SUN3_INTERSIL_H
|
|
#define _SUN3_INTERSIL_H
|
|
/* bits 0 and 1 */
|
|
#define INTERSIL_FREQ_32K 0x00
|
|
#define INTERSIL_FREQ_1M 0x01
|
|
#define INTERSIL_FREQ_2M 0x02
|
|
#define INTERSIL_FREQ_4M 0x03
|
|
|
|
/* bit 2 */
|
|
#define INTERSIL_12H_MODE 0x00
|
|
#define INTERSIL_24H_MODE 0x04
|
|
|
|
/* bit 3 */
|
|
#define INTERSIL_STOP 0x00
|
|
#define INTERSIL_RUN 0x08
|
|
|
|
/* bit 4 */
|
|
#define INTERSIL_INT_ENABLE 0x10
|
|
#define INTERSIL_INT_DISABLE 0x00
|
|
|
|
/* bit 5 */
|
|
#define INTERSIL_MODE_NORMAL 0x00
|
|
#define INTERSIL_MODE_TEST 0x20
|
|
|
|
#define INTERSIL_HZ_100_MASK 0x02
|
|
|
|
struct intersil_dt {
|
|
unsigned char csec;
|
|
unsigned char hour;
|
|
unsigned char minute;
|
|
unsigned char second;
|
|
unsigned char month;
|
|
unsigned char day;
|
|
unsigned char year;
|
|
unsigned char weekday;
|
|
};
|
|
|
|
struct intersil_7170 {
|
|
struct intersil_dt counter;
|
|
struct intersil_dt alarm;
|
|
unsigned char int_reg;
|
|
unsigned char cmd_reg;
|
|
};
|
|
|
|
extern volatile char* clock_va;
|
|
#define intersil_clock ((volatile struct intersil_7170 *) clock_va)
|
|
#define intersil_clear() (void)intersil_clock->int_reg
|
|
#endif
|