Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdd47c9f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 958903d6

arch/m68k/include/asm/bootinfo.h

+0 −39
Original line number Diff line number Diff line
@@ -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

arch/m68k/include/asm/macintosh.h

+23 −0
Original line number Diff line number Diff line
@@ -135,4 +135,27 @@ struct mac_model 


extern struct mac_model *macintosh_config;





    /*

     * Internal representation of the Mac hardware, filled in from bootinfo

     */



struct mac_booter_data

{

	unsigned long videoaddr;

	unsigned long videorow;

	unsigned long videodepth;

	unsigned long dimensions;

	unsigned long boottime;

	unsigned long gmtbias;

	unsigned long videological;

	unsigned long sccbase;

	unsigned long id;

	unsigned long memsize;

	unsigned long cpuid;

	unsigned long rombase;

};



extern struct mac_booter_data mac_bi_data;



#endif

arch/m68k/kernel/head.S

+0 −2
Original line number Diff line number Diff line
@@ -3896,8 +3896,6 @@ BVME_SCC_DATA_A = 0xffb0000f 
#endif



#if defined(CONFIG_MAC)

L(mac_booter_data):

	.long	0

L(mac_videobase):

	.long	0

L(mac_videodepth):