Skip to content

Commit f85c712

Browse files
torvaldstorvalds
committed
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu/coldfire fixes from Greg Ungerer: "Contains build fixes and updates for the ColdFire defconfigs. Specifically there is a couple of fixes that address problems building allnoconfig. Also fix for enabling PCI bus on the M54xx family of ColdFire" * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: enable PCI support for m5475evb defconfig m68k: fix io functions for ColdFire/MMU/PCI case m68knommu: update defconfig for ColdFire m5475evb m68knommu: update defconfig for ColdFire m5407c3 m68knommu: update defconfig for ColdFire m5307c3 m68knommu: update defconfig for ColdFire m5275evb m68knommu: update defconfig for ColdFire m5272c3 m68knommu: update defconfig for ColdFire m5249evb m68knommu: update defconfig for m5208evb m68knommu: make ColdFire SoC selection a choice m68knommu: improve the clock configuration defaults m68knommu: force setting of CONFIG_CLOCK_FREQ for ColdFire
2 parents 761ab76 + 67592f6 commit f85c712

File tree

10 files changed

+45
-128
lines changed

10 files changed

+45
-128
lines changed

‎arch/m68k/Kconfig.cpu

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,13 @@ endif # M68KCLASSIC
125125

126126
if COLDFIRE
127127

128+
choice
129+
prompt "ColdFire SoC type"
130+
default M520x
131+
help
132+
Select the type of ColdFire System-on-Chip (SoC) that you want
133+
to build for.
134+
128135
config M5206
129136
bool "MCF5206"
130137
depends on !MMU
@@ -174,9 +181,6 @@ config M525x
174181
help
175182
Freescale (Motorola) Coldfire 5251/5253 processor support.
176183

177-
config M527x
178-
bool
179-
180184
config M5271
181185
bool "MCF5271"
182186
depends on !MMU
@@ -223,9 +227,6 @@ config M5307
223227
help
224228
Motorola ColdFire 5307 processor support.
225229

226-
config M53xx
227-
bool
228-
229230
config M532x
230231
bool "MCF532x"
231232
depends on !MMU
@@ -251,9 +252,6 @@ config M5407
251252
help
252253
Motorola ColdFire 5407 processor support.
253254

254-
config M54xx
255-
bool
256-
257255
config M547x
258256
bool "MCF547x"
259257
select M54xx
@@ -280,6 +278,17 @@ config M5441x
280278
help
281279
Freescale Coldfire 54410/54415/54416/54417/54418 processor support.
282280

281+
endchoice
282+
283+
config M527x
284+
bool
285+
286+
config M53xx
287+
bool
288+
289+
config M54xx
290+
bool
291+
283292
endif # COLDFIRE
284293

285294

@@ -416,22 +425,18 @@ config HAVE_MBAR
416425
config HAVE_IPSBAR
417426
bool
418427

419-
config CLOCK_SET
420-
bool "Enable setting the CPU clock frequency"
421-
depends on COLDFIRE
422-
default n
423-
help
424-
On some CPU's you do not need to know what the core CPU clock
425-
frequency is. On these you can disable clock setting. On some
426-
traditional 68K parts, and on all ColdFire parts you need to set
427-
the appropriate CPU clock frequency. On these devices many of the
428-
onboard peripherals derive their timing from the master CPU clock
429-
frequency.
430-
431428
config CLOCK_FREQ
432429
int "Set the core clock frequency"
430+
default "25000000" if M5206
431+
default "54000000" if M5206e
432+
default "166666666" if M520x
433+
default "140000000" if M5249
434+
default "150000000" if M527x || M523x
435+
default "90000000" if M5307
436+
default "50000000" if M5407
437+
default "266000000" if M54xx
433438
default "66666666"
434-
depends on CLOCK_SET
439+
depends on COLDFIRE
435440
help
436441
Define the CPU clock frequency in use. This is the core clock
437442
frequency, it may or may not be the same as the external clock

