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

Commit 9de44aa4 authored by Russell King's avatar Russell King
Browse files

Merge branches 'arnd-fixes', 'clk', 'misc', 'v7' and 'fixes' into for-next

parents 6fb18ac9 079ed368 ec3bd0e6 c76f238e 0bbe6b5a

Documentation/devicetree/bindings/arm/l2cc.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,11 @@ Optional properties: 
  disable if zero.

  disable if zero.

- arm,prefetch-offset : Override prefetch offset value. Valid values are

- arm,prefetch-offset : Override prefetch offset value. Valid values are

  0-7, 15, 23, and 31.

  0-7, 15, 23, and 31.

- prefetch-data : Data prefetch. Value: <0> (forcibly disable), <1>

  (forcibly enable), property absent (retain settings set by firmware)

- prefetch-instr : Instruction prefetch. Value: <0> (forcibly disable),

  <1> (forcibly enable), property absent (retain settings set by

  firmware)





Example:

Example:

Documentation/devicetree/booting-without-of.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -856,6 +856,10 @@ address which can extend beyond that limit. 
  name may clash with standard defined ones, you prefix them with your

  name may clash with standard defined ones, you prefix them with your

  vendor name and a comma.

  vendor name and a comma.





  Additional properties for the root node:



    - serial-number : a string representing the device's serial number



  b) The /cpus node

  b) The /cpus node





  This node is the parent of all individual CPU nodes. It doesn't

  This node is the parent of all individual CPU nodes. It doesn't

arch/arm/Kconfig

+16 −6
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ config ARM 
	select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M

	select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M

	select HAVE_KRETPROBES if (HAVE_KPROBES)

	select HAVE_KRETPROBES if (HAVE_KPROBES)

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK

	select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)

	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)

	select HAVE_OPTPROBES if !THUMB2_KERNEL

	select HAVE_OPTPROBES if !THUMB2_KERNEL

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS
@@ -975,11 +975,6 @@ config PLAT_PXA 
config PLAT_VERSATILE

config PLAT_VERSATILE

	bool

	bool





config ARM_TIMER_SP804

	bool

	select CLKSRC_MMIO

	select CLKSRC_OF if OF



source "arch/arm/firmware/Kconfig"

source "arch/arm/firmware/Kconfig"





source arch/arm/mm/Kconfig

source arch/arm/mm/Kconfig
@@ -1682,6 +1677,21 @@ config HAVE_ARCH_TRANSPARENT_HUGEPAGE 
config ARCH_WANT_GENERAL_HUGETLB

config ARCH_WANT_GENERAL_HUGETLB

	def_bool y

	def_bool y





config ARM_MODULE_PLTS

	bool "Use PLTs to allow module memory to spill over into vmalloc area"

	depends on MODULES

	help

	  Allocate PLTs when loading modules so that jumps and calls whose

	  targets are too far away for their relative offsets to be encoded

	  in the instructions themselves can be bounced via veneers in the

	  module's PLT. This allows modules to be allocated in the generic

	  vmalloc area after the dedicated module memory area has been

	  exhausted. The modules will use slightly more memory, but after

	  rounding up to page size, the actual memory footprint is usually

	  the same.



	  Say y if you are getting out of memory errors while loading modules



source "mm/Kconfig"

source "mm/Kconfig"





config FORCE_MAX_ZONEORDER

config FORCE_MAX_ZONEORDER

arch/arm/Makefile

+4 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,10 @@ LDFLAGS_vmlinux += --be8 
LDFLAGS_MODULE	+= --be8

LDFLAGS_MODULE	+= --be8

endif

endif





ifeq ($(CONFIG_ARM_MODULE_PLTS),y)

LDFLAGS_MODULE	+= -T $(srctree)/arch/arm/kernel/module.lds

endif



OBJCOPYFLAGS	:=-O binary -R .comment -S

OBJCOPYFLAGS	:=-O binary -R .comment -S

GZFLAGS		:=-9

GZFLAGS		:=-9

#KBUILD_CFLAGS	+=-pipe

#KBUILD_CFLAGS	+=-pipe

arch/arm/common/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,6 @@ obj-$(CONFIG_SHARP_LOCOMO) += locomo.o 
obj-$(CONFIG_SHARP_PARAM)	+= sharpsl_param.o

obj-$(CONFIG_SHARP_PARAM)	+= sharpsl_param.o

obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o

obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o

obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o

obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o

obj-$(CONFIG_ARM_TIMER_SP804)	+= timer-sp.o

obj-$(CONFIG_MCPM)		+= mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o

obj-$(CONFIG_MCPM)		+= mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o

CFLAGS_REMOVE_mcpm_entry.o	= -pg

CFLAGS_REMOVE_mcpm_entry.o	= -pg

AFLAGS_mcpm_head.o		:= -march=armv7-a

AFLAGS_mcpm_head.o		:= -march=armv7-a