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

Commit af853e63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: fix lh7a40x build
  ARM: fix sa1100 build
  ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug
  ARM: VFP: fix vfp thread init bug and document vfp notifier entry conditions
  ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq
  [ARM] pxa/zeus: default configuration for Arcom Zeus SBC.
  [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus
  [ARM] pxa/zeus: basic support for Arcom Zeus SBC
  [ARM] pxa/em-x270: fix usb hub power up/reset sequence
  PCMCIA: fix pxa2xx_lubbock modular build error
  ARM: RealView: Fix typo in the RealView/PBX Kconfig entry
  ARM: Do not allow the probing of the local timer
  ARM: Add an earlyprintk debug console
parents 3f86ce72 fc773668

arch/arm/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ config ARCH_SA1100 
	select ARCH_SPARSEMEM_ENABLE

	select ARCH_MTD_XIP

	select ARCH_HAS_CPUFREQ

	select CPU_FREQ

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS
@@ -1359,13 +1360,9 @@ source "drivers/cpufreq/Kconfig" 


config CPU_FREQ_SA1100

	bool

	depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_LART || SA1100_PLEB || SA1100_BADGE4 || SA1100_HACKKIT)

	default y



config CPU_FREQ_SA1110

	bool

	depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3)

	default y



config CPU_FREQ_INTEGRATOR

	tristate "CPUfreq driver for ARM Integrator CPUs"

arch/arm/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -71,6 +71,14 @@ config DEBUG_LL 
	  in the kernel.  This is helpful if you are debugging code that

	  executes before the console is initialized.



config EARLY_PRINTK

	bool "Early printk"

	depends on DEBUG_LL

	help

	  Say Y here if you want to have an early console using the

	  kernel low-level debugging functions. Add earlyprintk to your

	  kernel parameters to enable this console.



config DEBUG_ICEDCC

	bool "Kernel low-level debugging via EmbeddedICE DCC channel"

	depends on DEBUG_LL

arch/arm/configs/zeus_defconfig

0 → 100644
+2032 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -54,5 +54,6 @@ endif 


head-y			:= head$(MMUEXT).o

obj-$(CONFIG_DEBUG_LL)	+= debug.o

obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o



extra-y := $(head-y) init_task.o vmlinux.lds

arch/arm/kernel/early_printk.c

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/kernel/early_printk.c

 *

 *  Copyright (C) 2009 Sascha Hauer <s.hauer@pengutronix.de>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/console.h>

#include <linux/init.h>



extern void printch(int);



static void early_write(const char *s, unsigned n)

{

	while (n-- > 0) {

		if (*s == '\n')

			printch('\r');

		printch(*s);

		s++;

	}

}



static void early_console_write(struct console *con, const char *s, unsigned n)

{

	early_write(s, n);

}



static struct console early_console = {

	.name =		"earlycon",

	.write =	early_console_write,

	.flags =	CON_PRINTBUFFER | CON_BOOT,

	.index =	-1,

};



asmlinkage void early_printk(const char *fmt, ...)

{

	char buf[512];

	int n;

	va_list ap;



	va_start(ap, fmt);

	n = vscnprintf(buf, sizeof(buf), fmt, ap);

	early_write(buf, n);

	va_end(ap);

}



static int __init setup_early_printk(char *buf)

{

	register_console(&early_console);

	return 0;

}



early_param("earlyprintk", setup_early_printk);