Commit f85c7124 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 761ab766 67592f69

arch/m68k/Kconfig.cpu

+27 −22
Original line number Diff line number Diff line
@@ -125,6 +125,13 @@ endif # M68KCLASSIC 


if COLDFIRE



choice

	prompt "ColdFire SoC type"

	default M520x

	help

	  Select the type of ColdFire System-on-Chip (SoC) that you want

	  to build for.



config M5206

	bool "MCF5206"

	depends on !MMU
@@ -174,9 +181,6 @@ config M525x 
	help

	  Freescale (Motorola) Coldfire 5251/5253 processor support.



config M527x

	bool



config M5271

	bool "MCF5271"

	depends on !MMU
@@ -223,9 +227,6 @@ config M5307 
	help

	  Motorola ColdFire 5307 processor support.



config M53xx

	bool



config M532x

	bool "MCF532x"

	depends on !MMU
@@ -251,9 +252,6 @@ config M5407 
	help

	  Motorola ColdFire 5407 processor support.



config M54xx

	bool



config M547x

	bool "MCF547x"

	select M54xx
@@ -280,6 +278,17 @@ config M5441x 
	help

	  Freescale Coldfire 54410/54415/54416/54417/54418 processor support.



endchoice



config M527x

	bool



config M53xx

	bool



config M54xx

	bool



endif # COLDFIRE
@@ -416,22 +425,18 @@ config HAVE_MBAR 
config HAVE_IPSBAR

	bool



config CLOCK_SET

	bool "Enable setting the CPU clock frequency"

	depends on COLDFIRE

	default n

	help

	  On some CPU's you do not need to know what the core CPU clock

	  frequency is. On these you can disable clock setting. On some

	  traditional 68K parts, and on all ColdFire parts you need to set

	  the appropriate CPU clock frequency. On these devices many of the

	  onboard peripherals derive their timing from the master CPU clock

	  frequency.



config CLOCK_FREQ

	int "Set the core clock frequency"

	default "25000000" if M5206

	default "54000000" if M5206e

	default "166666666" if M520x

	default "140000000" if M5249

	default "150000000" if M527x || M523x

	default "90000000" if M5307

	default "50000000" if M5407

	default "266000000" if M54xx

	default "66666666"

	depends on CLOCK_SET

	depends on COLDFIRE

	help

	  Define the CPU clock frequency in use. This is the core clock

	  frequency, it may or may not be the same as the external clock

arch/m68k/configs/m5208evb_defconfig

+3 −19
Original line number Diff line number Diff line 
# CONFIG_MMU is not set

CONFIG_EXPERIMENTAL=y

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y

# CONFIG_KALLSYMS is not set

# CONFIG_HOTPLUG is not set

# CONFIG_FUTEX is not set

# CONFIG_EPOLL is not set

# CONFIG_SIGNALFD is not set
@@ -16,17 +12,12 @@ CONFIG_EXPERT=y 
# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_M520x=y

CONFIG_CLOCK_SET=y

CONFIG_CLOCK_FREQ=166666666

CONFIG_CLOCK_DIV=2

CONFIG_M5208EVB=y

# CONFIG_MMU is not set

# CONFIG_4KSTACKS is not set

CONFIG_RAMBASE=0x40000000

CONFIG_RAMSIZE=0x2000000

CONFIG_VECTORBASE=0x40000000

CONFIG_KERNELBASE=0x40020000

CONFIG_RAM16BIT=y

CONFIG_BINFMT_FLAT=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -40,24 +31,19 @@ CONFIG_INET=y 
# CONFIG_IPV6 is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_RAM=y

CONFIG_MTD_UCLINUX=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_MISC_DEVICES is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_FEC=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_UNIX98_PTYS is not set

CONFIG_SERIAL_MCF=y

CONFIG_SERIAL_MCF_BAUDRATE=115200

CONFIG_SERIAL_MCF_CONSOLE=y

# CONFIG_UNIX98_PTYS is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_USB_SUPPORT is not set
@@ -68,8 +54,6 @@ CONFIG_EXT2_FS=y 
CONFIG_ROMFS_FS=y

CONFIG_ROMFS_BACKED_BY_MTD=y

# CONFIG_NETWORK_FILESYSTEMS is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_FULLDEBUG=y

CONFIG_BOOTPARAM=y

CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"

CONFIG_FULLDEBUG=y

arch/m68k/configs/m5249evb_defconfig

+2 −15
Original line number Diff line number Diff line 
# CONFIG_MMU is not set

CONFIG_EXPERIMENTAL=y

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y

