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>
85 lines
3.1 KiB
C
85 lines
3.1 KiB
C
/*
|
|
* machines.h: Defines for taking apart the machine type value in the
|
|
* idprom and determining the kind of machine we are on.
|
|
*
|
|
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
|
|
* Sun3/3x models added by David Monro (davidm@psrg.cs.usyd.edu.au)
|
|
*/
|
|
#ifndef _SPARC_MACHINES_H
|
|
#define _SPARC_MACHINES_H
|
|
|
|
struct Sun_Machine_Models {
|
|
char *name;
|
|
unsigned char id_machtype;
|
|
};
|
|
|
|
/* Current number of machines we know about that has an IDPROM
|
|
* machtype entry including one entry for the 0x80 OBP machines.
|
|
*/
|
|
// reduced along with table in arch/m68k/sun3/idprom.c
|
|
// sun3 port doesn't need to know about sparc machines.
|
|
//#define NUM_SUN_MACHINES 23
|
|
#define NUM_SUN_MACHINES 8
|
|
|
|
/* The machine type in the idprom area looks like this:
|
|
*
|
|
* ---------------
|
|
* | ARCH | MACH |
|
|
* ---------------
|
|
* 7 4 3 0
|
|
*
|
|
* The ARCH field determines the architecture line (sun4, sun4c, etc).
|
|
* The MACH field determines the machine make within that architecture.
|
|
*/
|
|
|
|
#define SM_ARCH_MASK 0xf0
|
|
#define SM_SUN3 0x10
|
|
#define SM_SUN4 0x20
|
|
#define SM_SUN3X 0x40
|
|
#define SM_SUN4C 0x50
|
|
#define SM_SUN4M 0x70
|
|
#define SM_SUN4M_OBP 0x80
|
|
|
|
#define SM_TYP_MASK 0x0f
|
|
/* Sun3 machines */
|
|
#define SM_3_160 0x01 /* Sun 3/160 series */
|
|
#define SM_3_50 0x02 /* Sun 3/50 series */
|
|
#define SM_3_260 0x03 /* Sun 3/260 series */
|
|
#define SM_3_110 0x04 /* Sun 3/110 series */
|
|
#define SM_3_60 0x07 /* Sun 3/60 series */
|
|
#define SM_3_E 0x08 /* Sun 3/E series */
|
|
|
|
/* Sun3x machines */
|
|
#define SM_3_460 0x01 /* Sun 3/460 (460,470,480) series */
|
|
#define SM_3_80 0x02 /* Sun 3/80 series */
|
|
|
|
/* Sun4 machines */
|
|
#define SM_4_260 0x01 /* Sun 4/200 series */
|
|
#define SM_4_110 0x02 /* Sun 4/100 series */
|
|
#define SM_4_330 0x03 /* Sun 4/300 series */
|
|
#define SM_4_470 0x04 /* Sun 4/400 series */
|
|
|
|
/* Sun4c machines Full Name - PROM NAME */
|
|
#define SM_4C_SS1 0x01 /* Sun4c SparcStation 1 - Sun 4/60 */
|
|
#define SM_4C_IPC 0x02 /* Sun4c SparcStation IPC - Sun 4/40 */
|
|
#define SM_4C_SS1PLUS 0x03 /* Sun4c SparcStation 1+ - Sun 4/65 */
|
|
#define SM_4C_SLC 0x04 /* Sun4c SparcStation SLC - Sun 4/20 */
|
|
#define SM_4C_SS2 0x05 /* Sun4c SparcStation 2 - Sun 4/75 */
|
|
#define SM_4C_ELC 0x06 /* Sun4c SparcStation ELC - Sun 4/25 */
|
|
#define SM_4C_IPX 0x07 /* Sun4c SparcStation IPX - Sun 4/50 */
|
|
|
|
/* Sun4m machines, these predate the OpenBoot. These values only mean
|
|
* something if the value in the ARCH field is SM_SUN4M, if it is
|
|
* SM_SUN4M_OBP then you have the following situation:
|
|
* 1) You either have a sun4d, a sun4e, or a recently made sun4m.
|
|
* 2) You have to consult OpenBoot to determine which machine this is.
|
|
*/
|
|
#define SM_4M_SS60 0x01 /* Sun4m SparcSystem 600 */
|
|
#define SM_4M_SS50 0x02 /* Sun4m SparcStation 10 */
|
|
#define SM_4M_SS40 0x03 /* Sun4m SparcStation 5 */
|
|
|
|
/* Sun4d machines -- N/A */
|
|
/* Sun4e machines -- N/A */
|
|
/* Sun4u machines -- N/A */
|
|
|
|
#endif /* !(_SPARC_MACHINES_H) */
|