mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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>
This commit is contained in:
parent
96f13045b6
commit
c95fa08a3e
11
Makefile
11
Makefile
|
@ -1070,11 +1070,6 @@ firmware_install: FORCE
|
||||||
export INSTALL_HDR_PATH = $(objtree)/usr
|
export INSTALL_HDR_PATH = $(objtree)/usr
|
||||||
|
|
||||||
hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
|
hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
|
||||||
# Find out where the Kbuild file is located to support
|
|
||||||
# arch/$(ARCH)/include/asm
|
|
||||||
hdr-dir = $(strip \
|
|
||||||
$(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/asm/Kbuild), \
|
|
||||||
arch/$(hdr-arch)/include/asm, include/asm-$(hdr-arch)))
|
|
||||||
|
|
||||||
# If we do an all arch process set dst to asm-$(hdr-arch)
|
# If we do an all arch process set dst to asm-$(hdr-arch)
|
||||||
hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
|
hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
|
||||||
|
@ -1089,10 +1084,10 @@ headers_install_all:
|
||||||
|
|
||||||
PHONY += headers_install
|
PHONY += headers_install
|
||||||
headers_install: __headers
|
headers_install: __headers
|
||||||
$(if $(wildcard $(srctree)/$(hdr-dir)/Kbuild),, \
|
$(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/asm/Kbuild),, \
|
||||||
$(error Headers not exportable for the $(SRCARCH) architecture))
|
$(error Headers not exportable for the $(SRCARCH) architecture))
|
||||||
$(Q)$(MAKE) $(hdr-inst)=include
|
$(Q)$(MAKE) $(hdr-inst)=include
|
||||||
$(Q)$(MAKE) $(hdr-inst)=$(hdr-dir) $(hdr-dst)
|
$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/asm $(hdr-dst)
|
||||||
|
|
||||||
PHONY += headers_check_all
|
PHONY += headers_check_all
|
||||||
headers_check_all: headers_install_all
|
headers_check_all: headers_install_all
|
||||||
|
@ -1101,7 +1096,7 @@ headers_check_all: headers_install_all
|
||||||
PHONY += headers_check
|
PHONY += headers_check
|
||||||
headers_check: headers_install
|
headers_check: headers_install
|
||||||
$(Q)$(MAKE) $(hdr-inst)=include HDRCHECK=1
|
$(Q)$(MAKE) $(hdr-inst)=include HDRCHECK=1
|
||||||
$(Q)$(MAKE) $(hdr-inst)=$(hdr-dir) $(hdr-dst) HDRCHECK=1
|
$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/asm $(hdr-dst) HDRCHECK=1
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Modules
|
# Modules
|
||||||
|
|
|
@ -8,8 +8,6 @@ do_command()
|
||||||
{
|
{
|
||||||
if [ -f ${srctree}/arch/$2/include/asm/Kbuild ]; then
|
if [ -f ${srctree}/arch/$2/include/asm/Kbuild ]; then
|
||||||
make ARCH=$2 KBUILD_HEADERS=$1 headers_$1
|
make ARCH=$2 KBUILD_HEADERS=$1 headers_$1
|
||||||
elif [ -f ${srctree}/include/asm-$2/Kbuild ]; then
|
|
||||||
make ARCH=$2 KBUILD_HEADERS=$1 headers_$1
|
|
||||||
else
|
else
|
||||||
printf "Ignoring arch: %s\n" ${arch}
|
printf "Ignoring arch: %s\n" ${arch}
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue