Commit a7fadac1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'depends/rmk/devel-stable' into next/board 



The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos4/include/mach/entry-macro.S
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-exynos4/mct.c

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 33533277 531a6a94

arch/arm/Kconfig

+94 −10
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ config ARM 
	select HAVE_GENERIC_HARDIRQS

	select HAVE_GENERIC_HARDIRQS

	select HAVE_SPARSE_IRQ

	select HAVE_SPARSE_IRQ

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW

	select CPU_PM if (SUSPEND || CPU_IDLE)

	help

	help

	  The ARM series is a line of low-power-consumption RISC chip designs

	  The ARM series is a line of low-power-consumption RISC chip designs

	  licensed by ARM Ltd and targeted at embedded applications and

	  licensed by ARM Ltd and targeted at embedded applications and
@@ -195,7 +196,8 @@ config VECTORS_BASE 
	  The base address of exception vectors.

	  The base address of exception vectors.





config ARM_PATCH_PHYS_VIRT

config ARM_PATCH_PHYS_VIRT

	bool "Patch physical to virtual translations at runtime"

	bool "Patch physical to virtual translations at runtime" if EMBEDDED

	default y

	depends on !XIP_KERNEL && MMU

	depends on !XIP_KERNEL && MMU

	depends on !ARCH_REALVIEW || !SPARSEMEM

	depends on !ARCH_REALVIEW || !SPARSEMEM

	help

	help
@@ -204,16 +206,25 @@ config ARM_PATCH_PHYS_VIRT 
	  kernel in system memory.

	  kernel in system memory.





	  This can only be used with non-XIP MMU kernels where the base

	  This can only be used with non-XIP MMU kernels where the base

	  of physical memory is at a 16MB boundary, or theoretically 64K

	  of physical memory is at a 16MB boundary.

	  for the MSM machine class.





config ARM_PATCH_PHYS_VIRT_16BIT

	  Only disable this option if you know that you do not require

	def_bool y

	  this feature (eg, building a kernel for a single machine) and

	depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM

	  you need to shrink the kernel to the minimal size.



config NEED_MACH_MEMORY_H

	bool

	help

	help

	  This option extends the physical to virtual translation patching

	  Select this when mach/memory.h is required to provide special

	  to allow physical memory down to a theoretical minimum of 64K

	  definitions for this platform.  The need for mach/memory.h should

	  boundaries.

	  be avoided when possible.



config PHYS_OFFSET

	hex "Physical address of main memory"

	depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H

	help

	  Please provide the physical address corresponding to the

	  location of main memory in your system.





source "init/Kconfig"

source "init/Kconfig"
@@ -246,6 +257,7 @@ config ARCH_INTEGRATOR 
	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE

	select PLAT_VERSATILE

	select PLAT_VERSATILE_FPGA_IRQ

	select PLAT_VERSATILE_FPGA_IRQ

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for ARM's Integrator platform.

	  Support for ARM's Integrator platform.
@@ -261,6 +273,7 @@ config ARCH_REALVIEW 
	select PLAT_VERSATILE_CLCD

	select PLAT_VERSATILE_CLCD

	select ARM_TIMER_SP804

	select ARM_TIMER_SP804

	select GPIO_PL061 if GPIOLIB

	select GPIO_PL061 if GPIOLIB

	select NEED_MACH_MEMORY_H

	help

	help

	  This enables support for ARM Ltd RealView boards.

	  This enables support for ARM Ltd RealView boards.
@@ -301,7 +314,6 @@ config ARCH_AT91 
	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select CLKDEV_LOOKUP

	select ARM_PATCH_PHYS_VIRT if MMU

	help

	help

	  This enables support for systems based on the Atmel AT91RM9200,

	  This enables support for systems based on the Atmel AT91RM9200,

	  AT91SAM9 and AT91CAP9 processors.

	  AT91SAM9 and AT91CAP9 processors.
@@ -322,6 +334,7 @@ config ARCH_CLPS711X 
	bool "Cirrus Logic CLPS711x/EP721x-based"

	bool "Cirrus Logic CLPS711x/EP721x-based"

	select CPU_ARM720T

	select CPU_ARM720T

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for Cirrus Logic 711x/721x based boards.

	  Support for Cirrus Logic 711x/721x based boards.
