diff options
| author |   Geert Uytterhoeven <geert@linux-m68k.org> | 2013-10-02 22:40:44 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-26 11:09:21 +0100 |
| commit | cf288bd5b122d12476fd7d9825c292daef5dba58 (patch) | |
| tree | 16b5cd1608702f722a009f8fb609a0cd5112253c /arch/m68k/include | |
| parent | m68k/UAPI: Move Macintosh model definitions to <asm/bootinfo-mac.h> (diff) | |
| download | linux-dev-cf288bd5b122d12476fd7d9825c292daef5dba58.tar.xz linux-dev-cf288bd5b122d12476fd7d9825c292daef5dba58.zip | |
m68k/UAPI: Move VME Board ID definition to <asm/bootinfo-vme.h>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include')
| -rw-r--r-- | arch/m68k/include/asm/mvme16xhw.h | 15 | ||||
| -rw-r--r-- | arch/m68k/include/uapi/asm/bootinfo-vme.h | 25 |
2 files changed, 23 insertions, 17 deletions
diff --git a/arch/m68k/include/asm/mvme16xhw.h b/arch/m68k/include/asm/mvme16xhw.h index 87fa84ad252e..1eb89de631e5 100644 --- a/arch/m68k/include/asm/mvme16xhw.h +++ b/arch/m68k/include/asm/mvme16xhw.h @@ -3,21 +3,6 @@ #include <asm/irq.h> -/* Board ID data structure - pointer to this retrieved from Bug by head.S */ - -/* Note, bytes 12 and 13 are board no in BCD (0162,0166,0167,0177,etc) */ - -typedef struct { - char bdid[4]; - u_char rev, mth, day, yr; - u_short size, reserved; - u_short brdno; - char brdsuffix[2]; - u_long options; - u_short clun, dlun, ctype, dnum; - u_long option2; -} t_bdid, *p_bdid; - typedef struct { u_char ack_icr, diff --git a/arch/m68k/include/uapi/asm/bootinfo-vme.h b/arch/m68k/include/uapi/asm/bootinfo-vme.h index 4643a55ed768..13ba5e19fe24 100644 --- a/arch/m68k/include/uapi/asm/bootinfo-vme.h +++ b/arch/m68k/include/uapi/asm/bootinfo-vme.h @@ -28,11 +28,32 @@ #define VME_TYPE_BVME4000 0x4000 /* BVM Ltd. BVME4000 */ #define VME_TYPE_BVME6000 0x6000 /* BVM Ltd. BVME6000 */ -/* BI_VME_BRDINFO is a 32 byte struct as returned by the Bug code on + +#ifndef __ASSEMBLY__ + +/* + * Board ID data structure - pointer to this retrieved from Bug by head.S + * + * BI_VME_BRDINFO is a 32 byte struct as returned by the Bug code on * Motorola VME boards. Contains board number, Bug version, board - * configuration options, etc. See include/asm/mvme16xhw.h for details. + * configuration options, etc. + * + * Note, bytes 12 and 13 are board no in BCD (0162,0166,0167,0177,etc) */ +typedef struct { + char bdid[4]; + u_char rev, mth, day, yr; + u_short size, reserved; + u_short brdno; + char brdsuffix[2]; + u_long options; + u_short clun, dlun, ctype, dnum; + u_long option2; +} t_bdid, *p_bdid; + +#endif /* __ASSEMBLY__ */ + /* * Latest VME bootinfo versions |