diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-06 19:56:53 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-06 19:56:53 +0300 |
| commit | 9f57c13f7ed70a94ecc135645bc764efdd378acd (patch) | |
| tree | eb1f4b7c9fbfd228c38d00e42914f1871371e0bd /arch/riscv | |
| parent | 0b907305022beb1a4cf5b9f6d776483a2356c841 (diff) | |
| parent | 6722e46513e0af8e2fff4698f7cb78bc50a9f13f (diff) | |
| download | linux-9f57c13f7ed70a94ecc135645bc764efdd378acd.tar.xz | |
Merge tag 'soc-fixes-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann:
"There are three small fixes that came up sincie the past week:
- an incorrect bit offset in ixp4xx bus driver
- a riscv randconfig regression in the thead platform I merged
- whitespace fixes for some dts files"
* tag 'soc-fixes-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
bus: ixp4xx: fix IXP4XX_EXP_T1_MASK
ARM: dts: st: add missing space before {
RISC-V: make ARCH_THEAD preclude XIP_KERNEL
Diffstat (limited to 'arch/riscv')
| -rw-r--r-- | arch/riscv/Kconfig.socs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index ce10a38dff37..6833d01e2e70 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -43,6 +43,7 @@ config ARCH_SUNXI config ARCH_THEAD bool "T-HEAD RISC-V SoCs" + depends on MMU && !XIP_KERNEL select ERRATA_THEAD help This enables support for the RISC-V based T-HEAD SoCs. |