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

Commit 75786349 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: (60 commits)
  [ARM] 4524/1: S3C: Move register out of include/asm-arm/arch-s3c2410
  [ARM] 4523/1: S3C: Remove FIFO_MAX from uncompression headers
  [ARM] 4522/1: S3C: split include/asm-arm/arch/memory.h
  [ARM] 4521/2: S3C: Reorganise VA mapping headers
  [ARM] 4520/1: S3C: Remove old VA values from static map
  [ARM] 4519/1: S3C: split S3C2400 values out of S3C24XX map.h
  [ARM] 4518/1: S3C: Rename watchdog configuration options
  [ARM] 4517/1: S3C: Fix debug macros for ARM926 output
  [ARM] 4516/1: S3C: Fix uncompressor serial output for ARM926
  [ARM] 4515/1: S3C: Move uncompress code to plat-s3c
  [ARM] 4514/1: S3C: Rename DEBUG_S3C2410_PORT and DEBUG_S3C_UART
  [ARM] 4513/1: S3C: Rename CONFIG_S3C2410_LOWLEVEL_UART_PORT
  [ARM] 4512/1: S3C: rename the debug macros for per-cpu updates
  [ARM] 4511/1: S3C: updated LLSERIAL Kconfig defines for CPU support
  [ARM] 4510/1: S3C: split debug-macro support into plat-s3c
  [ARM] 4509/1: S3C: Create initial arch/arm/plat-s3c
  [ARM] 4508/1: S3C: Move items to include/asm-arm/plat-s3c
  [ARM] 4461/1: MXC platform and i.MX31ADS core support
  [ARM] 4507/1: pxa2xx clock_event_device
  [ARM] 4497/1: Only allow safe cache configurations on ARMv6 and later
  ...
parents d7f5e3df 5957a4eb

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ S: Maintained 


ARM/HP JORNADA 7XX MACHINE SUPPORT

P:      Kristoffer Ericson

M:      kristoffer_e1@hotmail.com

M:      kristoffer.ericson@gmail.com

W:      www.jlime.com

S:      Maintained

arch/arm/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -324,6 +324,12 @@ config ARCH_NS9XXX 


	  <http://www.digi.com/products/microprocessors/index.jsp>



config ARCH_MXC

	bool "Freescale MXC/iMX-based"

	select ARCH_MTD_XIP

	help

	  Support for Freescale MXC/iMX-based family of processors



config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	help
@@ -432,6 +438,7 @@ source "arch/arm/mach-omap1/Kconfig" 
source "arch/arm/mach-omap2/Kconfig"



source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s3c/Kconfig"



if ARCH_S3C2410

source "arch/arm/mach-s3c2400/Kconfig"
@@ -456,6 +463,8 @@ source "arch/arm/mach-realview/Kconfig" 


source "arch/arm/mach-at91/Kconfig"



source "arch/arm/plat-mxc/Kconfig"



source "arch/arm/mach-netx/Kconfig"



source "arch/arm/mach-ns9xxx/Kconfig"

arch/arm/Kconfig.debug

+9 −9
Original line number Diff line number Diff line
@@ -82,24 +82,24 @@ config DEBUG_CLPS711X_UART2 
	  output to the second serial port on these devices.  Saying N will

	  cause the debug messages to appear on the first serial port.



config DEBUG_S3C2410_PORT

	depends on DEBUG_LL && ARCH_S3C2410

	bool "Kernel low-level debugging messages via S3C2410 UART"

config DEBUG_S3C_PORT

	depends on DEBUG_LL && PLAT_S3C

	bool "Kernel low-level debugging messages via S3C UART"

	help

	  Say Y here if you want debug print routines to go to one of the

	  S3C2410 internal UARTs. The chosen UART must have been configured

	  S3C internal UARTs. The chosen UART must have been configured

	  before it is used.



config DEBUG_S3C2410_UART

	depends on ARCH_S3C2410

	int "S3C2410 UART to use for low-level debug"

config DEBUG_S3C_UART

	depends on PLAT_S3C

	int "S3C UART to use for low-level debug"

	default "0"

	help

	  Choice for UART for kernel low-level using S3C2410 UARTS,

	  Choice for UART for kernel low-level using S3C UARTS,

	  should be between zero and two. The port must have been

	  initialised by the boot-loader before use.



	  The uncompressor code port configuration is now handled

	  by CONFIG_S3C2410_LOWLEVEL_UART_PORT.

	  by CONFIG_S3C_LOWLEVEL_UART_PORT.



endmenu

arch/arm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ endif 
 textofs-$(CONFIG_ARCH_NS9XXX)	   := 0x00108000

 machine-$(CONFIG_ARCH_DAVINCI)	   := davinci

 machine-$(CONFIG_ARCH_KS8695)     := ks8695

  incdir-$(CONFIG_ARCH_MXC)	   := mxc

 machine-$(CONFIG_ARCH_MX3)	   := mx3



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.
@@ -183,6 +185,7 @@ core-$(CONFIG_VFP) += arch/arm/vfp/ 
core-$(CONFIG_PLAT_IOP)		+= arch/arm/plat-iop/

core-$(CONFIG_ARCH_OMAP)	+= arch/arm/plat-omap/

core-$(CONFIG_PLAT_S3C24XX)		+= arch/arm/plat-s3c24xx/

core-$(CONFIG_ARCH_MXC)		+= arch/arm/plat-mxc/



drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

drivers-$(CONFIG_ARCH_CLPS7500)	+= drivers/acorn/char/

arch/arm/boot/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -91,4 +91,12 @@ zinstall: $(obj)/zImage 
	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/zImage System.map "$(INSTALL_PATH)"



zi:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/zImage System.map "$(INSTALL_PATH)"



i:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/Image System.map "$(INSTALL_PATH)"



subdir-	    := bootp compressed