‎arch/m68k/configs/m5208evb_defconfig

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
# CONFIG_MMU is not set
2-
CONFIG_EXPERIMENTAL=y
31
CONFIG_LOG_BUF_SHIFT=14
4-
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
52
CONFIG_EXPERT=y
63
# CONFIG_KALLSYMS is not set
7-
# CONFIG_HOTPLUG is not set
84
# CONFIG_FUTEX is not set
95
# CONFIG_EPOLL is not set
106
# CONFIG_SIGNALFD is not set
@@ -16,17 +12,12 @@ CONFIG_EXPERT=y
1612
# CONFIG_BLK_DEV_BSG is not set
1713
# CONFIG_IOSCHED_DEADLINE is not set
1814
# CONFIG_IOSCHED_CFQ is not set
19-
CONFIG_M520x=y
20-
CONFIG_CLOCK_SET=y
21-
CONFIG_CLOCK_FREQ=166666666
22-
CONFIG_CLOCK_DIV=2
23-
CONFIG_M5208EVB=y
15+
# CONFIG_MMU is not set
2416
# CONFIG_4KSTACKS is not set
2517
CONFIG_RAMBASE=0x40000000
2618
CONFIG_RAMSIZE=0x2000000
2719
CONFIG_VECTORBASE=0x40000000
2820
CONFIG_KERNELBASE=0x40020000
29-
CONFIG_RAM16BIT=y
3021
CONFIG_BINFMT_FLAT=y
3122
CONFIG_NET=y
3223
CONFIG_PACKET=y
@@ -40,24 +31,19 @@ CONFIG_INET=y
4031
# CONFIG_IPV6 is not set
4132
# CONFIG_FW_LOADER is not set
4233
CONFIG_MTD=y
43-
CONFIG_MTD_CHAR=y
4434
CONFIG_MTD_BLOCK=y
4535
CONFIG_MTD_RAM=y
4636
CONFIG_MTD_UCLINUX=y
4737
CONFIG_BLK_DEV_RAM=y
48-
# CONFIG_MISC_DEVICES is not set
4938
CONFIG_NETDEVICES=y
50-
CONFIG_NET_ETHERNET=y
5139
CONFIG_FEC=y
52-
# CONFIG_NETDEV_1000 is not set
53-
# CONFIG_NETDEV_10000 is not set
5440
# CONFIG_INPUT is not set
5541
# CONFIG_SERIO is not set
5642
# CONFIG_VT is not set
43+
# CONFIG_UNIX98_PTYS is not set
5744
CONFIG_SERIAL_MCF=y
5845
CONFIG_SERIAL_MCF_BAUDRATE=115200
5946
CONFIG_SERIAL_MCF_CONSOLE=y
60-
# CONFIG_UNIX98_PTYS is not set
6147
# CONFIG_HW_RANDOM is not set
6248
# CONFIG_HWMON is not set
6349
# CONFIG_USB_SUPPORT is not set
@@ -68,8 +54,6 @@ CONFIG_EXT2_FS=y
6854
CONFIG_ROMFS_FS=y
6955
CONFIG_ROMFS_BACKED_BY_MTD=y
7056
# CONFIG_NETWORK_FILESYSTEMS is not set
71-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
72-
CONFIG_SYSCTL_SYSCALL_CHECK=y
73-
CONFIG_FULLDEBUG=y
7457
CONFIG_BOOTPARAM=y
7558
CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
59+
CONFIG_FULLDEBUG=y

‎arch/m68k/configs/m5249evb_defconfig

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
# CONFIG_MMU is not set
2-
CONFIG_EXPERIMENTAL=y
31
CONFIG_LOG_BUF_SHIFT=14
4-
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
52
CONFIG_EXPERT=y
63
# CONFIG_KALLSYMS is not set
7-
# CONFIG_HOTPLUG is not set
84
# CONFIG_FUTEX is not set
95
# CONFIG_EPOLL is not set
106
# CONFIG_SIGNALFD is not set
@@ -16,10 +12,8 @@ CONFIG_EXPERT=y
1612
# CONFIG_BLK_DEV_BSG is not set
1713
# CONFIG_IOSCHED_DEADLINE is not set
1814
# CONFIG_IOSCHED_CFQ is not set
15+
# CONFIG_MMU is not set
1916
CONFIG_M5249=y
20-
CONFIG_CLOCK_SET=y
21-
CONFIG_CLOCK_FREQ=140000000
22-
CONFIG_CLOCK_DIV=2
2317
CONFIG_M5249C3=y
2418
CONFIG_RAMBASE=0x00000000
2519
CONFIG_RAMSIZE=0x00800000
@@ -38,31 +32,24 @@ CONFIG_INET=y
3832
# CONFIG_IPV6 is not set
3933
# CONFIG_FW_LOADER is not set
4034
CONFIG_MTD=y
41-
CONFIG_MTD_CHAR=y
4235
CONFIG_MTD_BLOCK=y
4336
CONFIG_MTD_RAM=y
4437
CONFIG_MTD_UCLINUX=y
4538
CONFIG_BLK_DEV_RAM=y
46-
# CONFIG_MISC_DEVICES is not set
4739
CONFIG_NETDEVICES=y
48-
CONFIG_NET_ETHERNET=y
49-
# CONFIG_NETDEV_1000 is not set
50-
# CONFIG_NETDEV_10000 is not set
5140
CONFIG_PPP=y
5241
# CONFIG_INPUT is not set
5342
# CONFIG_SERIO is not set
5443
# CONFIG_VT is not set
44+
# CONFIG_UNIX98_PTYS is not set
5545
CONFIG_SERIAL_MCF=y
5646
CONFIG_SERIAL_MCF_CONSOLE=y
57-
# CONFIG_UNIX98_PTYS is not set
5847
# CONFIG_HWMON is not set
5948
# CONFIG_USB_SUPPORT is not set
6049
CONFIG_EXT2_FS=y
6150
# CONFIG_FILE_LOCKING is not set
6251
CONFIG_ROMFS_FS=y
6352
CONFIG_ROMFS_BACKED_BY_MTD=y
6453
# CONFIG_NETWORK_FILESYSTEMS is not set
65-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
6654
CONFIG_BOOTPARAM=y
6755
CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
68-
# CONFIG_CRC32 is not set

‎arch/m68k/configs/m5272c3_defconfig

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
# CONFIG_MMU is not set
2-
CONFIG_EXPERIMENTAL=y
31
CONFIG_LOG_BUF_SHIFT=14
4-
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
52
CONFIG_EXPERT=y
63
# CONFIG_KALLSYMS is not set
7-
# CONFIG_HOTPLUG is not set
84
# CONFIG_FUTEX is not set
95
# CONFIG_EPOLL is not set
106
# CONFIG_SIGNALFD is not set
@@ -16,8 +12,8 @@ CONFIG_EXPERT=y
1612
# CONFIG_BLK_DEV_BSG is not set
1713
# CONFIG_IOSCHED_DEADLINE is not set
1814
# CONFIG_IOSCHED_CFQ is not set
15+
# CONFIG_MMU is not set
1916
CONFIG_M5272=y
20-
CONFIG_CLOCK_SET=y
2117
CONFIG_M5272C3=y
2218
CONFIG_RAMBASE=0x00000000
2319
CONFIG_RAMSIZE=0x00800000
@@ -36,23 +32,18 @@ CONFIG_INET=y
3632
# CONFIG_IPV6 is not set
3733
# CONFIG_FW_LOADER is not set
3834
CONFIG_MTD=y
39-
CONFIG_MTD_CHAR=y
4035
CONFIG_MTD_BLOCK=y
4136
CONFIG_MTD_RAM=y
4237
CONFIG_MTD_UCLINUX=y
4338
CONFIG_BLK_DEV_RAM=y
44-
# CONFIG_MISC_DEVICES is not set
4539
CONFIG_NETDEVICES=y
46-
CONFIG_NET_ETHERNET=y
4740
CONFIG_FEC=y
48-
# CONFIG_NETDEV_1000 is not set
49-
# CONFIG_NETDEV_10000 is not set
5041
# CONFIG_INPUT is not set
5142
# CONFIG_SERIO is not set
5243
# CONFIG_VT is not set
44+
# CONFIG_UNIX98_PTYS is not set
5345
CONFIG_SERIAL_MCF=y
5446
CONFIG_SERIAL_MCF_CONSOLE=y
55-
# CONFIG_UNIX98_PTYS is not set
5647
# CONFIG_HWMON is not set
5748
# CONFIG_USB_SUPPORT is not set
5849
CONFIG_EXT2_FS=y
@@ -61,6 +52,5 @@ CONFIG_EXT2_FS=y
6152
CONFIG_ROMFS_FS=y
6253
CONFIG_ROMFS_BACKED_BY_MTD=y
6354
# CONFIG_NETWORK_FILESYSTEMS is not set
64-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
6555
CONFIG_BOOTPARAM=y
6656
CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"

‎arch/m68k/configs/m5275evb_defconfig

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
# CONFIG_MMU is not set
2-
CONFIG_EXPERIMENTAL=y
31
CONFIG_LOG_BUF_SHIFT=14
4-
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
52
CONFIG_EXPERT=y
63
# CONFIG_KALLSYMS is not set
7-
# CONFIG_HOTPLUG is not set
84
# CONFIG_FUTEX is not set
95
# CONFIG_EPOLL is not set
106
# CONFIG_SIGNALFD is not set
@@ -16,11 +12,8 @@ CONFIG_EXPERT=y
1612
# CONFIG_BLK_DEV_BSG is not set
1713
# CONFIG_IOSCHED_DEADLINE is not set
1814
# CONFIG_IOSCHED_CFQ is not set
15+
# CONFIG_MMU is not set
1916
CONFIG_M5275=y
20-
CONFIG_CLOCK_SET=y
21-
CONFIG_CLOCK_FREQ=150000000
22-
CONFIG_CLOCK_DIV=2
23-
CONFIG_M5275EVB=y
2417
# CONFIG_4KSTACKS is not set
2518
CONFIG_RAMBASE=0x00000000
2619
CONFIG_RAMSIZE=0x00000000
@@ -39,24 +32,19 @@ CONFIG_INET=y
3932
# CONFIG_IPV6 is not set
4033
# CONFIG_FW_LOADER is not set
4134
CONFIG_MTD=y
42-
CONFIG_MTD_CHAR=y
4335
CONFIG_MTD_BLOCK=y
4436
CONFIG_MTD_RAM=y
4537
CONFIG_MTD_UCLINUX=y
4638
CONFIG_BLK_DEV_RAM=y
47-
# CONFIG_MISC_DEVICES is not set
4839
CONFIG_NETDEVICES=y
49-
CONFIG_NET_ETHERNET=y
5040
CONFIG_FEC=y
51-
# CONFIG_NETDEV_1000 is not set
52-
# CONFIG_NETDEV_10000 is not set
5341
CONFIG_PPP=y
5442
# CONFIG_INPUT is not set
5543
# CONFIG_SERIO is not set
5644
# CONFIG_VT is not set
45+
# CONFIG_UNIX98_PTYS is not set
5746
CONFIG_SERIAL_MCF=y
5847
CONFIG_SERIAL_MCF_CONSOLE=y
59-
# CONFIG_UNIX98_PTYS is not set
6048
# CONFIG_HWMON is not set
6149
# CONFIG_USB_SUPPORT is not set
6250
CONFIG_EXT2_FS=y
@@ -65,8 +53,5 @@ CONFIG_EXT2_FS=y
6553
CONFIG_ROMFS_FS=y
6654
CONFIG_ROMFS_BACKED_BY_MTD=y
6755
# CONFIG_NETWORK_FILESYSTEMS is not set
68-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
69-
CONFIG_SYSCTL_SYSCALL_CHECK=y
7056
CONFIG_BOOTPARAM=y
7157
CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
72-
# CONFIG_CRC32 is not set

‎arch/m68k/configs/m5307c3_defconfig

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
# CONFIG_MMU is not set
2-
CONFIG_EXPERIMENTAL=y
31
CONFIG_LOG_BUF_SHIFT=14
4-
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
52
CONFIG_EXPERT=y
63
# CONFIG_KALLSYMS is not set
7-
# CONFIG_HOTPLUG is not set
84
# CONFIG_FUTEX is not set
95
# CONFIG_EPOLL is not set
106
# CONFIG_SIGNALFD is not set
@@ -16,10 +12,8 @@ CONFIG_EXPERT=y
1612
# CONFIG_BLK_DEV_BSG is not set
1713
# CONFIG_IOSCHED_DEADLINE is not set
1814
# CONFIG_IOSCHED_CFQ is not set
15+
# CONFIG_MMU is not set
1916
CONFIG_M5307=y
20-
CONFIG_CLOCK_SET=y
21-
CONFIG_CLOCK_FREQ=90000000
22-
CONFIG_CLOCK_DIV=2
2317
CONFIG_M5307C3=y
2418
CONFIG_RAMBASE=0x00000000
2519
CONFIG_RAMSIZE=0x00800000
@@ -38,16 +32,11 @@ CONFIG_INET=y
3832
# CONFIG_IPV6 is not set
3933
# CONFIG_FW_LOADER is not set
4034
CONFIG_MTD=y
41-
CONFIG_MTD_CHAR=y
4235
CONFIG_MTD_BLOCK=y
4336
CONFIG_MTD_RAM=y
4437
CONFIG_MTD_UCLINUX=y
4538
CONFIG_BLK_DEV_RAM=y
46-
# CONFIG_MISC_DEVICES is not set
4739
CONFIG_NETDEVICES=y
48-
CONFIG_NET_ETHERNET=y
49-
# CONFIG_NETDEV_1000 is not set
50-
# CONFIG_NETDEV_10000 is not set
5140
CONFIG_PPP=y
5241
CONFIG_SLIP=y
5342
CONFIG_SLIP_COMPRESSED=y
@@ -56,21 +45,17 @@ CONFIG_SLIP_COMPRESSED=y
5645
# CONFIG_INPUT_MOUSE is not set
5746
# CONFIG_SERIO is not set
5847
# CONFIG_VT is not set
48+
# CONFIG_LEGACY_PTYS is not set
5949
CONFIG_SERIAL_MCF=y
6050
CONFIG_SERIAL_MCF_CONSOLE=y
61-
# CONFIG_LEGACY_PTYS is not set
6251
# CONFIG_HW_RANDOM is not set
6352
# CONFIG_HWMON is not set
64-
# CONFIG_HID_SUPPORT is not set
6553
# CONFIG_USB_SUPPORT is not set
6654
CONFIG_EXT2_FS=y
6755
# CONFIG_DNOTIFY is not set
6856
CONFIG_ROMFS_FS=y
6957
CONFIG_ROMFS_BACKED_BY_MTD=y
7058
# CONFIG_NETWORK_FILESYSTEMS is not set
71-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
72-
CONFIG_SYSCTL_SYSCALL_CHECK=y
73-
CONFIG_FULLDEBUG=y
7459
CONFIG_BOOTPARAM=y
7560
CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
76-
# CONFIG_CRC32 is not set
61+
CONFIG_FULLDEBUG=y

0 commit comments

Comments
 (0)