Commit 5d70dacd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k into next

Pull m68k updates from Geert Uytterhoeven:
 "Highlights:
   - support for running kernels in fast TT-RAM instead of slow ST-RAM
     on Atari
   - multi-platform EARLY_PRINTK
   - better support for machines with lots of RAM (think ARAnyM), and
     for running kernels larger than 4 MiB (think multi-platform)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/hp300: Convert printk to pr_foo()
  m68k/apollo: Convert printk to pr_foo()
  m68k/amiga: Convert printk(foo to pr_foo()
  m68k: Increase initial mapping to 8 or 16 MiB if possible
  m68k: Update defconfigs for v3.15-rc2
  m68k/atari: fix SCC initialization for debug console
  m68k/mvme16x: Adopt common boot console
  m68k: Multi-platform EARLY_PRINTK
  m68k: Toward platform agnostic framebuffer debug logging
  m68k/atari - atari_scsi: use correct virt/phys translation for DMA buffer
  m68k/atari - ataflop: use correct virt/phys translation for DMA buffer
  m68k/atari - atafb: convert allocation of fb ram to new interface
  m68k/atari - stram: alloc ST-RAM pool even if kernel not in ST-RAM
parents fad01e86 e8d6dc5a

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			(mmio) or 32-bit (mmio32).

			The options are the same as for ttyS, above.



	earlyprintk=	[X86,SH,BLACKFIN,ARM]

	earlyprintk=	[X86,SH,BLACKFIN,ARM,M68k]

			earlyprintk=vga

			earlyprintk=efi

			earlyprintk=xen

arch/m68k/Kconfig.debug

+7 −2
Original line number Diff line number Diff line
@@ -12,12 +12,17 @@ config BOOTPARAM_STRING 


config EARLY_PRINTK

	bool "Early printk"

	depends on MVME16x || MAC

	depends on !(SUN3 || M68360 || M68000 || COLDFIRE)

	help

          Write kernel log output directly to a serial port.

          Where implemented, output goes to the framebuffer as well.

          PROM console functionality on Sun 3x is not affected by this option.



          Pass "earlyprintk" on the kernel command line to get a

          boot console.



          This is useful for kernel debugging when your machine crashes very

          early before the console code is initialized.

          early, i.e. before the normal console driver is loaded.

          You should normally say N here, unless you want to debug such a crash.



if !MMU

arch/m68k/amiga/amisound.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void __init amiga_init_sound(void) 


	snd_data = amiga_chip_alloc_res(sizeof(sine_data), &beep_res);

	if (!snd_data) {

		printk (KERN_CRIT "amiga init_sound: failed to allocate chipmem\n");

		pr_crit("amiga init_sound: failed to allocate chipmem\n");

		return;

	}

	memcpy (snd_data, sine_data, sizeof(sine_data));

arch/m68k/amiga/config.c

+10 −10
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ int __init amiga_parse_bootinfo(const struct bi_record *record) 
			dev->boardaddr = be32_to_cpu(cd->cd_BoardAddr);

			dev->boardsize = be32_to_cpu(cd->cd_BoardSize);

		} else

			printk("amiga_parse_bootinfo: too many AutoConfig devices\n");

			pr_warn("amiga_parse_bootinfo: too many AutoConfig devices\n");

#endif /* CONFIG_ZORRO */

		break;
@@ -209,9 +209,9 @@ static void __init amiga_identify(void) 


	memset(&amiga_hw_present, 0, sizeof(amiga_hw_present));



	printk("Amiga hardware found: ");

	pr_info("Amiga hardware found: ");

	if (amiga_model >= AMI_500 && amiga_model <= AMI_DRACO) {

		printk("[%s] ", amiga_models[amiga_model-AMI_500]);

		pr_cont("[%s] ", amiga_models[amiga_model-AMI_500]);

		strcat(amiga_model_name, amiga_models[amiga_model-AMI_500]);

	}
@@ -322,7 +322,7 @@ static void __init amiga_identify(void) 


