--- /dev/null
+From d9ee489619744ee5ac246b8fb3dd65bb078d2f0a Mon Sep 17 00:00:00 2001
+From: Greg Ungerer <gerg@uclinux.org>
+Date: Tue, 7 Jul 2015 14:21:21 +1000
+Subject: m68knommu: force setting of CONFIG_CLOCK_FREQ for ColdFire
+
+From: Greg Ungerer <gerg@uclinux.org>
+
+commit d9ee489619744ee5ac246b8fb3dd65bb078d2f0a upstream.
+
+It is possible to disable the clock selection at configuration time,
+but for ColdFire targets we always expect a clock frequency to be
+selected. This results in the following compile time error:
+
+ CC arch/m68k/kernel/asm-offsets.s
+In file included from ./arch/m68k/include/asm/timex.h:14:0,
+ from include/linux/timex.h:65,
+ from include/linux/sched.h:19,
+ from arch/m68k/kernel/asm-offsets.c:14:
+./arch/m68k/include/asm/coldfire.h:25:2: error: #error "Don't know what your ColdFire CPU clock frequency is??"
+
+Remove CONFIG_CLOCK_SELECT completely and always enable CONFIG_CLOCK_FREQ
+for ColdFire.
+
+Signed-off-by: Greg Ungerer <gerg@uclinux.org>
+Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/m68k/Kconfig.cpu | 14 +-------------
+ arch/m68k/include/asm/coldfire.h | 2 +-
+ 2 files changed, 2 insertions(+), 14 deletions(-)
+
+--- a/arch/m68k/Kconfig.cpu
++++ b/arch/m68k/Kconfig.cpu
+@@ -425,22 +425,10 @@ 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 "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
+--- a/arch/m68k/include/asm/coldfire.h
++++ b/arch/m68k/include/asm/coldfire.h
+@@ -19,7 +19,7 @@
+ * in any case new boards come along from time to time that have yet
+ * another different clocking frequency.
+ */
+-#ifdef CONFIG_CLOCK_SET
++#ifdef CONFIG_CLOCK_FREQ
+ #define MCF_CLK CONFIG_CLOCK_FREQ
+ #else
+ #error "Don't know what your ColdFire CPU clock frequency is??"
--- /dev/null
+From fa95a1dd0819c9041a873b10a6d83b5134964154 Mon Sep 17 00:00:00 2001
+From: Greg Ungerer <gerg@uclinux.org>
+Date: Tue, 7 Jul 2015 15:44:02 +1000
+Subject: m68knommu: make ColdFire SoC selection a choice
+
+From: Greg Ungerer <gerg@uclinux.org>
+
+commit fa95a1dd0819c9041a873b10a6d83b5134964154 upstream.
+
+It would be nice if we could support multiple ColdFire SoC types in a
+single binary - but currently the code simply does not support it.
+Change the SoC selection config options to be a choice instead of
+individual selectable entries.
+
+This fixes problems with building allnoconfig, and means that a sane
+linux kernel is generated for a single ColdFire SoC type.
+
+Signed-off-by: Greg Ungerer <gerg@uclinux.org>
+Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/m68k/Kconfig.cpu | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+--- a/arch/m68k/Kconfig.cpu
++++ b/arch/m68k/Kconfig.cpu
+@@ -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
+
+
--- /dev/null
+From 04ea1e91f85615318ea91ce8ab50cb6a01ee4005 Mon Sep 17 00:00:00 2001
+From: Andrew Morton <akpm@linux-foundation.org>
+Date: Fri, 17 Jul 2015 16:23:28 -0700
+Subject: openrisc: fix CONFIG_UID16 setting
+
+From: Andrew Morton <akpm@linux-foundation.org>
+
+commit 04ea1e91f85615318ea91ce8ab50cb6a01ee4005 upstream.
+
+openrisc-allnoconfig:
+
+ kernel/uid16.c: In function 'SYSC_setgroups16':
+ kernel/uid16.c:184:2: error: implicit declaration of function 'groups_alloc'
+ kernel/uid16.c:184:13: warning: assignment makes pointer from integer without a cast
+
+openrisc shouldn't be setting CONFIG_UID16 when CONFIG_MULTIUSER=n.
+
+Fixes: 2813893f8b197a1 ("kernel: conditionally support non-root users, groups and capabilities")
+Reported-by: Fengguang Wu <fengguang.wu@gmail.com>
+Cc: Iulia Manda <iulia.manda21@gmail.com>
+Cc: Josh Triplett <josh@joshtriplett.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/openrisc/Kconfig | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/arch/openrisc/Kconfig
++++ b/arch/openrisc/Kconfig
+@@ -17,6 +17,7 @@ config OPENRISC
+ select GENERIC_IRQ_SHOW
+ select GENERIC_IOMAP
+ select GENERIC_CPU_DEVICES
++ select HAVE_UID16
+ select GENERIC_ATOMIC64
+ select GENERIC_CLOCKEVENTS
+ select GENERIC_STRNCPY_FROM_USER
+@@ -31,9 +32,6 @@ config MMU
+ config HAVE_DMA_ATTRS
+ def_bool y
+
+-config UID16
+- def_bool y
+-
+ config RWSEM_GENERIC_SPINLOCK
+ def_bool y
+
pinctrl-mvebu-armada-xp-remove-non-existing-nand-pins.patch
pinctrl-mvebu-armada-xp-remove-non-existing-vdd-cpu_pd-functions.patch
pinctrl-mvebu-armada-xp-fix-functions-of-mpp48.patch
+openrisc-fix-config_uid16-setting.patch
+m68knommu-make-coldfire-soc-selection-a-choice.patch
+m68knommu-force-setting-of-config_clock_freq-for-coldfire.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
