arm: move mach-types to include/generated (66206536) · Commits · 戴 / test

arch/arm/Makefile

+2 −12

Original line number	Diff line number	Diff line
		@@ -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)

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		#include <generated/mach-types.h>

+1 −1

Original line number	Diff line number	Diff line
		@@ -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; }

+1 −1

Original line number	Diff line number	Diff line
		#!/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 }