Commit e6ae744d authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

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: default avatarSam Ravnborg <sam@ravnborg.org>
parent 0013a854

arch/arm/Makefile

+2 −7
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ endif 
prepare: maketools include/asm-arm/.arch



.PHONY: maketools FORCE

maketools: include/asm-arm/constants.h include/linux/version.h FORCE

maketools: include/linux/version.h FORCE

	$(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h



# Convert bzImage to zImage
@@ -190,7 +190,7 @@ zImage Image xipImage bootpImage uImage: vmlinux 
zinstall install: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@



CLEAN_FILES += include/asm-arm/constants.h* include/asm-arm/mach-types.h \

CLEAN_FILES += include/asm-arm/mach-types.h \

	       include/asm-arm/arch include/asm-arm/.arch



# We use MRPROPER_FILES and CLEAN_FILES now
@@ -201,11 +201,6 @@ archclean: 
bp:;	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage

i zi:;	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@



arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \

				   include/asm-arm/.arch



include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.s

	$(call filechk,gen-asm-offsets)



define archhelp

  echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'

arch/arm/kernel/entry-header.S

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <linux/linkage.h>



#include <asm/assembler.h>

#include <asm/constants.h>

#include <asm/asm-offsets.h>

#include <asm/errno.h>

#include <asm/thread_info.h>

arch/arm/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/mach-types.h>

#include <asm/procinfo.h>

#include <asm/ptrace.h>

#include <asm/constants.h>

#include <asm/asm-offsets.h>

#include <asm/thread_info.h>

#include <asm/system.h>

arch/arm/kernel/iwmmxt.S

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/linkage.h>

#include <asm/ptrace.h>

#include <asm/thread_info.h>

#include <asm/constants.h>

#include <asm/asm-offsets.h>



#define MMX_WR0		 	(0x00)

#define MMX_WR1		 	(0x08)

arch/arm/lib/copy_page.S

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 */

#include <linux/linkage.h>

#include <asm/assembler.h>

#include <asm/constants.h>

#include <asm/asm-offsets.h>



#define COPY_COUNT (PAGE_SZ/64 PLD( -1 ))