# CONFIG_KALLSYMS is not set

# CONFIG_HOTPLUG is not set

# CONFIG_FUTEX is not set

# CONFIG_EPOLL is not set

# CONFIG_SIGNALFD is not set
@@ -16,10 +12,8 @@ CONFIG_EXPERT=y 
# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_MMU is not set

CONFIG_M5249=y

CONFIG_CLOCK_SET=y

CONFIG_CLOCK_FREQ=140000000

CONFIG_CLOCK_DIV=2

CONFIG_M5249C3=y

CONFIG_RAMBASE=0x00000000

CONFIG_RAMSIZE=0x00800000
@@ -38,23 +32,18 @@ CONFIG_INET=y 
# CONFIG_IPV6 is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_RAM=y

CONFIG_MTD_UCLINUX=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_MISC_DEVICES is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_PPP=y

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_UNIX98_PTYS is not set

CONFIG_SERIAL_MCF=y

CONFIG_SERIAL_MCF_CONSOLE=y

# CONFIG_UNIX98_PTYS is not set

# CONFIG_HWMON is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y
@@ -62,7 +51,5 @@ CONFIG_EXT2_FS=y 
CONFIG_ROMFS_FS=y

CONFIG_ROMFS_BACKED_BY_MTD=y

# CONFIG_NETWORK_FILESYSTEMS is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_BOOTPARAM=y

CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
 
# CONFIG_CRC32 is not set

arch/m68k/configs/m5272c3_defconfig

+2 −12
Original line number Diff line number Diff line 
# CONFIG_MMU is not set

CONFIG_EXPERIMENTAL=y

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y

# CONFIG_KALLSYMS is not set

# CONFIG_HOTPLUG is not set

# CONFIG_FUTEX is not set

# CONFIG_EPOLL is not set

# CONFIG_SIGNALFD is not set
@@ -16,8 +12,8 @@ CONFIG_EXPERT=y 
# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_MMU is not set

CONFIG_M5272=y

CONFIG_CLOCK_SET=y

CONFIG_M5272C3=y

CONFIG_RAMBASE=0x00000000

CONFIG_RAMSIZE=0x00800000
@@ -36,23 +32,18 @@ CONFIG_INET=y 
# CONFIG_IPV6 is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_RAM=y

CONFIG_MTD_UCLINUX=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_MISC_DEVICES is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_FEC=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_UNIX98_PTYS is not set

CONFIG_SERIAL_MCF=y

CONFIG_SERIAL_MCF_CONSOLE=y

# CONFIG_UNIX98_PTYS is not set

# CONFIG_HWMON is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y
@@ -61,6 +52,5 @@ CONFIG_EXT2_FS=y 
CONFIG_ROMFS_FS=y

CONFIG_ROMFS_BACKED_BY_MTD=y

# CONFIG_NETWORK_FILESYSTEMS is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_BOOTPARAM=y

CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"

arch/m68k/configs/m5275evb_defconfig

+2 −17
Original line number Diff line number Diff line 
# CONFIG_MMU is not set

CONFIG_EXPERIMENTAL=y

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y

# CONFIG_KALLSYMS is not set

# CONFIG_HOTPLUG is not set

# CONFIG_FUTEX is not set

# CONFIG_EPOLL is not set

# CONFIG_SIGNALFD is not set
@@ -16,11 +12,8 @@ CONFIG_EXPERT=y 
# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_MMU is not set

CONFIG_M5275=y

CONFIG_CLOCK_SET=y

CONFIG_CLOCK_FREQ=150000000

CONFIG_CLOCK_DIV=2

CONFIG_M5275EVB=y

# CONFIG_4KSTACKS is not set

CONFIG_RAMBASE=0x00000000

CONFIG_RAMSIZE=0x00000000
@@ -39,24 +32,19 @@ CONFIG_INET=y 
# CONFIG_IPV6 is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_RAM=y

CONFIG_MTD_UCLINUX=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_MISC_DEVICES is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_FEC=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_PPP=y

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_UNIX98_PTYS is not set

CONFIG_SERIAL_MCF=y

CONFIG_SERIAL_MCF_CONSOLE=y

# CONFIG_UNIX98_PTYS is not set

# CONFIG_HWMON is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y
@@ -65,8 +53,5 @@ CONFIG_EXT2_FS=y 
CONFIG_ROMFS_FS=y

CONFIG_ROMFS_BACKED_BY_MTD=y

# CONFIG_NETWORK_FILESYSTEMS is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_BOOTPARAM=y

CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"
 
# CONFIG_CRC32 is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE