projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 13c25be3 GKH |
1 | From a8a6565c7615cab3608d75af95b5c8a3522cd7c4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ming Lei <tom.leiming@gmail.com> | |
| 3 | Date: Wed, 23 Nov 2011 14:44:50 -0800 | |
| 4 | Subject: ARM: OMAP2: select ARM_AMBA if OMAP3_EMU is defined | |
| 5 | ||
| 6 | From: Ming Lei <tom.leiming@gmail.com> | |
| 7 | ||
| 8 | commit a8a6565c7615cab3608d75af95b5c8a3522cd7c4 upstream. | |
| 9 | ||
| 10 | This patch selects ARM_AMBA if OMAP3_EMU is defined because | |
| 11 | OC_ETM depends on ARM_AMBA, so fix the link failure[1]. | |
| 12 | ||
| 13 | [1], | |
| 14 | arch/arm/kernel/built-in.o: In function `etm_remove': | |
| 15 | /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:609: undefined | |
| 16 | reference to `amba_release_regions' | |
| 17 | arch/arm/kernel/built-in.o: In function `etb_remove': | |
| 18 | /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:409: undefined | |
| 19 | reference to `amba_release_regions' | |
| 20 | arch/arm/kernel/built-in.o: In function `etm_init': | |
| 21 | /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:640: undefined | |
| 22 | reference to `amba_driver_register' | |
| 23 | /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:646: undefined | |
| 24 | reference to `amba_driver_register' | |
| 25 | /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:648: undefined | |
| 26 | reference to `amba_driver_unregister' | |
| 27 | arch/arm/kernel/built-in.o: In function `etm_probe': | |
| 28 | /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:545: undefined | |
| 29 | reference to `amba_request_regions' | |
| 30 | /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:595: undefined | |
| 31 | reference to `amba_release_regions' | |
| 32 | arch/arm/kernel/built-in.o: In function `etb_probe': | |
| 33 | /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:347: undefined | |
| 34 | reference to `amba_request_regions' | |
| 35 | /home/tom/git/omap/linux-2.6-omap/arch/arm/kernel/etm.c:392: undefined | |
| 36 | reference to `amba_release_regions' | |
| 37 | arch/arm/mach-omap2/built-in.o: In function `emu_init': | |
| 38 | /home/tom/git/omap/linux-2.6-omap/arch/arm/mach-omap2/emu.c:62: | |
| 39 | undefined reference to `amba_device_register' | |
| 40 | /home/tom/git/omap/linux-2.6-omap/arch/arm/mach-omap2/emu.c:63: | |
| 41 | undefined reference to `amba_device_register' | |
| 42 | make: *** [.tmp_vmlinux1] Error 1 | |
| 43 | making modules | |
| 44 | ||
| 45 | Signed-off-by: Ming Lei <tom.leiming@gmail.com> | |
| 46 | Signed-off-by: Tony Lindgren <tony@atomide.com> | |
| 47 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 48 | ||
| 49 | --- | |
| 50 | arch/arm/mach-omap2/Kconfig | 1 + | |
| 51 | 1 file changed, 1 insertion(+) | |
| 52 | ||
| 53 | --- a/arch/arm/mach-omap2/Kconfig | |
| 54 | +++ b/arch/arm/mach-omap2/Kconfig | |
| 55 | @@ -329,6 +329,7 @@ config MACH_OMAP4_PANDA | |
| 56 | config OMAP3_EMU | |
| 57 | bool "OMAP3 debugging peripherals" | |
| 58 | depends on ARCH_OMAP3 | |
| 59 | + select ARM_AMBA | |
| 60 | select OC_ETM | |
| 61 | help | |
| 62 | Say Y here to enable debugging hardware of omap3 |