diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-05 09:23:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-05 09:23:08 -0800 |
| commit | 7111fa1151e3c66cde3a94250bda72d7144419ff (patch) | |
| tree | 7504c625e0c4d79a9e417656be3485950e2ff513 /tools | |
| parent | Linux 5.4-rc6 (diff) | |
| parent | Revert "gpio: merrifield: Pass irqchip when adding gpiochip" (diff) | |
| download | linux-dev-7111fa1151e3c66cde3a94250bda72d7144419ff.tar.xz linux-dev-7111fa1151e3c66cde3a94250bda72d7144419ff.zip | |
Merge tag 'gpio-v5.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO fixes from Linus Walleij:
"More GPIO fixes! We found a late regression in the Intel Merrifield
driver. Oh well. We fixed it up.
- Fix a build error in the tools used for kselftest
- A series of reverts to bring the Intel Merrifield back to working.
We will likely unrevert the reverts for v5.5 but we can't have v5.4
broken"
* tag 'gpio-v5.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
Revert "gpio: merrifield: Pass irqchip when adding gpiochip"
Revert "gpio: merrifield: Restore use of irq_base"
Revert "gpio: merrifield: Move hardware initialization to callback"
tools: gpio: Use !building_out_of_srctree to determine srctree
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpio/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/gpio/Makefile b/tools/gpio/Makefile index 6ecdd1067826..1178d302757e 100644 --- a/tools/gpio/Makefile +++ b/tools/gpio/Makefile @@ -3,7 +3,11 @@ include ../scripts/Makefile.include bindir ?= /usr/bin -ifeq ($(srctree),) +# This will work when gpio is built in tools env. where srctree +# isn't set and when invoked from selftests build, where srctree +# is set to ".". building_out_of_srctree is undefined for in srctree +# builds +ifndef building_out_of_srctree srctree := $(patsubst %/,%,$(dir $(CURDIR))) srctree := $(patsubst %/,%,$(dir $(srctree))) endif |