summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/bootinfo.h
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-10-02 10:01:43 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-11-26 11:09:14 +0100
commitbdd47c9fc1d96d3319e938931c83b863b5331b57 (patch)
tree4117fe0c99d55744a0efcfa3f43d8f1ebd5d519d /arch/m68k/include/asm/bootinfo.h
parent958903d6f08c977778bf5e1f18eb7fd27b30ca72 (diff)
downloadblackbird-op-linux-bdd47c9fc1d96d3319e938931c83b863b5331b57.tar.gz
blackbird-op-linux-bdd47c9fc1d96d3319e938931c83b863b5331b57.zip
m68k/mac: Move struct mac_booter_data to <asm/macintosh.h>
struct mac_booter_data is no longer part of the bootinfo API, hence move it from <asm/bootinfo.h> to <asm/macintosh.h>, dropping all unused fields in the process. Also remove the no longer used mac_booter_data pointer from head.S. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/bootinfo.h')
-rw-r--r--arch/m68k/include/asm/bootinfo.h39
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
index 44f97beb5215..908c42f91e6a 100644
--- a/arch/m68k/include/asm/bootinfo.h
+++ b/arch/m68k/include/asm/bootinfo.h
@@ -167,45 +167,6 @@ struct bi_record {
#define BI_MAC_IOP_SWIM 0x8020 /* Mac SWIM floppy IOP */
#define BI_MAC_IOP_ADB 0x8021 /* Mac ADB IOP */
- /*
- * Mac: compatibility with old booter data format (temporarily)
- * Fields unused with the new bootinfo can be deleted now; instead of
- * adding new fields the struct might be splitted into a hardware address
- * part and a hardware type part
- */
-
-#ifndef __ASSEMBLY__
-
-struct mac_booter_data
-{
- unsigned long videoaddr;
- unsigned long videorow;
- unsigned long videodepth;
- unsigned long dimensions;
- unsigned long args;
- unsigned long boottime;
- unsigned long gmtbias;
- unsigned long bootver;
- unsigned long videological;
- unsigned long sccbase;
- unsigned long id;
- unsigned long memsize;
- unsigned long serialmf;
- unsigned long serialhsk;
- unsigned long serialgpi;
- unsigned long printmf;
- unsigned long printhsk;
- unsigned long printgpi;
- unsigned long cpuid;
- unsigned long rombase;
- unsigned long adbdelay;
- unsigned long timedbra;
-};
-
-extern struct mac_booter_data
- mac_bi_data;
-
-#endif
/*
* Apollo-specific tags
OpenPOWER on IntegriCloud