Skip to contentSkip to conversation

fix compilation of i.MX31 platforms

PATCH New Guennadi Liakhovetski 2 participants 2 messages Oct 5, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix compilation of i.MX31 platforms

mxc_iomux_v3_init() is defined in arch/arm/plat-mxc/iomux-v3.c, which is not linked for i.MX31 and produces an undefined reference error. Fix this by building the offending code only for i.MX35.

---

2.6.32-rc1 (and, AFAICS, all current trees) don't build for i.MX31. Disliking #ifdef's as much as you do, this is not the best fix. A nicer one would be defining a dummy mxc_iomux_v3_init() inline in arch/arm/plat-mxc/include/mach/iomux-v3.h, but this would waste a couple of bytes in arch/arm/mach-mx3/mm.o for the unneeded mx35_map_io(). Either way is fine with me, shoose whichever you prefer.

arch/arm/mach-mx3/mm.c +2 -0
index ad5a112..bedf5b8 100644
@@ -81,6 +81,7 @@ void __init mx31_map_io(void)
 	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));
 }
 
+#ifdef CONFIG_ARCH_MX35
 void __init mx35_map_io(void)
 {
 	mxc_set_cpu_type(MXC_CPU_MX35);
@@ -89,6 +90,7 @@ void __init mx35_map_io(void)
 
 	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));
 }
+#endif
 
 void __init mx31_init_irq(void)
 {
#1 lore raw

PATCH 1/1 fix compilation of i.MX31 platforms

Quoted 3 lines · Guennadi Liakhovetski

mxc_iomux_v3_init() is defined in arch/arm/plat-mxc/iomux-v3.c, which is not linked for i.MX31 and produces an undefined reference error. Fix this by building the offending code only for i.MX35.

Ok for -rc.

Quoted 5 lines

---

2.6.32-rc1 (and, AFAICS, all current trees) don't build for i.MX31.

At least not when i.MX35 is disabled.

Sascha

Quoted 27 lines

Disliking #ifdef's as much as you do, this is not the best fix. A nicer one would be defining a dummy mxc_iomux_v3_init() inline in arch/arm/plat-mxc/include/mach/iomux-v3.h, but this would waste a couple of bytes in arch/arm/mach-mx3/mm.o for the unneeded mx35_map_io(). Either way is fine with me, shoose whichever you prefer.

arch/arm/mach-mx3/mm.c +2 -0
index ad5a112..bedf5b8 100644
@@ -81,6 +81,7 @@ void __init mx31_map_io(void)
 	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));
 }
 
+#ifdef CONFIG_ARCH_MX35
 void __init mx35_map_io(void)
 {
 	mxc_set_cpu_type(MXC_CPU_MX35);
@@ -89,6 +90,7 @@ void __init mx35_map_io(void)
 
 	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));
 }
+#endif
 
 void __init mx31_init_irq(void)
 {
Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |