openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm: move mach-types to include/generated 

Simplified arch/arm/Makefile by dropping the maketools target
It was undocumented and not needed

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Sam Ravnborg 2009-04-20 19:59:58 +02:00 committed by Michal Marek
parent 4929d29c0d
commit 66206536fe
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/Makefile
View File

@ -242,15 +242,8 @@ all: $(KBUILD_IMAGE)
boot := arch/arm/boot boot := arch/arm/boot
# Update machine arch and proc symlinks if something which affects archprepare:
# them changed. We use .arch to indicate when they were updated $(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h
# last, otherwise make uses the target directory mtime.
archprepare: maketools
PHONY += maketools FORCE
maketools: include/linux/version.h FORCE
$(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h
# Convert bzImage to zImage # Convert bzImage to zImage
bzImage: zImage bzImage: zImage
@ -261,9 +254,6 @@ zImage Image xipImage bootpImage uImage: vmlinux
zinstall install: vmlinux zinstall install: vmlinux
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
CLEAN_FILES += include/asm-arm/mach-types.h \
include/asm-arm/arch include/asm-arm/.arch
# We use MRPROPER_FILES and CLEAN_FILES now # We use MRPROPER_FILES and CLEAN_FILES now
archclean: archclean:
$(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=$(boot)

1
arch/arm/include/asm/mach-types.h Normal file
View File

@ -0,0 +1 @@
#include <generated/mach-types.h>

2
arch/arm/tools/Makefile
View File

@ -4,7 +4,7 @@
# Copyright (C) 2001 Russell King # Copyright (C) 2001 Russell King
# #
include/asm-arm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types include/generated/mach-types.h: $(src)/gen-mach-types $(src)/mach-types
@echo ' Generating $@' @echo ' Generating $@'
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }

2
arch/arm/tools/gen-mach-types
View File

@ -1,6 +1,6 @@
#!/bin/awk #!/bin/awk
# #
# Awk script to generate include/asm-arm/mach-types.h # Awk script to generate include/generated/mach-types.h
# #
BEGIN { nr = 0 } BEGIN { nr = 0 }
/^#/ { next } /^#/ { next }