@@ -362,6 +375,7 @@ config ARCH_EBSA110 
	select ISA

	select ISA

	select NO_IOPORT

	select NO_IOPORT

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	help

	  This is an evaluation board for the StrongARM processor available

	  This is an evaluation board for the StrongARM processor available

	  from Digital. It has limited hardware on-board, including an

	  from Digital. It has limited hardware on-board, including an
@@ -377,6 +391,7 @@ config ARCH_EP93XX 
	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MEMORY_H

	help

	help

	  This enables support for the Cirrus EP93xx series of CPUs.

	  This enables support for the Cirrus EP93xx series of CPUs.
@@ -385,6 +400,7 @@ config ARCH_FOOTBRIDGE 
	select CPU_SA110

	select CPU_SA110

	select FOOTBRIDGE

	select FOOTBRIDGE

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for systems based on the DC21285 companion chip

	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -434,6 +450,7 @@ config ARCH_IOP13XX 
	select PCI

	select PCI

	select ARCH_SUPPORTS_MSI

	select ARCH_SUPPORTS_MSI

	select VMSPLIT_1G

	select VMSPLIT_1G

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for Intel's IOP13XX (XScale) family of processors.

	  Support for Intel's IOP13XX (XScale) family of processors.
@@ -464,6 +481,7 @@ config ARCH_IXP23XX 
	select CPU_XSC3

	select CPU_XSC3

 	select PCI

 	select PCI

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for Intel's IXP23xx (XScale) family of processors.

	  Support for Intel's IXP23xx (XScale) family of processors.
@@ -473,6 +491,7 @@ config ARCH_IXP2000 
	select CPU_XSCALE

	select CPU_XSCALE

	select PCI

	select PCI

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for Intel's IXP2400/2800 (XScale) family of processors.

	  Support for Intel's IXP2400/2800 (XScale) family of processors.
@@ -566,6 +585,7 @@ config ARCH_KS8695 
	select CPU_ARM922T

	select CPU_ARM922T

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based

	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based

	  System-on-Chip devices.

	  System-on-Chip devices.
@@ -657,6 +677,7 @@ config ARCH_SHMOBILE 
	select SPARSE_IRQ

	select SPARSE_IRQ

	select MULTI_IRQ_HANDLER

	select MULTI_IRQ_HANDLER

	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS if PM

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.

	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
@@ -671,6 +692,7 @@ config ARCH_RPC 
	select NO_IOPORT

	select NO_IOPORT

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	help

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  CD-ROM interface, serial and parallel port, and the floppy drive.

	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -689,6 +711,7 @@ config ARCH_SA1100 
	select HAVE_SCHED_CLOCK

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select TICK_ONESHOT

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for StrongARM 11x0 based boards.

	  Support for StrongARM 11x0 based boards.
@@ -781,6 +804,7 @@ config ARCH_S5PV210 
	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C_RTC if RTC_CLASS

	select HAVE_S3C_RTC if RTC_CLASS

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select NEED_MACH_MEMORY_H

	help

	help

	  Samsung S5PV210/S5PC110 series based systems

	  Samsung S5PV210/S5PC110 series based systems
@@ -797,6 +821,7 @@ config ARCH_EXYNOS4 
	select HAVE_S3C_RTC if RTC_CLASS

	select HAVE_S3C_RTC if RTC_CLASS

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select NEED_MACH_MEMORY_H

	help

	help

	  Samsung EXYNOS4 series based systems

	  Samsung EXYNOS4 series based systems
