diff options
| author | Linus Torvalds | 2018-08-21 22:18:22 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-08-21 22:18:22 +0200 |
| commit | 5e26830990a9e8816b6854f77c550f1c847d89d8 (patch) | |
| tree | ada88a4d2c241323dbaead5c776cb769805c9b2a /arch/microblaze/Kconfig | |
| parent | Merge tag 'please-pull-noboot' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | microblaze/PCI: Remove stale pcibios_align_resource() comment (diff) | |
| download | kernel-qcow2-linux-5e26830990a9e8816b6854f77c550f1c847d89d8.tar.gz kernel-qcow2-linux-5e26830990a9e8816b6854f77c550f1c847d89d8.tar.xz kernel-qcow2-linux-5e26830990a9e8816b6854f77c550f1c847d89d8.zip | |
Merge tag 'microblaze-v4.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull arch/microblaze updates from Michal Simek:
- use generic noncoherent direct mapping
- use LDFLAGS instead of LD
- pci error path fix
- remove incorrect comments
* tag 'microblaze-v4.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze/PCI: Remove stale pcibios_align_resource() comment
microblaze: delete wrong comment about machine_early_init
microblaze: add endianness options to LDFLAGS instead of LD
microblaze: remove consistent_sync and consistent_sync_page
microblaze: use generic dma_noncoherent_ops
microblaze: warn if of_iomap() failed
Diffstat (limited to 'arch/microblaze/Kconfig')
| -rw-r--r-- | arch/microblaze/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 6163a39ddeb6..ace5c5bf1836 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -2,6 +2,8 @@ config MICROBLAZE def_bool y select ARCH_NO_SWAP select ARCH_HAS_GCOV_PROFILE_ALL + select ARCH_HAS_SYNC_DMA_FOR_CPU + select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_NO_COHERENT_DMA_MMAP if !MMU select ARCH_WANT_IPC_PARSE_VERSION @@ -9,6 +11,8 @@ config MICROBLAZE select TIMER_OF select CLONE_BACKWARDS3 select COMMON_CLK + select DMA_NONCOHERENT_OPS + select DMA_NONCOHERENT_MMAP select GENERIC_ATOMIC64 select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES |