[PATCH] ARM: OMAP3: Fix dependencies for OMAP3_EMU

[PATCH] ARM: OMAP3: Fix dependencies for OMAP3_EMU

[Russell King - ARM Linux]

On Sat, Nov 05, 2011 at 05:57:59PM +0100, Thomas Weber wrote:
> This patch fixes the dependencies for OMAP3_EMU after
> commit 53eebb0df85e4005
> ARM: OC_ETM should not select ARM_AMBA
> 
> When "OMAP3 debugging peripherals" is selected the warning:
> (OMAP3_EMU) selects OC_ETM which
> has unmet direct dependencies (ARM_AMBA)

There is a patch from Arnd addressing this which was sent in October.
It was acked by Santosh and Tony.  What happened to it?

> appears, which results in:
> 
> arch/arm/kernel/built-in.o: In function `etm_remove':
> arch/arm/kernel/etm.c:608:
> undefined reference to `amba_release_regions'
> arch/arm/kernel/built-in.o: In function `etb_remove':
> arch/arm/kernel/etm.c:408:
> undefined reference to `amba_release_regions'
> arch/arm/kernel/built-in.o: In function `etm_init':
> arch/arm/kernel/etm.c:639:
> undefined reference to `amba_driver_register'
> arch/arm/kernel/etm.c:645:
> undefined reference to `amba_driver_register'
> arch/arm/kernel/etm.c:647:
> undefined reference to `amba_driver_unregister'
> arch/arm/kernel/built-in.o: In function `etm_probe':
> arch/arm/kernel/etm.c:544:
> undefined reference to `amba_request_regions'
> arch/arm/kernel/etm.c:594:
> undefined reference to `amba_release_regions'
> arch/arm/kernel/built-in.o: In function `etb_probe':
> arch/arm/kernel/etm.c:346:
> undefined reference to `amba_request_regions'
> arch/arm/kernel/etm.c:391:
> undefined reference to `amba_release_regions'
> arch/arm/mach-omap2/built-in.o: In function `emu_init':
> arch/arm/mach-omap2/emu.c:62:
> undefined reference to `amba_device_register'
> arch/arm/mach-omap2/emu.c:63:
> undefined reference to `amba_device_register'
> make: *** [.tmp_vmlinux1] Error 1
> 
> Signed-off-by: Thomas Weber <weber@corscience.de>
> ---
>  arch/arm/mach-omap2/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index c3d530b..9c5354a 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -30,6 +30,7 @@ config ARCH_OMAP3
>  	bool "TI OMAP3"
>  	depends on ARCH_OMAP2PLUS
>  	default y
> +	select ARM_AMBA
>  	select CPU_V7
>  	select USB_ARCH_HAS_EHCI
>  	select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4
> -- 
> 1.7.7.2
> 

[PATCH] ARM: OMAP3: Fix dependencies for OMAP3_EMU

[Thomas Weber]

This patch fixes the dependencies for OMAP3_EMU after
commit 53eebb0df85e4005
ARM: OC_ETM should not select ARM_AMBA

When "OMAP3 debugging peripherals" is selected the warning:
(OMAP3_EMU) selects OC_ETM which
has unmet direct dependencies (ARM_AMBA)

appears, which results in:

arch/arm/kernel/built-in.o: In function `etm_remove':
arch/arm/kernel/etm.c:608:
undefined reference to `amba_release_regions'
arch/arm/kernel/built-in.o: In function `etb_remove':
arch/arm/kernel/etm.c:408:
undefined reference to `amba_release_regions'
arch/arm/kernel/built-in.o: In function `etm_init':
arch/arm/kernel/etm.c:639:
undefined reference to `amba_driver_register'
arch/arm/kernel/etm.c:645:
undefined reference to `amba_driver_register'
arch/arm/kernel/etm.c:647:
undefined reference to `amba_driver_unregister'
arch/arm/kernel/built-in.o: In function `etm_probe':
arch/arm/kernel/etm.c:544:
undefined reference to `amba_request_regions'
arch/arm/kernel/etm.c:594:
undefined reference to `amba_release_regions'
arch/arm/kernel/built-in.o: In function `etb_probe':
arch/arm/kernel/etm.c:346:
undefined reference to `amba_request_regions'
arch/arm/kernel/etm.c:391:
undefined reference to `amba_release_regions'
arch/arm/mach-omap2/built-in.o: In function `emu_init':
arch/arm/mach-omap2/emu.c:62:
undefined reference to `amba_device_register'
arch/arm/mach-omap2/emu.c:63:
undefined reference to `amba_device_register'
make: *** [.tmp_vmlinux1] Error 1

Signed-off-by: Thomas Weber <weber@corscience.de>
---
 arch/arm/mach-omap2/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index c3d530b..9c5354a 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -30,6 +30,7 @@ config ARCH_OMAP3
 	bool "TI OMAP3"
 	depends on ARCH_OMAP2PLUS
 	default y
+	select ARM_AMBA
 	select CPU_V7
 	select USB_ARCH_HAS_EHCI
 	select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4
-- 
1.7.7.2

[PATCH] ARM: OMAP3: Fix dependencies for OMAP3_EMU

[Arnd Bergmann]

On Saturday 05 November 2011, Russell King - ARM Linux wrote:
> On Sat, Nov 05, 2011 at 05:57:59PM +0100, Thomas Weber wrote:
> > This patch fixes the dependencies for OMAP3_EMU after
> > commit 53eebb0df85e4005
> > ARM: OC_ETM should not select ARM_AMBA
> > 
> > When "OMAP3 debugging peripherals" is selected the warning:
> > (OMAP3_EMU) selects OC_ETM which
> > has unmet direct dependencies (ARM_AMBA)
> 
> There is a patch from Arnd addressing this which was sent in October.
> It was acked by Santosh and Tony.  What happened to it?

I haven't gotten around to put the omap patches I sent earlier into
a branch yet, with too much travelling over the last weeks.

Right now, I'm mostly worried about regression fixes for stuff that
broke in the merge window, but the patches are not lost yet and
I'll get to that next, possibly only after I return from my vacation
in a week.

	Arnd