mirror of
https://github.com/torvalds/linux.git
synced 2026-11-06 21:58:01 +01:00
Merge branch 'thermal-intel'
Merge a fix for Intel thermal tests for 7.4-rc1: - Allow cross builds of the Intel thermal tests (Sasha Levin) * thermal-intel: selftests/thermal: allow cross builds of the Intel tests
This commit is contained in:
commit
4358090906
|
|
@ -1,12 +1,10 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
ifndef CROSS_COMPILE
|
||||
ARCH ?= $(shell uname -m 2>/dev/null || echo not)
|
||||
override ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
|
||||
top_srcdir = ../../../../../..
|
||||
include $(top_srcdir)/scripts/subarch.include
|
||||
ARCH_PROCESSED := $(shell echo $(or $(ARCH),$(SUBARCH)) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
|
||||
|
||||
ifeq ($(ARCH),x86)
|
||||
ifeq ($(ARCH_PROCESSED),x86)
|
||||
TEST_GEN_PROGS := power_floor_test
|
||||
endif
|
||||
|
||||
include ../../../lib.mk
|
||||
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
ifndef CROSS_COMPILE
|
||||
ARCH ?= $(shell uname -m 2>/dev/null || echo not)
|
||||
override ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
|
||||
top_srcdir = ../../../../../..
|
||||
include $(top_srcdir)/scripts/subarch.include
|
||||
ARCH_PROCESSED := $(shell echo $(or $(ARCH),$(SUBARCH)) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
|
||||
|
||||
ifeq ($(ARCH),x86)
|
||||
ifeq ($(ARCH_PROCESSED),x86)
|
||||
TEST_GEN_PROGS := workload_hint_test
|
||||
endif
|
||||
|
||||
include ../../../lib.mk
|
||||
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user