diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-05-06 09:14:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-05-06 09:14:19 -0700 |
| commit | 8143672b51ebb43ab59a49e229a232c9575044f0 (patch) | |
| tree | b07b987d1ecab5d6404ceaf322497e714e700076 | |
| parent | 8f121f01adc0df9a446157f74dc1ae37905dbda1 (diff) | |
| parent | 425059d61e7976efa9c780b5b0d5b02939f72e70 (diff) | |
Merge "ARM: remove indirection of asm/mach-types.h"
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/Kbuild | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach-types.h | 1 | ||||
| -rw-r--r-- | arch/arm/tools/Makefile | 16 |
4 files changed, 18 insertions, 3 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8d728d63aea0..9510d77bbf88 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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 diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild index 72e6efb8e910..c44a2d2c2c0e 100644 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild @@ -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 diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h deleted file mode 100644 index 948178cc6ba8..000000000000 --- a/arch/arm/include/asm/mach-types.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/mach-types.h> diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile index 32d05c8219dc..6972f6dbfa21 100644 --- a/arch/arm/tools/Makefile +++ b/arch/arm/tools/Makefile @@ -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; } |