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

Commit 9c0e91f6 authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

m68k/mac: Use '030 reset method on SE/30 



The comment says that calling the ROM routine doesn't work. But testing
shows that the 68030 fall-back reset method does work, so just use that.

Tested-by: default avatarStan Johnson <userm57@yahoo.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent bfc7bebe

arch/m68k/mac/misc.c

+4 −14
Original line number Diff line number Diff line
@@ -410,9 +410,8 @@ void mac_poweroff(void) 


void mac_reset(void)

{

	if (macintosh_config->adb_type == MAC_ADB_II) {

		unsigned long flags;



	if (macintosh_config->adb_type == MAC_ADB_II &&

	    macintosh_config->ident != MAC_MODEL_SE30) {

		/* need ROMBASE in booter */

		/* indeed, plus need to MAP THE ROM !! */
@@ -422,17 +421,8 @@ void mac_reset(void) 
		/* works on some */

		rom_reset = (void *) (mac_bi_data.rombase + 0xa);



		if (macintosh_config->ident == MAC_MODEL_SE30) {

			/*

			 * MSch: Machines known to crash on ROM reset ...

			 */

		} else {

			local_irq_save(flags);



		local_irq_disable();

		rom_reset();



			local_irq_restore(flags);

		}

#ifdef CONFIG_ADB_CUDA

	} else if (macintosh_config->adb_type == MAC_ADB_EGRET ||

	           macintosh_config->adb_type == MAC_ADB_CUDA) {