diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-14 12:56:42 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-14 12:56:42 -1000 |
| commit | eae4f8851f35ceb75f56a861659800c33603a476 (patch) | |
| tree | 92fece55ab53a76c934ef98852b082f5bd201a1a /arch/xtensa/Makefile | |
| parent | 3e153256d9f18b0568fb568958db2d3f83a5365c (diff) | |
| parent | 4a7f50f78c221aac7253ea7059e1986eb622b0e5 (diff) | |
| download | linux-eae4f8851f35ceb75f56a861659800c33603a476.tar.gz linux-eae4f8851f35ceb75f56a861659800c33603a476.tar.bz2 linux-eae4f8851f35ceb75f56a861659800c33603a476.zip | |
Merge tag 'xtensa-20180914' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa fixes and cleanups from Max Filippov:
- don't allocate memory in platform_setup as the memory allocator is
not initialized at that point yet;
- remove unnecessary ifeq KBUILD_SRC from arch/xtensa/Makefile;
- enable SG chaining in arch/xtensa/Kconfig.
* tag 'xtensa-20180914' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: enable SG chaining in Kconfig
xtensa: remove unnecessary KBUILD_SRC ifeq conditional
xtensa: ISS: don't allocate memory in platform_setup
Diffstat (limited to 'arch/xtensa/Makefile')
| -rw-r--r-- | arch/xtensa/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 295c120ed099..d67e30faff9c 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -64,11 +64,7 @@ endif vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y)) plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y)) -ifeq ($(KBUILD_SRC),) -KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(vardirs) $(plfdirs)) -else KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs)) -endif KBUILD_DEFCONFIG := iss_defconfig |