Skip to contentSkip to conversation

ARM: mach-imx: Fix selection of ARCH_MXC

PATCH New Fabio Estevam 3 participants 4 messages Oct 18, 2012 – Oct 25, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH v3 1/1 ARM: mach-imx: Fix selection of ARCH_MXC

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 <[email protected]>

---
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(-)
arch/arm/configs/imx_v4_v5_defconfig +1 -0
index bd01244..f71302c 100644
@@ -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
arch/arm/configs/imx_v6_v7_defconfig +1 -0
index a4965f3..5dfadfb 100644
@@ -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
arch/arm/mach-imx/Kconfig +1 -1
index 856482d..cbbef1a 100644
@@ -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
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v3 1/1 ARM: mach-imx: Fix selection of ARCH_MXC

Quoted 8 lines · Fabio Estevam

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:

Quoted 8 lines

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 <[email protected]>

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

#2 lore raw

PATCH v3 1/1 ARM: mach-imx: Fix selection of ARCH_MXC

Quoted 16 lines · Shawn Guo
Quoted 15 lines · Fabio Estevam

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.

Quoted 7 lines
Quoted 1 line
Signed-off-by Fabio Estevam <[email protected]>

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(-)
#3 lore raw

PATCH v3 1/1 ARM: mach-imx: Fix selection of ARCH_MXC

Quoted 19 lines · Shawn Guo
Quoted 18 lines · Shawn Guo
Quoted 16 lines · Fabio Estevam

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 <[email protected]>
Quoted 7 lines
Quoted 5 lines

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