* [PATCH v3] ARM: mach-imx: Fix selection of ARCH_MXC
@ 2012-10-18 18:04 Fabio Estevam
2012-10-19 15:05 ` Shawn Guo
0 siblings, 1 reply; 4+ messages in thread
From: Fabio Estevam @ 2012-10-18 18:04 UTC (permalink / raw)
To: linux-arm-kernel
Since commit c5a0d497(ARM: imx: enable multi-platform build),
ARCH_MXC is selected by the following logic:
config ARCH_MXC
def_bool y if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
, which causes build error on vexpress_defconfig:
arch/arm/mach-imx/hotplug.c:49: undefined reference to `imx_enable_cpu'
arch/arm/mach-imx/platsmp.c:57: undefined reference to `imx_set_cpu_jump'
arch/arm/mach-imx/platsmp.c:58: undefined reference to `imx_enable_cpu'
Make ARCH_MXC a user selectable option, so that it does not get built
by default on other defconfigs that select ARCH_MULTI_V4_V5 or ARCH_MULTI_V6_V7.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v2:
- Make ARCH_MXC a user selectable option
Changes since v1:
- Fix typo in commit message and improve it a bit
arch/arm/configs/imx_v4_v5_defconfig | 1 +
arch/arm/configs/imx_v6_v7_defconfig | 1 +
arch/arm/mach-imx/Kconfig | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index bd01244..f71302c 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -17,6 +17,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_MXC=y
CONFIG_ARCH_MULTI_V4T=y
CONFIG_ARCH_MULTI_V5=y
# CONFIG_ARCH_MULTI_V7 is not set
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index a4965f3..5dfadfb 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -16,6 +16,7 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
# CONFIG_BLK_DEV_BSG is not set
+CONFIG_ARCH_MXC=y
CONFIG_ARCH_MULTI_V6=y
CONFIG_ARCH_MULTI_V7=y
CONFIG_MACH_MX31LILLY=y
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 856482d..cbbef1a 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,5 +1,5 @@
config ARCH_MXC
- def_bool y if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
+ bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
select ARCH_REQUIRE_GPIOLIB
select ARM_PATCH_PHYS_VIRT
select AUTO_ZRELADDR if !ZBOOT_ROM
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v3] ARM: mach-imx: Fix selection of ARCH_MXC
2012-10-18 18:04 [PATCH v3] ARM: mach-imx: Fix selection of ARCH_MXC Fabio Estevam
@ 2012-10-19 15:05 ` Shawn Guo
2012-10-25 2:51 ` Shawn Guo
0 siblings, 1 reply; 4+ messages in thread
From: Shawn Guo @ 2012-10-19 15:05 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 18, 2012 at 03:04:30PM -0300, Fabio Estevam wrote:
> Since commit c5a0d497(ARM: imx: enable multi-platform build),
> ARCH_MXC is selected by the following logic:
>
> config ARCH_MXC
> def_bool y if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
>
> , which causes build error on vexpress_defconfig:
>
> arch/arm/mach-imx/hotplug.c:49: undefined reference to `imx_enable_cpu'
> arch/arm/mach-imx/platsmp.c:57: undefined reference to `imx_set_cpu_jump'
> arch/arm/mach-imx/platsmp.c:58: undefined reference to `imx_enable_cpu'
>
> Make ARCH_MXC a user selectable option, so that it does not get built
> by default on other defconfigs that select ARCH_MULTI_V4_V5 or ARCH_MULTI_V6_V7.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Arnd, Olof,
I just applied this patch on my imx/multi-platform. Can you please
pull it to update the branch in arm-soc? Thanks.
Shawn
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3] ARM: mach-imx: Fix selection of ARCH_MXC
2012-10-19 15:05 ` Shawn Guo
@ 2012-10-25 2:51 ` Shawn Guo
2012-10-25 13:35 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Shawn Guo @ 2012-10-25 2:51 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 19, 2012 at 11:05:54PM +0800, Shawn Guo wrote:
> On Thu, Oct 18, 2012 at 03:04:30PM -0300, Fabio Estevam wrote:
> > Since commit c5a0d497(ARM: imx: enable multi-platform build),
> > ARCH_MXC is selected by the following logic:
> >
> > config ARCH_MXC
> > def_bool y if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
> >
> > , which causes build error on vexpress_defconfig:
> >
> > arch/arm/mach-imx/hotplug.c:49: undefined reference to `imx_enable_cpu'
> > arch/arm/mach-imx/platsmp.c:57: undefined reference to `imx_set_cpu_jump'
> > arch/arm/mach-imx/platsmp.c:58: undefined reference to `imx_enable_cpu'
> >
> > Make ARCH_MXC a user selectable option, so that it does not get built
> > by default on other defconfigs that select ARCH_MULTI_V4_V5 or ARCH_MULTI_V6_V7.
> >
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>
> Arnd, Olof,
>
> I just applied this patch on my imx/multi-platform. Can you please
> pull it to update the branch in arm-soc? Thanks.
>
I just applied another fix [1] on my branch. Please pull both into
arm-soc. Thanks.
Shawn
[1] http://article.gmane.org/gmane.linux.ports.arm.kernel/195009
------
The following changes since commit c5a0d4977f00ca18c49d46fdaff4b2cfeaa4eb28:
ARM: imx: enable multi-platform build (2012-10-15 10:10:15 +0800)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git imx/multi-platform
for you to fetch changes up to 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f:
ARM: imx: select HAVE_IMX_SRC when SMP is enabled (2012-10-23 15:37:51 +0800)
----------------------------------------------------------------
Fabio Estevam (1):
ARM: mach-imx: Fix selection of ARCH_MXC
Shawn Guo (1):
ARM: imx: select HAVE_IMX_SRC when SMP is enabled
arch/arm/configs/imx_v4_v5_defconfig | 1 +
arch/arm/configs/imx_v6_v7_defconfig | 1 +
arch/arm/mach-imx/Kconfig | 5 ++---
3 files changed, 4 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v3] ARM: mach-imx: Fix selection of ARCH_MXC
2012-10-25 2:51 ` Shawn Guo
@ 2012-10-25 13:35 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2012-10-25 13:35 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 25 October 2012, Shawn Guo wrote:
> On Fri, Oct 19, 2012 at 11:05:54PM +0800, Shawn Guo wrote:
> > On Thu, Oct 18, 2012 at 03:04:30PM -0300, Fabio Estevam wrote:
> > > Since commit c5a0d497(ARM: imx: enable multi-platform build),
> > > ARCH_MXC is selected by the following logic:
> > >
> > > config ARCH_MXC
> > > def_bool y if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
> > >
> > > , which causes build error on vexpress_defconfig:
> > >
> > > arch/arm/mach-imx/hotplug.c:49: undefined reference to `imx_enable_cpu'
> > > arch/arm/mach-imx/platsmp.c:57: undefined reference to `imx_set_cpu_jump'
> > > arch/arm/mach-imx/platsmp.c:58: undefined reference to `imx_enable_cpu'
> > >
> > > Make ARCH_MXC a user selectable option, so that it does not get built
> > > by default on other defconfigs that select ARCH_MULTI_V4_V5 or ARCH_MULTI_V6_V7.
> > >
> > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> >
> > Arnd, Olof,
> >
> > I just applied this patch on my imx/multi-platform. Can you please
> > pull it to update the branch in arm-soc? Thanks.
> >
> I just applied another fix [1] on my branch. Please pull both into
> arm-soc. Thanks.
Pulled into imx/multiplatform and next/cleanup now.
Thanks,
Arnd
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-25 13:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-18 18:04 [PATCH v3] ARM: mach-imx: Fix selection of ARCH_MXC Fabio Estevam
2012-10-19 15:05 ` Shawn Guo
2012-10-25 2:51 ` Shawn Guo
2012-10-25 13:35 ` Arnd Bergmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.