[PATCH] ARM: Move autogenerated mach-types.h to arch/arm/include/ folder

[Sergio Aguirre]

This shouldn't hurt all the current implementation, and also
makes it congruent with the arm specific include/asm folder.

Signed-off-by: Sergio Aguirre <saaguirre at ti.com>
---
 arch/arm/.gitignore           |    3 +++
 arch/arm/Makefile             |    4 ++--
 arch/arm/tools/Makefile       |    6 ++++--
 arch/arm/tools/gen-mach-types |    2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm/.gitignore

diff --git a/arch/arm/.gitignore b/arch/arm/.gitignore
new file mode 100644
index 0000000..196b239
--- /dev/null
+++ b/arch/arm/.gitignore
@@ -0,0 +1,3 @@
+#Ignore build generated files
+include/asm/mach-types.h
+
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c877d6d..c6e440d 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -234,7 +234,7 @@ archprepare: maketools
 
 PHONY += maketools FORCE
 maketools: include/linux/version.h FORCE
-	$(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h
+	$(Q)$(MAKE) $(build)=arch/arm/tools arch/arm/include/asm/mach-types.h
 
 # Convert bzImage to zImage
 bzImage: zImage
@@ -245,7 +245,7 @@ zImage Image xipImage bootpImage uImage: vmlinux
 zinstall install: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
-CLEAN_FILES += include/asm-arm/mach-types.h \
+CLEAN_FILES += arch/arm/include/asm/mach-types.h \
 	       include/asm-arm/arch include/asm-arm/.arch
 
 # We use MRPROPER_FILES and CLEAN_FILES now
diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile
index 1dbaa29..b7d6f58 100644
--- a/arch/arm/tools/Makefile
+++ b/arch/arm/tools/Makefile
@@ -3,8 +3,10 @@
 #
 # Copyright (C) 2001 Russell King
 #
+# Modified by:
+#   Sergio Aguirre <saaguirre at ti.com>
 
-include/asm-arm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types
-	@echo '  Generating $@'
+arch/arm/include/asm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types
+	@echo '  GEN     $@'
 	@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 ce319ef..ca9be0b 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 arch/arm/include/asm/mach-types.h
 #
 BEGIN	{ nr = 0 }
 /^#/	{ next }
-- 
1.6.4.2