@@ -808,6 +833,7 @@ config ARCH_SHARK 
	select ZONE_DMA

	select ZONE_DMA

	select PCI

	select PCI

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for the StrongARM based Digital DNARD machine, also known

	  Support for the StrongARM based Digital DNARD machine, also known

	  as "Shark" (<http://www.shark-linux.de/shark.html>).

	  as "Shark" (<http://www.shark-linux.de/shark.html>).
@@ -836,6 +862,7 @@ config ARCH_U300 
	select HAVE_MACH_CLKDEV

	select HAVE_MACH_CLKDEV

	select GENERIC_GPIO

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select NEED_MACH_MEMORY_H

	help

	help

	  Support for ST-Ericsson U300 series mobile platforms.

	  Support for ST-Ericsson U300 series mobile platforms.
@@ -1408,6 +1435,31 @@ config SMP_ON_UP 




	  If you don't know what to do here, say Y.

	  If you don't know what to do here, say Y.





config ARM_CPU_TOPOLOGY

	bool "Support cpu topology definition"

	depends on SMP && CPU_V7

	default y

	help

	  Support ARM cpu topology definition. The MPIDR register defines

	  affinity between processors which is then used to describe the cpu

	  topology of an ARM System.



config SCHED_MC

	bool "Multi-core scheduler support"

	depends on ARM_CPU_TOPOLOGY

	help

	  Multi-core scheduler support improves the CPU scheduler's decision

	  making when dealing with multi-core CPU chips at a cost of slightly

	  increased overhead in some places. If unsure say N here.



config SCHED_SMT

	bool "SMT scheduler support"

	depends on ARM_CPU_TOPOLOGY

	help

	  Improves the CPU scheduler's decision making when dealing with

	  MultiThreading at a cost of slightly increased overhead in some

	  places. If unsure say N here.



config HAVE_ARM_SCU

config HAVE_ARM_SCU

	bool

	bool

	help

	help
@@ -1808,6 +1860,38 @@ config ZBOOT_ROM_SH_MOBILE_SDHI 




endchoice

endchoice





config ARM_APPENDED_DTB

	bool "Use appended device tree blob to zImage (EXPERIMENTAL)"

	depends on OF && !ZBOOT_ROM && EXPERIMENTAL

	help

	  With this option, the boot code will look for a device tree binary

	  (DTB) appended to zImage

	  (e.g. cat zImage <filename>.dtb > zImage_w_dtb).



	  This is meant as a backward compatibility convenience for those

	  systems with a bootloader that can't be upgraded to accommodate

	  the documented boot protocol using a device tree.



	  Beware that there is very little in terms of protection against

	  this option being confused by leftover garbage in memory that might

	  look like a DTB header after a reboot if no actual DTB is appended

	  to zImage.  Do not leave this option active in a production kernel

	  if you don't intend to always append a DTB.  Proper passing of the

	  location into r2 of a bootloader provided DTB is always preferable

	  to this option.



config ARM_ATAG_DTB_COMPAT

	bool "Supplement the appended DTB with traditional ATAG information"

	depends on ARM_APPENDED_DTB

	help

	  Some old bootloaders can't be updated to a DTB capable one, yet

	  they provide ATAGs with memory configuration, the ramdisk address,

	  the kernel cmdline string, etc.  Such information is dynamically

	  provided by the bootloader and can't always be stored in a static

	  DTB.  To allow a device tree enabled kernel to be used with such

	  bootloaders, this option allows zImage to extract the information

	  from the ATAG list and store it at run time into the appended DTB.



config CMDLINE

config CMDLINE

	string "Default kernel command string"

	string "Default kernel command string"

	default ""

	default ""

arch/arm/Kconfig.debug

+6 −0
Original line number Original line Diff line number Diff line
@@ -129,4 +129,10 @@ config DEBUG_S3C_UART 
	  The uncompressor code port configuration is now handled

	  The uncompressor code port configuration is now handled

	  by CONFIG_S3C_LOWLEVEL_UART_PORT.

	  by CONFIG_S3C_LOWLEVEL_UART_PORT.





config ARM_KPROBES_TEST

	tristate "Kprobes test module"

	depends on KPROBES && MODULES

	help

	  Perform tests of kprobes API and instruction set simulation.



endmenu
 
endmenu

arch/arm/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -128,6 +128,9 @@ textofs-$(CONFIG_PM_H1940) := 0x00108000 
ifeq ($(CONFIG_ARCH_SA1100),y)

ifeq ($(CONFIG_ARCH_SA1100),y)

textofs-$(CONFIG_SA1111) := 0x00208000

textofs-$(CONFIG_SA1111) := 0x00208000

endif

endif

textofs-$(CONFIG_ARCH_MSM7X30) := 0x00208000

textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000

textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000





# Machine directory name.  This list is sorted alphanumerically

# Machine directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

# by CONFIG_* macro name.

arch/arm/boot/compressed/.gitignore

+9 −0
Original line number Original line Diff line number Diff line
@@ -5,3 +5,12 @@ piggy.lzo 
piggy.lzma

piggy.lzma

vmlinux

vmlinux

vmlinux.lds

vmlinux.lds



# borrowed libfdt files

fdt.c

fdt.h

fdt_ro.c

fdt_rw.c

fdt_wip.c

libfdt.h

libfdt_internal.h

arch/arm/boot/compressed/Makefile

+28 −4
Original line number Original line Diff line number Diff line
@@ -26,6 +26,10 @@ HEAD = head.o 
OBJS	+= misc.o decompress.o

OBJS	+= misc.o decompress.o

FONTC	= $(srctree)/drivers/video/console/font_acorn_8x8.c

FONTC	= $(srctree)/drivers/video/console/font_acorn_8x8.c





# string library code (-Os is enforced to keep it much smaller)

OBJS		+= string.o

CFLAGS_string.o	:= -Os



#

#

# Architecture dependencies

# Architecture dependencies

#

#
@@ -89,21 +93,41 @@ suffix_$(CONFIG_KERNEL_GZIP) = gzip 
suffix_$(CONFIG_KERNEL_LZO)  = lzo

suffix_$(CONFIG_KERNEL_LZO)  = lzo

suffix_$(CONFIG_KERNEL_LZMA) = lzma

suffix_$(CONFIG_KERNEL_LZMA) = lzma





# Borrowed libfdt files for the ATAG compatibility mode



libfdt		:= fdt_rw.c fdt_ro.c fdt_wip.c fdt.c

libfdt_hdrs	:= fdt.h libfdt.h libfdt_internal.h



libfdt_objs	:= $(addsuffix .o, $(basename $(libfdt)))



$(addprefix $(obj)/,$(libfdt) $(libfdt_hdrs)): $(obj)/%: $(srctree)/scripts/dtc/libfdt/%

	$(call cmd,shipped)



$(addprefix $(obj)/,$(libfdt_objs) atags_to_fdt.o): \

	$(addprefix $(obj)/,$(libfdt_hdrs))



ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)

OBJS	+= $(libfdt_objs) atags_to_fdt.o

endif



targets       := vmlinux vmlinux.lds \

targets       := vmlinux vmlinux.lds \

		 piggy.$(suffix_y) piggy.$(suffix_y).o \

		 piggy.$(suffix_y) piggy.$(suffix_y).o \

		 font.o font.c head.o misc.o $(OBJS)

		 lib1funcs.o lib1funcs.S font.o font.c head.o misc.o $(OBJS)





# Make sure files are removed during clean

# Make sure files are removed during clean

extra-y       += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S

extra-y       += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S $(libfdt) $(libfdt_hdrs)





ifeq ($(CONFIG_FUNCTION_TRACER),y)

ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif

endif





ccflags-y := -fpic -fno-builtin

ccflags-y := -fpic -fno-builtin -I$(obj)

asflags-y := -Wa,-march=all

asflags-y := -Wa,-march=all





# Supply kernel BSS size to the decompressor via a linker symbol.

KBSS_SZ = $(shell size $(obj)/../../../../vmlinux | awk 'END{print $$3}')

LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)

# Supply ZRELADDR to the decompressor via a linker symbol.

# Supply ZRELADDR to the decompressor via a linker symbol.

ifneq ($(CONFIG_AUTO_ZRELADDR),y)

ifneq ($(CONFIG_AUTO_ZRELADDR),y)

LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR)

LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR)
@@ -123,7 +147,7 @@ LDFLAGS_vmlinux += -T 
# For __aeabi_uidivmod

# For __aeabi_uidivmod

lib1funcs = $(obj)/lib1funcs.o

lib1funcs = $(obj)/lib1funcs.o





$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S FORCE

$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S

	$(call cmd,shipped)

	$(call cmd,shipped)





# We need to prevent any GOTOFF relocs being used with references

# We need to prevent any GOTOFF relocs being used with references

CRA Git | Maintained and supported by SUSTech CRA and CCSE