summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-15 16:06:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-15 16:06:15 -0800
commit66d466722c39f663b2bbeb44ba4f9419a548fa23 (patch)
treec88df3dac15b7ef03f58a553fc42f9324d43dac0 /arch/arm/Makefile
parent991688bfc63550b8c7ab9fb1de2feb44e3071d29 (diff)
parented141f2890cdb738fc7131367f5fb15632bc3e60 (diff)
downloadtalos-obmc-linux-66d466722c39f663b2bbeb44ba4f9419a548fa23.tar.gz
talos-obmc-linux-66d466722c39f663b2bbeb44ba4f9419a548fa23.zip
Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM updates from Russell King: - an update for clkdev registration error detection to simplify users - add cpu capacity parsing from DT - support for larger cachelines found on UniPhier caches - documentation for udelay constants - properly tag assembly function declarations - remove unnecessary indirection of asm/mach-types.h - switch to syscall table based generation to simplify future additions of system calls, along with correpsonding commit for pkey syscalls - remove redundant sa1101 header file - RONX protect modules when they're in the vmalloc region * 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: mm: allow set_memory_*() to be used on the vmalloc region ARM: mm: fix set_memory_*() bounds checks ARM: 8631/1: clkdev: Detect errors in clk_hw_register_clkdev() for mass registration ARM: 8629/1: vfp: properly tag assembly function declarations in C code ARM: 8622/3: add sysfs cpu_capacity attribute ARM: 8621/3: parse cpu capacity-dmips-mhz from DT ARM: 8623/1: mm: add ARM_L1_CACHE_SHIFT_7 for UniPhier outer cache ARM: Update mach-types ARM: sa1100: remove SA-1101 header file ARM: 8619/1: udelay: document the various constants ARM: wire up new pkey syscalls ARM: convert to generated system call tables ARM: remove indirection of asm/mach-types.h
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 68312a9f660a..ab30cc634d02 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -312,8 +312,11 @@ all: $(KBUILD_IMAGE) $(KBUILD_DTBS)
boot := arch/arm/boot
+archheaders:
+ $(Q)$(MAKE) $(build)=arch/arm/tools uapi
+
archprepare:
- $(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h
+ $(Q)$(MAKE) $(build)=arch/arm/tools kapi
# Convert bzImage to zImage
bzImage: zImage
OpenPOWER on IntegriCloud