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

Commit 441692aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:

 - add support for ELF fdpic binaries on both MMU and noMMU platforms

 - linker script cleanups

 - support for compressed .data section for XIP images

 - discard memblock arrays when possible

 - various cleanups

 - atomic DMA pool updates

 - better diagnostics of missing/corrupt device tree

 - export information to allow userspace kexec tool to place images more
   inteligently, so that the device tree isn't overwritten by the
   booting kernel

 - make early_printk more efficient on semihosted systems

 - noMMU cleanups

 - SA1111 PCMCIA update in preparation for further cleanups

* 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (38 commits)
  ARM: 8719/1: NOMMU: work around maybe-uninitialized warning
  ARM: 8717/2: debug printch/printascii: translate '\n' to "\r\n" not "\n\r"
  ARM: 8713/1: NOMMU: Support MPU in XIP configuration
  ARM: 8712/1: NOMMU: Use more MPU regions to cover memory
  ARM: 8711/1: V7M: Add support for MPU to M-class
  ARM: 8710/1: Kconfig: Kill CONFIG_VECTORS_BASE
  ARM: 8709/1: NOMMU: Disallow MPU for XIP
  ARM: 8708/1: NOMMU: Rework MPU to be mostly done in C
  ARM: 8707/1: NOMMU: Update MPU accessors to use cp15 helpers
  ARM: 8706/1: NOMMU: Move out MPU setup in separate module
  ARM: 8702/1: head-common.S: Clear lr before jumping to start_kernel()
  ARM: 8705/1: early_printk: use printascii() rather than printch()
  ARM: 8703/1: debug.S: move hexbuf to a writable section
  ARM: add additional table to compressed kernel
  ARM: decompressor: fix BSS size calculation
  pcmcia: sa1111: remove special sa1111 mmio accessors
  pcmcia: sa1111: use sa1111_get_irq() to obtain IRQ resources
  ARM: better diagnostics with missing/corrupt dtb
  ARM: 8699/1: dma-mapping: Remove init_dma_coherent_pool_size()
  ARM: 8698/1: dma-mapping: Mark atomic_pool as __ro_after_init
  ..
parents 5b0e2cb0 02196144

arch/arm/Kconfig

+12 −9
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config ARM 
	bool

	default y

	select ARCH_CLOCKSOURCE_DATA

	select ARCH_DISCARD_MEMBLOCK if !HAVE_ARCH_PFN_VALID

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE
@@ -240,15 +241,6 @@ config NEED_RET_TO_USER 
config ARCH_MTD_XIP

	bool



config VECTORS_BASE

	hex

	default 0xffff0000 if MMU || CPU_HIGH_VECTOR

	default DRAM_BASE if REMAP_VECTORS_TO_RAM

	default 0x00000000

	help

	  The base address of exception vectors.  This must be two pages

	  in size.



config ARM_PATCH_PHYS_VIRT

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

	default y
@@ -2006,6 +1998,17 @@ config XIP_PHYS_ADDR 
	  be linked for and stored to.  This address is dependent on your

	  own flash usage.



config XIP_DEFLATED_DATA

	bool "Store kernel .data section compressed in ROM"

	depends on XIP_KERNEL

	select ZLIB_INFLATE

	help

	  Before the kernel is actually executed, its .data section has to be

	  copied to RAM from ROM. This option allows for storing that data

	  in compressed form and decompressed to RAM rather than merely being

	  copied, saving some precious ROM space. A possible drawback is a

	  slightly longer boot delay.



config KEXEC

	bool "Kexec system call (EXPERIMENTAL)"

	depends on (!SMP || PM_SLEEP_SMP)

arch/arm/Kconfig-nommu

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ config REMAP_VECTORS_TO_RAM 


config ARM_MPU

       bool 'Use the ARM v7 PMSA Compliant MPU'

       depends on CPU_V7

       default y

       depends on CPU_V7 || CPU_V7M

       default y if CPU_V7

       help

         Some ARM systems without an MMU have instead a Memory Protection

         Unit (MPU) that defines the type and permissions for regions of

arch/arm/boot/Makefile

+12 −1
Original line number Diff line number Diff line
@@ -31,8 +31,19 @@ targets := Image zImage xipImage bootpImage uImage 


ifeq ($(CONFIG_XIP_KERNEL),y)



cmd_deflate_xip_data = $(CONFIG_SHELL) -c \

	'$(srctree)/$(src)/deflate_xip_data.sh $< $@ || { rm -f $@; false; }'



ifeq ($(CONFIG_XIP_DEFLATED_DATA),y)

quiet_cmd_mkxip = XIPZ    $@

cmd_mkxip = $(cmd_objcopy) && $(cmd_deflate_xip_data)

else

quiet_cmd_mkxip = $(quiet_cmd_objcopy)

cmd_mkxip = $(cmd_objcopy)

endif



$(obj)/xipImage: vmlinux FORCE

	$(call if_changed,objcopy)

	$(call if_changed,mkxip)

	@$(kecho) '  Physical Address of xipImage: $(CONFIG_XIP_PHYS_ADDR)'



$(obj)/Image $(obj)/zImage: FORCE

arch/arm/boot/compressed/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -117,8 +117,11 @@ ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj) 
asflags-y := -DZIMAGE



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

KBSS_SZ = $(shell $(CROSS_COMPILE)size $(obj)/../../../../vmlinux | \

		awk 'END{print $$3}')

KBSS_SZ = $(shell $(CROSS_COMPILE)nm $(obj)/../../../../vmlinux | \

		perl -e 'while (<>) { \

			$$bss_start=hex($$1) if /^([[:xdigit:]]+) B __bss_start$$/; \

			$$bss_end=hex($$1) if /^([[:xdigit:]]+) B __bss_stop$$/; \

		}; printf "%d\n", $$bss_end - $$bss_start;')

LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)

# Supply ZRELADDR to the decompressor via a linker symbol.

ifneq ($(CONFIG_AUTO_ZRELADDR),y)

arch/arm/boot/compressed/head.S

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ start: 
		.word	_magic_start	@ absolute load/run zImage address

		.word	_magic_end	@ zImage end address

		.word	0x04030201	@ endianness flag

		.word	0x45454545	@ another magic number to indicate

		.word	_magic_table	@ additional data table



		__EFI_HEADER

1: