Skip to content

Commit 34fdd22

Browse files
torvaldstorvalds
committed
Merge tag 'm68knommu-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer: "Just a couple of changes. Fixes to compilation of the old/legacy Freescale 68328 targets in some kernel configurations, and some default configuration updates. Summary: - fix build problems for legacy 68328 targets - clean out configs of removed options" * tag 'm68knommu-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: update config files m68knommu: fix non-mmu classic 68000 legacy timer tick selection m68knommu: fix non-specific 68328 choice interrupt build failure
2 parents 8aeab13 + 404b757 commit 34fdd22

File tree

9 files changed

+4
-28
lines changed

9 files changed

+4
-28
lines changed

‎arch/m68k/68000/ints.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
#include <asm/io.h>
1919
#include <asm/machdep.h>
2020

21-
#if defined(CONFIG_M68328)
22-
#include <asm/MC68328.h>
23-
#elif defined(CONFIG_M68EZ328)
21+
#if defined(CONFIG_M68EZ328)
2422
#include <asm/MC68EZ328.h>
2523
#elif defined(CONFIG_M68VZ328)
2624
#include <asm/MC68VZ328.h>
25+
#else
26+
#include <asm/MC68328.h>
2727
#endif
2828

2929
/* assembler routines */

‎arch/m68k/Kconfig.cpu

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ config M68000
4646
select GENERIC_CSUM
4747
select CPU_NO_EFFICIENT_FFS
4848
select HAVE_ARCH_HASH
49+
select LEGACY_TIMER_TICK
4950
help
5051
The Freescale (was Motorola) 68000 CPU is the first generation of
5152
the well known M68K family of processors. The CPU core as well as
@@ -97,23 +98,20 @@ config M68060
9798
config M68328
9899
bool
99100
depends on !MMU
100-
select LEGACY_TIMER_TICK
101101
select M68000
102102
help
103103
Motorola 68328 processor support.
104104

105105
config M68EZ328
106106
bool
107107
depends on !MMU
108-
select LEGACY_TIMER_TICK
109108
select M68000
110109
help
111110
Motorola 68EX328 processor support.
112111

113112
config M68VZ328
114113
bool
115114
depends on !MMU
116-
select LEGACY_TIMER_TICK
117115
select M68000
118116
help
119117
Motorola 68VZ328 processor support.

‎arch/m68k/configs/amcore_defconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ CONFIG_PACKET=y
2727
CONFIG_UNIX=y
2828
CONFIG_INET=y
2929
CONFIG_SYN_COOKIES=y
30-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
31-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
32-
# CONFIG_INET_XFRM_MODE_BEET is not set
3330
# CONFIG_IPV6 is not set
3431
# CONFIG_WIRELESS is not set
3532
# CONFIG_UEVENT_HELPER is not set
@@ -85,7 +82,6 @@ CONFIG_ROMFS_FS=y
8582
CONFIG_ROMFS_BACKED_BY_BOTH=y
8683
# CONFIG_NETWORK_FILESYSTEMS is not set
8784
CONFIG_PRINTK_TIME=y
88-
# CONFIG_ENABLE_MUST_CHECK is not set
8985
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
9086
CONFIG_PANIC_ON_OOPS=y
9187
# CONFIG_SCHED_DEBUG is not set

‎arch/m68k/configs/m5208evb_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ CONFIG_NET=y
2121
CONFIG_PACKET=y
2222
CONFIG_UNIX=y
2323
CONFIG_INET=y
24-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
25-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
26-
# CONFIG_INET_XFRM_MODE_BEET is not set
2724
# CONFIG_INET_DIAG is not set
2825
# CONFIG_IPV6 is not set
2926
# CONFIG_FW_LOADER is not set

‎arch/m68k/configs/m5249evb_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ CONFIG_NET=y
2222
CONFIG_PACKET=y
2323
CONFIG_UNIX=y
2424
CONFIG_INET=y
25-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
26-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
27-
# CONFIG_INET_XFRM_MODE_BEET is not set
2825
# CONFIG_INET_DIAG is not set
2926
# CONFIG_IPV6 is not set
3027
# CONFIG_FW_LOADER is not set

‎arch/m68k/configs/m5272c3_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ CONFIG_NET=y
2222
CONFIG_PACKET=y
2323
CONFIG_UNIX=y
2424
CONFIG_INET=y
25-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
26-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
27-
# CONFIG_INET_XFRM_MODE_BEET is not set
2825
# CONFIG_INET_DIAG is not set
2926
# CONFIG_IPV6 is not set
3027
# CONFIG_FW_LOADER is not set

‎arch/m68k/configs/m5275evb_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ CONFIG_NET=y
2222
CONFIG_PACKET=y
2323
CONFIG_UNIX=y
2424
CONFIG_INET=y
25-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
26-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
27-
# CONFIG_INET_XFRM_MODE_BEET is not set
2825
# CONFIG_INET_DIAG is not set
2926
# CONFIG_IPV6 is not set
3027
# CONFIG_FW_LOADER is not set

‎arch/m68k/configs/m5307c3_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ CONFIG_NET=y
2222
CONFIG_PACKET=y
2323
CONFIG_UNIX=y
2424
CONFIG_INET=y
25-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
26-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
27-
# CONFIG_INET_XFRM_MODE_BEET is not set
2825
# CONFIG_INET_DIAG is not set
2926
# CONFIG_IPV6 is not set
3027
# CONFIG_FW_LOADER is not set

‎arch/m68k/configs/m5407c3_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ CONFIG_NET=y
2323
CONFIG_PACKET=y
2424
CONFIG_UNIX=y
2525
CONFIG_INET=y
26-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
27-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
28-
# CONFIG_INET_XFRM_MODE_BEET is not set
2926
# CONFIG_INET_DIAG is not set
3027
# CONFIG_IPV6 is not set
3128
# CONFIG_FW_LOADER is not set

0 commit comments

Comments
 (0)