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>
133 lines
4.6 KiB
C
133 lines
4.6 KiB
C
/* bootstd.h: Bootloader system call interface
|
|
*
|
|
* (c) 1999, Rt-Control, Inc.
|
|
*/
|
|
|
|
#ifndef __BOOTSTD_H__
|
|
#define __BOOTSTD_H__
|
|
|
|
#define NR_BSC 21 /* last used bootloader system call */
|
|
|
|
#define __BN_reset 0 /* reset and start the bootloader */
|
|
#define __BN_test 1 /* tests the system call interface */
|
|
#define __BN_exec 2 /* executes a bootloader image */
|
|
#define __BN_exit 3 /* terminates a bootloader image */
|
|
#define __BN_program 4 /* program FLASH from a chain */
|
|
#define __BN_erase 5 /* erase sector(s) of FLASH */
|
|
#define __BN_open 6
|
|
#define __BN_write 7
|
|
#define __BN_read 8
|
|
#define __BN_close 9
|
|
#define __BN_mmap 10 /* map a file descriptor into memory */
|
|
#define __BN_munmap 11 /* remove a file to memory mapping */
|
|
#define __BN_gethwaddr 12 /* get the hardware address of my interfaces */
|
|
#define __BN_getserialnum 13 /* get the serial number of this board */
|
|
#define __BN_getbenv 14 /* get a bootloader envvar */
|
|
#define __BN_setbenv 15 /* get a bootloader envvar */
|
|
#define __BN_setpmask 16 /* set the protection mask */
|
|
#define __BN_readenv 17 /* read environment variables */
|
|
#define __BN_flash_chattr_range 18
|
|
#define __BN_flash_erase_range 19
|
|
#define __BN_flash_write_range 20
|
|
|
|
/* Calling conventions compatible to (uC)linux/68k
|
|
* We use simmilar macros to call into the bootloader as for uClinux
|
|
*/
|
|
|
|
#define __bsc_return(type, res) \
|
|
do { \
|
|
if ((unsigned long)(res) >= (unsigned long)(-64)) { \
|
|
/* let errno be a function, preserve res in %d0 */ \
|
|
int __err = -(res); \
|
|
errno = __err; \
|
|
res = -1; \
|
|
} \
|
|
return (type)(res); \
|
|
} while (0)
|
|
|
|
#define _bsc0(type,name) \
|
|
type name(void) \
|
|
{ \
|
|
register long __res __asm__ ("%d0") = __BN_##name; \
|
|
__asm__ __volatile__ ("trap #2" \
|
|
: "=g" (__res) \
|
|
: "0" (__res) \
|
|
); \
|
|
__bsc_return(type,__res); \
|
|
}
|
|
|
|
#define _bsc1(type,name,atype,a) \
|
|
type name(atype a) \
|
|
{ \
|
|
register long __res __asm__ ("%d0") = __BN_##name; \
|
|
register long __a __asm__ ("%d1") = (long)a; \
|
|
__asm__ __volatile__ ("trap #2" \
|
|
: "=g" (__res) \
|
|
: "0" (__res), "d" (__a) \
|
|
); \
|
|
__bsc_return(type,__res); \
|
|
}
|
|
|
|
#define _bsc2(type,name,atype,a,btype,b) \
|
|
type name(atype a, btype b) \
|
|
{ \
|
|
register long __res __asm__ ("%d0") = __BN_##name; \
|
|
register long __a __asm__ ("%d1") = (long)a; \
|
|
register long __b __asm__ ("%d2") = (long)b; \
|
|
__asm__ __volatile__ ("trap #2" \
|
|
: "=g" (__res) \
|
|
: "0" (__res), "d" (__a), "d" (__b) \
|
|
); \
|
|
__bsc_return(type,__res); \
|
|
}
|
|
|
|
#define _bsc3(type,name,atype,a,btype,b,ctype,c) \
|
|
type name(atype a, btype b, ctype c) \
|
|
{ \
|
|
register long __res __asm__ ("%d0") = __BN_##name; \
|
|
register long __a __asm__ ("%d1") = (long)a; \
|
|
register long __b __asm__ ("%d2") = (long)b; \
|
|
register long __c __asm__ ("%d3") = (long)c; \
|
|
__asm__ __volatile__ ("trap #2" \
|
|
: "=g" (__res) \
|
|
: "0" (__res), "d" (__a), "d" (__b), \
|
|
"d" (__c) \
|
|
); \
|
|
__bsc_return(type,__res); \
|
|
}
|
|
|
|
#define _bsc4(type,name,atype,a,btype,b,ctype,c,dtype,d) \
|
|
type name(atype a, btype b, ctype c, dtype d) \
|
|
{ \
|
|
register long __res __asm__ ("%d0") = __BN_##name; \
|
|
register long __a __asm__ ("%d1") = (long)a; \
|
|
register long __b __asm__ ("%d2") = (long)b; \
|
|
register long __c __asm__ ("%d3") = (long)c; \
|
|
register long __d __asm__ ("%d4") = (long)d; \
|
|
__asm__ __volatile__ ("trap #2" \
|
|
: "=g" (__res) \
|
|
: "0" (__res), "d" (__a), "d" (__b), \
|
|
"d" (__c), "d" (__d) \
|
|
); \
|
|
__bsc_return(type,__res); \
|
|
}
|
|
|
|
#define _bsc5(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e) \
|
|
type name(atype a, btype b, ctype c, dtype d, etype e) \
|
|
{ \
|
|
register long __res __asm__ ("%d0") = __BN_##name; \
|
|
register long __a __asm__ ("%d1") = (long)a; \
|
|
register long __b __asm__ ("%d2") = (long)b; \
|
|
register long __c __asm__ ("%d3") = (long)c; \
|
|
register long __d __asm__ ("%d4") = (long)d; \
|
|
register long __e __asm__ ("%d5") = (long)e; \
|
|
__asm__ __volatile__ ("trap #2" \
|
|
: "=g" (__res) \
|
|
: "0" (__res), "d" (__a), "d" (__b), \
|
|
"d" (__c), "d" (__d), "d" (__e) \
|
|
); \
|
|
__bsc_return(type,__res); \
|
|
}
|
|
|
|
#endif /* __BOOTSTD_H__ */
|