tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

kbuild: arm - use generic asm-offsets.h support

Delete obsoleted stuff from arch Makefile and rename
constants.h to asm-offsets.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Sam Ravnborg e6ae744d 0013a854

+29 -34
+2 -7
arch/arm/Makefile
··· 178 178 prepare: maketools include/asm-arm/.arch 179 179 180 180 .PHONY: maketools FORCE 181 - maketools: include/asm-arm/constants.h include/linux/version.h FORCE 181 + maketools: include/linux/version.h FORCE 182 182 $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h 183 183 184 184 # Convert bzImage to zImage ··· 190 190 zinstall install: vmlinux 191 191 $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ 192 192 193 - CLEAN_FILES += include/asm-arm/constants.h* include/asm-arm/mach-types.h \ 193 + CLEAN_FILES += include/asm-arm/mach-types.h \ 194 194 include/asm-arm/arch include/asm-arm/.arch 195 195 196 196 # We use MRPROPER_FILES and CLEAN_FILES now ··· 201 201 bp:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage 202 202 i zi:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ 203 203 204 - arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ 205 - include/asm-arm/.arch 206 - 207 - include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.s 208 - $(call filechk,gen-asm-offsets) 209 204 210 205 define archhelp 211 206 echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
+1 -1
arch/arm/kernel/entry-header.S
··· 3 3 #include <linux/linkage.h> 4 4 5 5 #include <asm/assembler.h> 6 - #include <asm/constants.h> 6 + #include <asm/asm-offsets.h> 7 7 #include <asm/errno.h> 8 8 #include <asm/thread_info.h> 9 9
+1 -1
arch/arm/kernel/head.S
··· 20 20 #include <asm/mach-types.h> 21 21 #include <asm/procinfo.h> 22 22 #include <asm/ptrace.h> 23 - #include <asm/constants.h> 23 + #include <asm/asm-offsets.h> 24 24 #include <asm/thread_info.h> 25 25 #include <asm/system.h> 26 26
+1 -1
arch/arm/kernel/iwmmxt.S
··· 17 17 #include <linux/linkage.h> 18 18 #include <asm/ptrace.h> 19 19 #include <asm/thread_info.h> 20 - #include <asm/constants.h> 20 + #include <asm/asm-offsets.h> 21 21 22 22 #define MMX_WR0 (0x00) 23 23 #define MMX_WR1 (0x08)
+1 -1
arch/arm/lib/copy_page.S
··· 11 11 */ 12 12 #include <linux/linkage.h> 13 13 #include <asm/assembler.h> 14 - #include <asm/constants.h> 14 + #include <asm/asm-offsets.h> 15 15 16 16 #define COPY_COUNT (PAGE_SZ/64 PLD( -1 )) 17 17
+1 -1
arch/arm/lib/csumpartialcopyuser.S
··· 13 13 #include <linux/linkage.h> 14 14 #include <asm/assembler.h> 15 15 #include <asm/errno.h> 16 - #include <asm/constants.h> 16 + #include <asm/asm-offsets.h> 17 17 18 18 .text 19 19
+1 -1
arch/arm/lib/getuser.S
··· 26 26 * Note that ADDR_LIMIT is either 0 or 0xc0000000. 27 27 * Note also that it is intended that __get_user_bad is not global. 28 28 */ 29 - #include <asm/constants.h> 29 + #include <asm/asm-offsets.h> 30 30 #include <asm/thread_info.h> 31 31 #include <asm/errno.h> 32 32
+1 -1
arch/arm/lib/putuser.S
··· 26 26 * Note that ADDR_LIMIT is either 0 or 0xc0000000 27 27 * Note also that it is intended that __put_user_bad is not global. 28 28 */ 29 - #include <asm/constants.h> 29 + #include <asm/asm-offsets.h> 30 30 #include <asm/thread_info.h> 31 31 #include <asm/errno.h> 32 32
+1 -1
arch/arm/mm/copypage-v3.S
··· 12 12 #include <linux/linkage.h> 13 13 #include <linux/init.h> 14 14 #include <asm/assembler.h> 15 - #include <asm/constants.h> 15 + #include <asm/asm-offsets.h> 16 16 17 17 .text 18 18 .align 5
+1 -1
arch/arm/mm/copypage-v4wb.S
··· 11 11 */ 12 12 #include <linux/linkage.h> 13 13 #include <linux/init.h> 14 - #include <asm/constants.h> 14 + #include <asm/asm-offsets.h> 15 15 16 16 .text 17 17 .align 5
+1 -1
arch/arm/mm/copypage-v4wt.S
··· 14 14 */ 15 15 #include <linux/linkage.h> 16 16 #include <linux/init.h> 17 - #include <asm/constants.h> 17 + #include <asm/asm-offsets.h> 18 18 19 19 .text 20 20 .align 5
+1 -1
arch/arm/mm/proc-arm1020.S
··· 28 28 #include <linux/config.h> 29 29 #include <linux/init.h> 30 30 #include <asm/assembler.h> 31 - #include <asm/constants.h> 31 + #include <asm/asm-offsets.h> 32 32 #include <asm/pgtable.h> 33 33 #include <asm/procinfo.h> 34 34 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm1020e.S
··· 28 28 #include <linux/config.h> 29 29 #include <linux/init.h> 30 30 #include <asm/assembler.h> 31 - #include <asm/constants.h> 31 + #include <asm/asm-offsets.h> 32 32 #include <asm/pgtable.h> 33 33 #include <asm/procinfo.h> 34 34 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm1022.S
··· 17 17 #include <linux/config.h> 18 18 #include <linux/init.h> 19 19 #include <asm/assembler.h> 20 - #include <asm/constants.h> 20 + #include <asm/asm-offsets.h> 21 21 #include <asm/pgtable.h> 22 22 #include <asm/procinfo.h> 23 23 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm1026.S
··· 17 17 #include <linux/config.h> 18 18 #include <linux/init.h> 19 19 #include <asm/assembler.h> 20 - #include <asm/constants.h> 20 + #include <asm/asm-offsets.h> 21 21 #include <asm/pgtable.h> 22 22 #include <asm/procinfo.h> 23 23 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm6_7.S
··· 13 13 #include <linux/linkage.h> 14 14 #include <linux/init.h> 15 15 #include <asm/assembler.h> 16 - #include <asm/constants.h> 16 + #include <asm/asm-offsets.h> 17 17 #include <asm/pgtable.h> 18 18 #include <asm/procinfo.h> 19 19 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm720.S
··· 33 33 #include <linux/linkage.h> 34 34 #include <linux/init.h> 35 35 #include <asm/assembler.h> 36 - #include <asm/constants.h> 36 + #include <asm/asm-offsets.h> 37 37 #include <asm/pgtable.h> 38 38 #include <asm/procinfo.h> 39 39 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-macros.S
··· 4 4 * VMA_VM_FLAGS 5 5 * VM_EXEC 6 6 */ 7 - #include <asm/constants.h> 7 + #include <asm/asm-offsets.h> 8 8 #include <asm/thread_info.h> 9 9 10 10 /*
+1 -1
arch/arm/mm/proc-sa110.S
··· 15 15 #include <linux/linkage.h> 16 16 #include <linux/init.h> 17 17 #include <asm/assembler.h> 18 - #include <asm/constants.h> 18 + #include <asm/asm-offsets.h> 19 19 #include <asm/procinfo.h> 20 20 #include <asm/hardware.h> 21 21 #include <asm/pgtable.h>
+1 -1
arch/arm/mm/proc-sa1100.S
··· 20 20 #include <linux/linkage.h> 21 21 #include <linux/init.h> 22 22 #include <asm/assembler.h> 23 - #include <asm/constants.h> 23 + #include <asm/asm-offsets.h> 24 24 #include <asm/procinfo.h> 25 25 #include <asm/hardware.h> 26 26 #include <asm/pgtable.h>
+1 -1
arch/arm/mm/proc-v6.S
··· 11 11 */ 12 12 #include <linux/linkage.h> 13 13 #include <asm/assembler.h> 14 - #include <asm/constants.h> 14 + #include <asm/asm-offsets.h> 15 15 #include <asm/procinfo.h> 16 16 #include <asm/pgtable.h> 17 17
+1 -1
arch/arm/mm/tlb-v3.S
··· 13 13 */ 14 14 #include <linux/linkage.h> 15 15 #include <linux/init.h> 16 - #include <asm/constants.h> 16 + #include <asm/asm-offsets.h> 17 17 #include <asm/tlbflush.h> 18 18 #include "proc-macros.S" 19 19
+1 -1
arch/arm/mm/tlb-v4.S
··· 14 14 */ 15 15 #include <linux/linkage.h> 16 16 #include <linux/init.h> 17 - #include <asm/constants.h> 17 + #include <asm/asm-offsets.h> 18 18 #include <asm/tlbflush.h> 19 19 #include "proc-macros.S" 20 20
+1 -1
arch/arm/mm/tlb-v4wb.S
··· 14 14 */ 15 15 #include <linux/linkage.h> 16 16 #include <linux/init.h> 17 - #include <asm/constants.h> 17 + #include <asm/asm-offsets.h> 18 18 #include <asm/tlbflush.h> 19 19 #include "proc-macros.S" 20 20
+1 -1
arch/arm/mm/tlb-v4wbi.S
··· 14 14 */ 15 15 #include <linux/linkage.h> 16 16 #include <linux/init.h> 17 - #include <asm/constants.h> 17 + #include <asm/asm-offsets.h> 18 18 #include <asm/tlbflush.h> 19 19 #include "proc-macros.S" 20 20
+1 -1
arch/arm/mm/tlb-v6.S
··· 11 11 * These assume a split I/D TLB. 12 12 */ 13 13 #include <linux/linkage.h> 14 - #include <asm/constants.h> 14 + #include <asm/asm-offsets.h> 15 15 #include <asm/page.h> 16 16 #include <asm/tlbflush.h> 17 17 #include "proc-macros.S"
+1 -1
arch/arm/nwfpe/entry26.S
··· 20 20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 21 */ 22 22 23 - #include <asm/constants.h> 23 + #include <asm/asm-offsets.h> 24 24 25 25 /* This is the kernel's entry point into the floating point emulator. 26 26 It is called from the kernel with code similar to this:
+1 -1
arch/arm/vfp/entry.S
··· 17 17 */ 18 18 #include <linux/linkage.h> 19 19 #include <linux/init.h> 20 - #include <asm/constants.h> 20 + #include <asm/asm-offsets.h> 21 21 #include <asm/vfpmacros.h> 22 22 23 23 .globl do_vfp