diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-02 13:12:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-02 13:12:44 -0700 |
| commit | b5d6d2633c1b6b2b4599f658f8abe7eb1358cc77 (patch) | |
| tree | a13e810a83a46c9658ccac0369c8b27363f17ad2 /arch/xtensa/Makefile | |
| parent | aa829778b16f15266fefe2640f04931b16ce39c0 (diff) | |
| parent | 7b7cec477fc3cd42ce565dfc3e53f144504fc95c (diff) | |
| download | linux-b5d6d2633c1b6b2b4599f658f8abe7eb1358cc77.tar.bz2 | |
Merge tag 'xtensa-20210902' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa updates from Max Filippov:
- fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG
- add fairness to handling IRQs of the same priority
- fix pointer usage before NULL check in ISS console driver
- build system cleanups
* tag 'xtensa-20210902' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: move core-y in arch/xtensa/Makefile to arch/xtensa/Kbuild
xtensa: build platform directories unconditionally
xtensa: do not build variants directory
xtensa: remove unneeded exports
xtensa: ISS: don't use string pointer before NULL check
xtensa: add fairness to IRQ handling
xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG
Diffstat (limited to 'arch/xtensa/Makefile')
| -rw-r--r-- | arch/xtensa/Makefile | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index e9c8f064c44d..96714ef7c89e 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -17,7 +17,6 @@ variant-y := $(patsubst "%",%,$(CONFIG_XTENSA_VARIANT_NAME)) VARIANT = $(variant-y) -export VARIANT ifneq ($(VARIANT),) ifdef cross_compiling @@ -33,9 +32,6 @@ platform-$(CONFIG_XTENSA_PLATFORM_XT2000) := xt2000 platform-$(CONFIG_XTENSA_PLATFORM_ISS) := iss platform-$(CONFIG_XTENSA_PLATFORM_XTFPGA) := xtfpga -PLATFORM = $(platform-y) -export PLATFORM - # temporarily until string.h is fixed KBUILD_CFLAGS += -ffreestanding -D__linux__ KBUILD_CFLAGS += -pipe -mlongcalls -mtext-section-literals @@ -57,19 +53,11 @@ KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs)) KBUILD_DEFCONFIG := iss_defconfig -# Only build variant and/or platform if it includes a Makefile - -buildvar := $(shell test -e $(srctree)/arch/xtensa/variants/$(VARIANT)/Makefile && echo arch/xtensa/variants/$(VARIANT)/) -buildplf := $(shell test -e $(srctree)/arch/xtensa/platforms/$(PLATFORM)/Makefile && echo arch/xtensa/platforms/$(PLATFORM)/) - # Find libgcc.a LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) head-y := arch/xtensa/kernel/head.o -core-y += arch/xtensa/kernel/ arch/xtensa/mm/ -core-y += $(buildvar) $(buildplf) -core-y += arch/xtensa/boot/dts/ libs-y += arch/xtensa/lib/ $(LIBGCC) |