diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 12:41:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 12:41:46 -0400 |
| commit | e989cc564691901d42e957059592fe3e7b6893fc (patch) | |
| tree | b37da743f19bfb4f4142401e39932e1f70c3e34d | |
| parent | 36b150bbcc1125abaad89963420a37ff70686d5a (diff) | |
| parent | 9fa78f63a8921ce37252be34ef8eea2f4bfbb13f (diff) | |
Merge tag 'nios2-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
Pull nios2 update from Ley Foon Tan:
- add order-only DTC dependency to %.dtb target
- fix libgcc location detection
* tag 'nios2-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
nios2: Add order-only DTC dependency to %.dtb target
nios2: Fix libgcc location detection
| -rw-r--r-- | arch/nios2/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile index 2328f82ba2a8..e74afc12d516 100644 --- a/arch/nios2/Makefile +++ b/arch/nios2/Makefile | |||
| @@ -20,7 +20,7 @@ UTS_SYSNAME = Linux | |||
| 20 | 20 | ||
| 21 | export MMU | 21 | export MMU |
| 22 | 22 | ||
| 23 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) | 23 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name) |
| 24 | 24 | ||
| 25 | KBUILD_CFLAGS += -pipe -D__linux__ -D__ELF__ | 25 | KBUILD_CFLAGS += -pipe -D__linux__ -D__ELF__ |
| 26 | KBUILD_CFLAGS += $(if $(CONFIG_NIOS2_HW_MUL_SUPPORT),-mhw-mul,-mno-hw-mul) | 26 | KBUILD_CFLAGS += $(if $(CONFIG_NIOS2_HW_MUL_SUPPORT),-mhw-mul,-mno-hw-mul) |
| @@ -53,7 +53,7 @@ all: vmImage | |||
| 53 | archclean: | 53 | archclean: |
| 54 | $(Q)$(MAKE) $(clean)=$(nios2-boot) | 54 | $(Q)$(MAKE) $(clean)=$(nios2-boot) |
| 55 | 55 | ||
| 56 | %.dtb: | 56 | %.dtb: | scripts |
| 57 | $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@ | 57 | $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@ |
| 58 | 58 | ||
| 59 | dtbs: | 59 | dtbs: |