Messages in this thread Patch in this message | | | Date | Sat, 18 Apr 2009 21:55:21 +0200 | From | Sam Ravnborg <> | Subject | [PATCH v2] arm: use include/gen for mach-types.h |
| |
mach-types.h is a generated file. As we no longer has a .gitignore file in asm-arm the risk that somebody by accident commit mach-types.h is big.
Avoid this by the introduction of include/generated/ to hold this (and soon other) generated files.
The patch includes two small cleanups to arch/arm/Makefile. 1) delete stale comment 2) combine two targets in one line and drop unused prerequisite
The idea to introduce include/generated/ is originally from Al Viro.
This is the first user of include/generated and therefore this patch include changes in top-level Makefile and top-level .gitignore to support include/generated
Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Al Viro <viro@ZenIV.linux.org.uk> ---
This patch addresses comments by Al and Linus: - use include/generated/ - just ignore all of include/generated - remove include/generated directory in make mrproper
Sam
diff --git a/.gitignore b/.gitignore index 869e1a3..51bd99d 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,7 @@ include/linux/compile.h include/linux/version.h include/linux/utsrelease.h include/linux/bounds.h +include/generated # stgit generated dirs patches-* diff --git a/Makefile b/Makefile index bfdef56..6f4208f 100644 --- a/Makefile +++ b/Makefile @@ -1200,7 +1200,7 @@ CLEAN_FILES += vmlinux System.map \ .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map # Directories & files removed with 'make mrproper' -MRPROPER_DIRS += include/config include2 usr/include +MRPROPER_DIRS += include/config include2 usr/include include/generated MRPROPER_FILES += .config .config.old include/asm .version .old_version \ include/linux/autoconf.h include/linux/version.h \ include/linux/utsrelease.h \ diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e84729b..1bedda1 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -214,15 +214,9 @@ all: $(KBUILD_IMAGE) boot := arch/arm/boot -# Update machine arch and proc symlinks if something which affects -# them changed. We use .arch to indicate when they were updated -# 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 +archprepare maketools: + $(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h # Convert bzImage to zImage bzImage: zImage @@ -233,9 +227,6 @@ zImage Image xipImage bootpImage uImage: vmlinux zinstall install: vmlinux $(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 archclean: $(Q)$(MAKE) $(clean)=$(boot) diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h new file mode 100644 index 0000000..b44d1a1 --- /dev/null +++ b/arch/arm/include/asm/mach-types.h @@ -0,0 +1,4 @@ +# mach-types is the list of machine types supported by arm +# This file allow us to use: <asm/mach-types.h> when including mach-types + +#include <generated/mach-types.h> diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile index 1dbaa29..635cb18 100644 --- a/arch/arm/tools/Makefile +++ b/arch/arm/tools/Makefile @@ -4,7 +4,7 @@ # 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 $@' @mkdir -p $(dir $@) $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
| |