diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2009-04-20 19:59:58 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2009-12-12 13:08:14 +0100 |
| commit | 66206536fe56e889a8bd86ab5742fc76c78c5b4a (patch) | |
| tree | b290b0dd04c8d2bcc8c7edbeef7a49ebeed357db | |
| parent | 4929d29c0dffd5fdc2df987254366c2e25c392d4 (diff) | |
| download | linux-3.10-66206536fe56e889a8bd86ab5742fc76c78c5b4a.tar.gz linux-3.10-66206536fe56e889a8bd86ab5742fc76c78c5b4a.tar.bz2 linux-3.10-66206536fe56e889a8bd86ab5742fc76c78c5b4a.zip | |
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>
| -rw-r--r-- | arch/arm/Makefile | 14 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach-types.h | 1 | ||||
| -rw-r--r-- | arch/arm/tools/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/tools/gen-mach-types | 2 |
4 files changed, 5 insertions, 14 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index fa0cdab2e1d..e9da08483b3 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -242,15 +242,8 @@ 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: + $(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h # Convert bzImage to zImage bzImage: zImage @@ -261,9 +254,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 00000000000..948178cc6ba --- /dev/null +++ b/arch/arm/include/asm/mach-types.h @@ -0,0 +1 @@ +#include <generated/mach-types.h> diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile index 1dbaa29ac4d..635cb1865e4 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; } diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types index ce319ef64bc..04fef71d7be 100644 --- a/arch/arm/tools/gen-mach-types +++ b/arch/arm/tools/gen-mach-types @@ -1,6 +1,6 @@ #!/bin/awk # -# Awk script to generate include/asm-arm/mach-types.h +# Awk script to generate include/generated/mach-types.h # BEGIN { nr = 0 } /^#/ { next } |