diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-21 10:35:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-21 10:35:11 -0800 |
| commit | 8552d28e140110fc935b39a6bfaf33c8ce3a1ad5 (patch) | |
| tree | 8102bc58bb5be253a7df0993d8d06a128cbc125e /arch/m68k/Kconfig.machine | |
| parent | 70990afa34fbac03ade78e2ad0ccd418acecfc04 (diff) | |
| parent | 8b22820efb35f93d98638563b0a8f4094e8ee399 (diff) | |
| download | lwn-8552d28e140110fc935b39a6bfaf33c8ce3a1ad5.tar.gz lwn-8552d28e140110fc935b39a6bfaf33c8ce3a1ad5.zip | |
Merge tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
- cleanup of 68328 code
- align BSS section to 32bit
* tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: m68328: remove duplicate code
m68k: m68328: move platform code to separate files
m68knommu: align BSS section to 4-byte boundaries
Diffstat (limited to 'arch/m68k/Kconfig.machine')
| -rw-r--r-- | arch/m68k/Kconfig.machine | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine index cf6961d4e657..4d59ec2f5b8d 100644 --- a/arch/m68k/Kconfig.machine +++ b/arch/m68k/Kconfig.machine @@ -145,14 +145,13 @@ config SUN3 If you don't want to compile a kernel exclusively for a Sun 3, say N. -endif # M68KCLASSIC - config PILOT bool config PILOT3 bool "Pilot 1000/5000, PalmPilot Personal/Pro, or PalmIII support" - depends on M68328 + depends on !MMU + select M68328 select PILOT help Support for the Palm Pilot 1000/5000, Personal/Pro and PalmIII. @@ -165,19 +164,22 @@ config XCOPILOT_BUGS config UCSIMM bool "uCsimm module support" - depends on M68EZ328 + depends on !MMU + select M68EZ328 help Support for the Arcturus Networks uCsimm module. config UCDIMM bool "uDsimm module support" - depends on M68VZ328 + depends on !MMU + select M68VZ328 help Support for the Arcturus Networks uDsimm module. config DRAGEN2 bool "DragenEngine II board support" - depends on M68VZ328 + depends on !MMU + select M68VZ328 help Support for the DragenEngine II board. @@ -200,6 +202,8 @@ config MEMORY_RESERVE help Reserve certain memory regions on 68x328 based boards. +endif # M68KCLASSIC + config ARN5206 bool "Arnewsh 5206 board support" depends on M5206 |