Skip to contentSkip to conversation

ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds

PATCH New Paul Walmsley 3 participants 3 messages May 10, 2012 – May 14, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP1 support
lore
Share & tools
lore

Paul Walmsley

author
#0 lore raw

PATCH 1/1 ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds

Janusz Krzysztofik reported the following build break on OMAP1 builds that don't include CONFIG_ARCH_OMAP16XX:

LD .tmp_vmlinux1
arch/arm/mach-omap1/built-in.o: In function `omap1_usb_init':
lcd_dma.c:(.init.text+0x1420): undefined reference to `ocpi_enable'
make: *** [.tmp_vmlinux1] Error 1

This was caused by commit d3645d39ad0ed9f09535065676ea0ba114f93cdf ("ARM: OMAP1: OHCI: use platform_data fn ptr to enable OCPI bus"). Fix by declaring an empty ocpi_enable() on non-16XX builds, which should work until the OCPI code is moved out to drivers/.

Cc Janusz Krzysztofik <[email protected]>
Signed-off-by Paul Walmsley <[email protected]>

---
Passes a compile test with a 15xx-only config.

 arch/arm/mach-omap1/common.h |    4 ++++
 1 file changed, 4 insertions(+)
arch/arm/mach-omap1/common.h +4 -0
index a90b9d7..4193383 100644
@@ -63,6 +63,10 @@ extern bool omap_32k_timer_init(void);
 
 extern u32 omap_irq_flags;
 
+#ifdef CONFIG_ARCH_OMAP16XX
 extern int ocpi_enable(void);
+#else
+static inline int ocpi_enable(void) { return 0; }
+#endif
 
 #endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */
Signature · 1 line
1.7.10
reviewer
#1 lore raw

PATCH 1/1 ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds

Quoted 9 lines · Paul Walmsley

Janusz Krzysztofik reported the following build break on OMAP1 builds that don't include CONFIG_ARCH_OMAP16XX:

LD .tmp_vmlinux1
arch/arm/mach-omap1/built-in.o: In function `omap1_usb_init':
lcd_dma.c:(.init.text+0x1420): undefined reference to `ocpi_enable'
make: *** [.tmp_vmlinux1] Error 1

Quoted 4 lines

This was caused by commit d3645d39ad0ed9f09535065676ea0ba114f93cdf ("ARM: OMAP1: OHCI: use platform_data fn ptr to enable OCPI bus"). Fix by declaring an empty ocpi_enable() on non-16XX builds, which should work until the OCPI code is moved out to drivers/.

Thanks applying into fixes-for-cleanup branch.

Tony

maintainer
#2 lore raw

PATCH 1/1 ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds

Quoted 10 lines · On Friday 11 of May 2012 09:53:07 Tony Lindgren wrote:
Quoted 9 lines · Paul Walmsley

Janusz Krzysztofik reported the following build break on OMAP1 builds that don't include CONFIG_ARCH_OMAP16XX:

LD .tmp_vmlinux1
arch/arm/mach-omap1/built-in.o: In function `omap1_usb_init':
lcd_dma.c:(.init.text+0x1420): undefined reference to `ocpi_enable'
make: *** [.tmp_vmlinux1] Error 1

Quoted 8 lines
Quoted 4 lines

This was caused by commit d3645d39ad0ed9f09535065676ea0ba114f93cdf ("ARM: OMAP1: OHCI: use platform_data fn ptr to enable OCPI bus"). Fix by declaring an empty ocpi_enable() on non-16XX builds, which should work until the OCPI code is moved out to drivers/.

Thanks applying into fixes-for-cleanup branch.

Tony

FWIW, works with OMAP1510 only config on my Amstrad Delta.

Tested-by Janusz Krzysztofik <[email protected]>