Skip to contentSkip to conversation

ARM: davinci: PM: fix build when da850 not compiled in

PATCH New Kevin Hilman 2 participants 3 messages Nov 16, 2016 – Nov 22, 2016

Subsystems (3)
Arm (32-bit) Arm sub-architectures TI DaVinci machine support
lore
Share & tools
lore

Kevin Hilman

author
#0 lore raw

PATCH 1/1 ARM: davinci: PM: fix build when da850 not compiled in

Currently, suspend/resume support is only available on da850 platforms, and the platform PM code has dependencies on da850 functions. However, CONFIG_SUSPEND might be enabled even when da850 support is not, causing build failure:

arch/arm/mach-davinci/built-in.o: In function `davinci_pm_init':
pm_domain.c:(.init.text+0x1fb8): undefined reference to da8xx_get_mem_ctlr' pm_domain.c:(.init.text+0x20b0): undefined reference to da8xx_syscfg1_base'

Fix this by only building the PM core when da850 is enabled.

Reported-by Sekhar Nori <[email protected]>
Fixes aa9aa1ec2df6 ARM: davinci: PM: rework init, remove platform device
Signed-off-by Kevin Hilman <[email protected]>
---
 arch/arm/mach-davinci/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-davinci/Makefile +3 -1
index da4c336b4637..0a2e6da45f28 100644
@@ -36,5 +36,7 @@ obj-$(CONFIG_MACH_OMAPL138_HAWKBOARD)	+= board-omapl138-hawk.o
 
 # Power Management
 obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o
-obj-$(CONFIG_SUSPEND)			+= pm.o sleep.o
 obj-$(CONFIG_HAVE_CLK)			+= pm_domain.o
+ifeq ($(CONFIG_SUSPEND),y)
+obj-$(CONFIG_ARCH_DAVINCI_DA850)	+= pm.o sleep.o
+endif
Signature · 1 line
2.9.3
Applied
#1 lore raw

PATCH 1/1 ARM: davinci: PM: fix build when da850 not compiled in

Quoted 9 lines · Kevin Hilman

Currently, suspend/resume support is only available on da850 platforms, and the platform PM code has dependencies on da850 functions. However, CONFIG_SUSPEND might be enabled even when da850 support is not, causing build failure:

arch/arm/mach-davinci/built-in.o: In function `davinci_pm_init':
pm_domain.c:(.init.text+0x1fb8): undefined reference to da8xx_get_mem_ctlr' pm_domain.c:(.init.text+0x20b0): undefined reference to da8xx_syscfg1_base'

Quoted 5 lines

Fix this by only building the PM core when da850 is enabled.

Reported-by Sekhar Nori <[email protected]>
Fixes aa9aa1ec2df6 ARM: davinci: PM: rework init, remove platform device
Signed-off-by Kevin Hilman <[email protected]>

Applied. Documentation asks for ("") around commit headline in Fixes:
tag, so I added that.

Thanks
Sekhar

author
#2 lore raw

PATCH 1/1 ARM: davinci: PM: fix build when da850 not compiled in

Quoted 10 lines · Sekhar Nori
Quoted 9 lines · Kevin Hilman

Currently, suspend/resume support is only available on da850 platforms, and the platform PM code has dependencies on da850 functions. However, CONFIG_SUSPEND might be enabled even when da850 support is not, causing build failure:

arch/arm/mach-davinci/built-in.o: In function `davinci_pm_init':
pm_domain.c:(.init.text+0x1fb8): undefined reference to da8xx_get_mem_ctlr' pm_domain.c:(.init.text+0x20b0): undefined reference to da8xx_syscfg1_base'

Quoted 8 lines
Quoted 5 lines

Fix this by only building the PM core when da850 is enabled.

Reported-by Sekhar Nori <[email protected]>
Fixes aa9aa1ec2df6 ARM: davinci: PM: rework init, remove platform device
Signed-off-by Kevin Hilman <[email protected]>

Applied. Documentation asks for ("") around commit headline in Fixes:
tag, so I added that.

Thanks,

Kevin