Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 425059d6 authored by Russell King's avatar Russell King Committed by Gerrit - the friendly Code Review server
Browse files

ARM: remove indirection of asm/mach-types.h 



Arrange for mach-types.h to be directly generated in the relevant
path, so we don't need a one-liner file in arch/arm/include/asm/.

Change-Id: I4693b7279625fdcbf5d99902af40968414fc998a
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Git-Commit: 4e2648db9c5f7b2281551694597102612f54460d
Git-Repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[schikk@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: default avatarSwetha Chikkaboraiah <schikk@codeaurora.org>
parent 17d11a84

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ all: $(KBUILD_IMAGE) $(KBUILD_DTBS) 
boot := arch/arm/boot



archprepare:

	$(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h

	$(Q)$(MAKE) $(build)=arch/arm/tools kapi



# Convert bzImage to zImage

bzImage: zImage

arch/arm/include/asm/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -37,3 +37,5 @@ generic-y += termbits.h 
generic-y += termios.h

generic-y += timex.h

generic-y += trace_clock.h



generated-y += mach-types.h

arch/arm/include/asm/mach-types.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <generated/mach-types.h>

arch/arm/tools/Makefile

+15 −1
Original line number Diff line number Diff line
@@ -4,7 +4,21 @@ 
# Copyright (C) 2001 Russell King

#



include/generated/mach-types.h: $(src)/gen-mach-types $(src)/mach-types

gen := arch/$(ARCH)/include/generated

kapi := $(gen)/asm



kapi-hdrs-y := $(kapi)/mach-types.h



targets += $(addprefix ../../../,$(kapi-hdrs-y))



PHONY += kapi



kapi:	$(kapi-hdrs-y)



# Create output directory if not already present

_dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')



$(kapi)/mach-types.h: $(src)/gen-mach-types $(src)/mach-types

	@$(kecho) '  Generating $@'

	@mkdir -p $(dir $@)

	$(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }