diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-21 08:58:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-21 08:58:00 -0700 |
commit | 6741c4bb389da103c0d79ad1961884628900bfe6 (patch) | |
tree | fd5142b15ad372c8fb67a40a10c33a01722142cf /arch/mips/generic/Platform | |
parent | 5aef268ace7436d8a25d41ee3837ecadb0115917 (diff) | |
parent | 9a3a92ccfe3620743d4ae57c987dc8e9c5f88996 (diff) | |
download | linux-0-day-6741c4bb389da103c0d79ad1961884628900bfe6.tar.gz linux-0-day-6741c4bb389da103c0d79ad1961884628900bfe6.tar.xz |
Merge tag 'mips_fixes_4.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips
Pull MIPS fixes from James Hogan:
- fix build with DEBUG_ZBOOT and MACH_JZ4770 (4.16)
- include xilfpga FDT in fitImage and stop generating dtb.o (4.15)
- fix software IO coherence on CM SMP systems (4.8)
- ptrace: Fix PEEKUSR/POKEUSR to o32 FGRs (3.14)
- ptrace: Expose FIR register through FP regset (3.13)
- fix typo in KVM debugfs file name (3.10)
* tag 'mips_fixes_4.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
MIPS: Fix ptrace(2) PTRACE_PEEKUSR and PTRACE_POKEUSR accesses to o32 FGRs
MIPS: xilfpga: Actually include FDT in fitImage
MIPS: xilfpga: Stop generating useless dtb.o
KVM: Fix spelling mistake: "cop_unsuable" -> "cop_unusable"
MIPS: ptrace: Expose FIR register through FP regset
MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770
MIPS: c-r4k: Fix data corruption related to cache coherence
Diffstat (limited to 'arch/mips/generic/Platform')
-rw-r--r-- | arch/mips/generic/Platform | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform index b51432dd10b6f..0dd0d5d460a5f 100644 --- a/arch/mips/generic/Platform +++ b/arch/mips/generic/Platform @@ -16,3 +16,4 @@ all-$(CONFIG_MIPS_GENERIC) := vmlinux.gz.itb its-y := vmlinux.its.S its-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += board-boston.its.S its-$(CONFIG_FIT_IMAGE_FDT_NI169445) += board-ni169445.its.S +its-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += board-xilfpga.its.S |