#define AMIGAHW_ANNOUNCE(name, str)		\

	if (AMIGAHW_PRESENT(name))		\

		printk(str)

		pr_cont(str)



	AMIGAHW_ANNOUNCE(AMI_VIDEO, "VIDEO ");

	AMIGAHW_ANNOUNCE(AMI_BLITTER, "BLITTER ");
@@ -354,8 +354,8 @@ static void __init amiga_identify(void) 
	AMIGAHW_ANNOUNCE(MAGIC_REKICK, "MAGIC_REKICK ");

	AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA ");

	if (AMIGAHW_PRESENT(ZORRO))

		printk("ZORRO%s ", AMIGAHW_PRESENT(ZORRO3) ? "3" : "");

	printk("\n");

		pr_cont("ZORRO%s ", AMIGAHW_PRESENT(ZORRO3) ? "3" : "");

	pr_cont("\n");



#undef AMIGAHW_ANNOUNCE

}
@@ -424,7 +424,7 @@ void __init config_amiga(void) 
			if (m68k_memory[i].addr < 16*1024*1024) {

				if (i == 0) {

					/* don't cut off the branch we're sitting on */

					printk("Warning: kernel runs in Zorro II memory\n");

					pr_warn("Warning: kernel runs in Zorro II memory\n");

					continue;

				}

				disabled_z2mem += m68k_memory[i].size;
@@ -435,7 +435,7 @@ void __init config_amiga(void) 
			}

		}

		if (disabled_z2mem)

		printk("%dK of Zorro II memory will not be used as system memory\n",

			pr_info("%dK of Zorro II memory will not be used as system memory\n",

				disabled_z2mem>>10);

	}
@@ -475,7 +475,7 @@ static void __init amiga_sched_init(irq_handler_t timer_routine) 
	jiffy_ticks = DIV_ROUND_CLOSEST(amiga_eclock, HZ);



	if (request_resource(&mb_resources._ciab, &sched_res))

		printk("Cannot allocate ciab.ta{lo,hi}\n");

		pr_warn("Cannot allocate ciab.ta{lo,hi}\n");

	ciab.cra &= 0xC0;   /* turn off timer A, continuous mode, from Eclk */

	ciab.talo = jiffy_ticks % 256;

	ciab.tahi = jiffy_ticks / 256;

arch/m68k/apollo/config.c

+10 −10
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ int __init apollo_parse_bootinfo(const struct bi_record *record) 


static void __init dn_setup_model(void)

{

	printk("Apollo hardware found: ");

	printk("[%s]\n", apollo_models[apollo_model - APOLLO_DN3000]);

	pr_info("Apollo hardware found: [%s]\n",

		apollo_models[apollo_model - APOLLO_DN3000]);



	switch(apollo_model) {

		case APOLLO_UNKNOWN:
@@ -197,8 +197,10 @@ void dn_sched_init(irq_handler_t timer_routine) 
	*(volatile unsigned char *)(pica+1)&=(~8);



#if 0

	printk("*(0x10803) %02x\n",*(volatile unsigned char *)(apollo_timer + 0x3));

	printk("*(0x10803) %02x\n",*(volatile unsigned char *)(apollo_timer + 0x3));

	pr_info("*(0x10803) %02x\n",

		*(volatile unsigned char *)(apollo_timer + 0x3));

	pr_info("*(0x10803) %02x\n",

		*(volatile unsigned char *)(apollo_timer + 0x3));

#endif



	if (request_irq(IRQ_APOLLO, dn_timer_int, 0, "time", timer_routine))
@@ -236,12 +238,10 @@ int dn_dummy_hwclk(int op, struct rtc_time *t) { 


}



int dn_dummy_set_clock_mmss(unsigned long nowtime) {



  printk("set_clock_mmss\n");



int dn_dummy_set_clock_mmss(unsigned long nowtime)

{

	pr_info("set_clock_mmss\n");

	return 0;



}



void dn_dummy_reset(void) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE