From: Sam Ravnborg <sam@ravnborg.org>
To: Russell King <rmk+lkml@arm.linux.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
takata@linux-m32r.org, Christoph Hellwig <hch@lst.de>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
linux-kernel@vger.kernel.org
Subject: [PATCH] arm: use include/gen for mach-types.h
Date: Sat, 18 Apr 2009 20:17:14 +0200 [thread overview]
Message-ID: <20090418181714.GA25786@uranus.ravnborg.org> (raw)
In-Reply-To: <20090418101444.GA9768@flint.arm.linux.org.uk>
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/gen/ 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/gen/ is originally from Al Viro.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
---
Hi Russell.
This patch is _not_ tested - as I have yet to get the
arm toolchain operational.
But it looks trivial correct.
Please consider applying.
Sam
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e84729b..b50dfa0 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/gen/mach-types.h
# Convert bzImage to zImage
bzImage: zImage
@@ -233,8 +227,7 @@ 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
+CLEAN_FILES += include/gen/mach-types.h
# We use MRPROPER_FILES and CLEAN_FILES now
archclean:
diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h
new file mode 100644
index 0000000..e6fcab7
--- /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
+
+#incude <gen/mach-types.h>
diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile
index 1dbaa29..63a6aae 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/gen/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/include/gen/.gitignore b/include/gen/.gitignore
new file mode 100644
index 0000000..1e809fd
--- /dev/null
+++ b/include/gen/.gitignore
@@ -0,0 +1,2 @@
+# mach-types.h is used by arm
+mach-types.h
next prev parent reply other threads:[~2009-04-18 18:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-16 15:07 last remaining asm/ header moves: h8300 and m32r Christoph Hellwig
2009-04-16 16:40 ` Sam Ravnborg
2009-04-17 2:23 ` [GIT PULL] m32r: move include/asm-m32r to arch/m32r/include/asm takata
2009-04-17 17:37 ` Linus Torvalds
2009-04-17 22:14 ` Sam Ravnborg
2009-04-18 10:14 ` Russell King
2009-04-18 18:17 ` Sam Ravnborg [this message]
2009-04-18 18:52 ` [PATCH] arm: use include/gen for mach-types.h Al Viro
2009-04-18 19:28 ` Linus Torvalds
2009-04-18 19:55 ` [PATCH v2] " Sam Ravnborg
2009-04-18 20:53 ` [PATCH] " Al Viro
2009-04-16 16:49 ` last remaining asm/ header moves: h8300 and m32r Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090418181714.GA25786@uranus.ravnborg.org \
--to=sam@ravnborg.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+lkml@arm.linux.org.uk \
--cc=takata@linux-m32r.org \
--cc=torvalds@linux-foundation.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox