Skip to content

Commit

Permalink
arm: move mach-types to include/generated
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sam Ravnborg authored and Michal Marek committed Dec 12, 2009
1 parent 4929d29 commit 6620653
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 14 deletions.
14 changes: 2 additions & 12 deletions arch/arm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions arch/arm/include/asm/mach-types.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/mach-types.h>
2 changes: 1 addition & 1 deletion arch/arm/tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
2 changes: 1 addition & 1 deletion arch/arm/tools/gen-mach-types
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down

0 comments on commit 6620653

Please sign in to comment.