Commit c95fa08a3e17c3f2983c4cbf409f5c9ae47b7dec
Committed by
Michal Marek
1 parent
96f13045b6
Exists in
master
and in
7 other branches
kbuild: do not check for include/asm-$ARCH
No architectures uses include/asm-$ARCH now. So drop check for location of include files Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
Showing 2 changed files with 3 additions and 10 deletions Side-by-side Diff
Makefile
... | ... | @@ -1070,11 +1070,6 @@ |
1070 | 1070 | export INSTALL_HDR_PATH = $(objtree)/usr |
1071 | 1071 | |
1072 | 1072 | hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj |
1073 | -# Find out where the Kbuild file is located to support | |
1074 | -# arch/$(ARCH)/include/asm | |
1075 | -hdr-dir = $(strip \ | |
1076 | - $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/asm/Kbuild), \ | |
1077 | - arch/$(hdr-arch)/include/asm, include/asm-$(hdr-arch))) | |
1078 | 1073 | |
1079 | 1074 | # If we do an all arch process set dst to asm-$(hdr-arch) |
1080 | 1075 | hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) |
1081 | 1076 | |
... | ... | @@ -1089,10 +1084,10 @@ |
1089 | 1084 | |
1090 | 1085 | PHONY += headers_install |
1091 | 1086 | headers_install: __headers |
1092 | - $(if $(wildcard $(srctree)/$(hdr-dir)/Kbuild),, \ | |
1087 | + $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/asm/Kbuild),, \ | |
1093 | 1088 | $(error Headers not exportable for the $(SRCARCH) architecture)) |
1094 | 1089 | $(Q)$(MAKE) $(hdr-inst)=include |
1095 | - $(Q)$(MAKE) $(hdr-inst)=$(hdr-dir) $(hdr-dst) | |
1090 | + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/asm $(hdr-dst) | |
1096 | 1091 | |
1097 | 1092 | PHONY += headers_check_all |
1098 | 1093 | headers_check_all: headers_install_all |
... | ... | @@ -1101,7 +1096,7 @@ |
1101 | 1096 | PHONY += headers_check |
1102 | 1097 | headers_check: headers_install |
1103 | 1098 | $(Q)$(MAKE) $(hdr-inst)=include HDRCHECK=1 |
1104 | - $(Q)$(MAKE) $(hdr-inst)=$(hdr-dir) $(hdr-dst) HDRCHECK=1 | |
1099 | + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/asm $(hdr-dst) HDRCHECK=1 | |
1105 | 1100 | |
1106 | 1101 | # --------------------------------------------------------------------------- |
1107 | 1102 | # Modules |
scripts/headers.sh
... | ... | @@ -8,8 +8,6 @@ |
8 | 8 | { |
9 | 9 | if [ -f ${srctree}/arch/$2/include/asm/Kbuild ]; then |
10 | 10 | make ARCH=$2 KBUILD_HEADERS=$1 headers_$1 |
11 | - elif [ -f ${srctree}/include/asm-$2/Kbuild ]; then | |
12 | - make ARCH=$2 KBUILD_HEADERS=$1 headers_$1 | |
13 | 11 | else |
14 | 12 | printf "Ignoring arch: %s\n" ${arch} |
15 | 13 | fi |