ARM: DRA7XX/AM43XX build fixes

PATCH New Tero Kristo 2 participants 8 messages Jan 10, 2014 – Jan 13, 2014

Subsystems (3)

Arm (32-bit) Arm sub-architectures OMAP2+ support

lore

Share & tools

lore

Tero Kristo

author

2014-01-10 09:57 UTC #0 lore raw

cover ARM: DRA7XX/AM43XX build fixes

Hi,

The move of clock code from mach-omap2 to drivers/clk/ti introduces a couple of new build errors with AM43XX/DRA7XX only builds. The following patches address these issues by modifying the Kconfig + Makefile under mach-omap2.

Also, it seems DRA7XX only build is not possible at the moment, added patch #2 to fix this.

-Tero

Tero Kristo

author

2014-01-10 09:57 UTC #1 lore raw

PATCH 1/2 ARM: DRA7XX/AM43XX: randconfig fixes

DRA7XX and AM43XX were missing common clock code from the Makefile, which causes build breakage in DRA7XX / AM43XX only builds once clock support for these SoCs is added. Add the missing entries to the Makefile as preparation of this.

Signed-off-by Tero Kristo <[email protected]>

---
 arch/arm/mach-omap2/Makefile |    3 +++
 1 file changed, 3 insertions(+)

arch/arm/mach-omap2/Makefile +3 -0

index 088305f..96a990f 100644
@@ -191,6 +191,9 @@ obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o
 obj-$(CONFIG_SOC_AM33XX)		+= $(clock-common) dpll3xxx.o
 obj-$(CONFIG_SOC_OMAP5)			+= $(clock-common)
 obj-$(CONFIG_SOC_OMAP5)			+= dpll3xxx.o dpll44xx.o
+obj-$(CONFIG_SOC_DRA7XX)		+= $(clock-common)
+obj-$(CONFIG_SOC_DRA7XX)		+= dpll3xxx.o dpll44xx.o
+obj-$(CONFIG_SOC_AM43XX)		+= $(clock-common) dpll3xxx.o
 
 # OMAP2 clock rate set data (old "OPP" data)
 obj-$(CONFIG_SOC_OMAP2420)		+= opp2420_data.o

Signature · 1 line

1.7.9.5

Felipe Balbi

2014-01-10 16:14 UTC #2 lore raw

PATCH 1/2 ARM: DRA7XX/AM43XX: randconfig fixes

Quoted 6 lines · Tero Kristo

DRA7XX and AM43XX were missing common clock code from the Makefile, which causes build breakage in DRA7XX / AM43XX only builds once clock support for these SoCs is added. Add the missing entries to the Makefile as preparation of this.
Signed-off-by Tero Kristo <[email protected]>

Reviewed-by Felipe Balbi <[email protected]>

Signature · 8 lines

balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140110/68bcb17c/attachment.sig>

Tero Kristo

author

2014-01-10 09:57 UTC #3 lore raw

PATCH 2/2 ARM: DRA7XX: Add support for DRA7XX only build

In reply to Tero Kristo

SOC_DRA7XX was under wrong menu within Kconfig file, which prevented DRA7XX only build. Fixed the kconfig options for this SoC as we are there. voltage.c needs to be added to the DRA7XX build also, otherwise DRA7XX only build will fail.

Signed-off-by Tero Kristo <[email protected]>

---
 arch/arm/mach-omap2/Kconfig  |   18 ++++++++++--------
 arch/arm/mach-omap2/Makefile |    1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

arch/arm/mach-omap2/Kconfig +10 -8

index dc21df1..e65948a 100644
@@ -76,6 +76,16 @@ config SOC_AM43XX
 	select ARM_GIC
 	select MACH_OMAP_GENERIC
 
+config SOC_DRA7XX
+	bool "TI DRA7XX"
+	depends on ARCH_MULTI_V7
+	select ARCH_OMAP2PLUS
+	select ARM_CPU_SUSPEND if PM
+	select ARM_GIC
+	select CPU_V7
+	select HAVE_SMP
+	select HAVE_ARM_ARCH_TIMER
+
 config ARCH_OMAP2PLUS
 	bool
 	select ARCH_HAS_BANDGAP

@@ -128,14 +138,6 @@ config SOC_HAS_REALTIME_COUNTER
 	depends on SOC_OMAP5 || SOC_DRA7XX
 	default y
 
-config SOC_DRA7XX
-	bool "TI DRA7XX"
-	select ARM_ARCH_TIMER
-	select CPU_V7
-	select ARM_GIC
-	select HAVE_SMP
-	select COMMON_CLK
-
 comment "OMAP Core Type"
 	depends on ARCH_OMAP2

arch/arm/mach-omap2/Makefile +1 -0

index 96a990f..8ebe9f3 100644
@@ -132,6 +132,7 @@ obj-$(CONFIG_SOC_AM33XX)		+= $(voltagedomain-common)
 obj-$(CONFIG_SOC_AM43XX)		+= $(voltagedomain-common)
 obj-$(CONFIG_SOC_OMAP5)			+= $(voltagedomain-common)
 obj-$(CONFIG_SOC_OMAP5)                += voltagedomains54xx_data.o
+obj-$(CONFIG_SOC_DRA7XX)		+= $(voltagedomain-common)
 
 # OMAP powerdomain framework
 powerdomain-common			+= powerdomain.o powerdomain-common.o

Signature · 1 line

1.7.9.5

Felipe Balbi

2014-01-10 16:15 UTC #4 lore raw

PATCH 2/2 ARM: DRA7XX: Add support for DRA7XX only build

Quoted 6 lines · Tero Kristo

SOC_DRA7XX was under wrong menu within Kconfig file, which prevented DRA7XX only build. Fixed the kconfig options for this SoC as we are there. voltage.c needs to be added to the DRA7XX build also, otherwise DRA7XX only build will fail.
Signed-off-by Tero Kristo <[email protected]>

one comment below, other than that:

Reviewed-by Felipe Balbi <[email protected]>

Quoted 27 lines

---
 arch/arm/mach-omap2/Kconfig  |   18 ++++++++++--------
 arch/arm/mach-omap2/Makefile |    1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

arch/arm/mach-omap2/Kconfig +10 -0

index dc21df1..e65948a 100644
@@ -76,6 +76,16 @@ config SOC_AM43XX
 	select ARM_GIC
 	select MACH_OMAP_GENERIC
 
+config SOC_DRA7XX
+	bool "TI DRA7XX"
+	depends on ARCH_MULTI_V7
+	select ARCH_OMAP2PLUS
+	select ARM_CPU_SUSPEND if PM
+	select ARM_GIC
+	select CPU_V7
+	select HAVE_SMP
+	select HAVE_ARM_ARCH_TIMER
+
 config ARCH_OMAP2PLUS
 	bool
 	select ARCH_HAS_BANDGAP

arch/arm/mach-omap2/Kconfig config SOC_HAS_REALTIME_COUNTER · line 137

Quoted 10 lines

arch/arm/mach-omap2/Kconfig +0 -7

@@ -128,14 +138,6 @@ config SOC_HAS_REALTIME_COUNTER
 	depends on SOC_OMAP5 || SOC_DRA7XX
 	default y
 
-config SOC_DRA7XX
-	bool "TI DRA7XX"
-	select ARM_ARCH_TIMER
-	select CPU_V7
-	select ARM_GIC
-	select HAVE_SMP
-	select COMMON_CLK

seems like you lost COMMON_CLK when moving this up, was that on purpose?

Signature · 8 lines

balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140110/b3eec463/attachment.sig>

Tero Kristo

author

2014-01-10 16:32 UTC #5 lore raw

PATCH 2/2 ARM: DRA7XX: Add support for DRA7XX only build

Quoted 42 lines · Felipe Balbi

Quoted 6 lines · Tero Kristo
SOC_DRA7XX was under wrong menu within Kconfig file, which prevented DRA7XX only build. Fixed the kconfig options for this SoC as we are there. voltage.c needs to be added to the DRA7XX build also, otherwise DRA7XX only build will fail.
Signed-off-by Tero Kristo <[email protected]>
one comment below, other than that:
Reviewed-by Felipe Balbi <[email protected]>
Quoted 30 lines
---
  arch/arm/mach-omap2/Kconfig  |   18 ++++++++++--------
  arch/arm/mach-omap2/Makefile |    1 +
  2 files changed, 11 insertions(+), 8 deletions(-)
arch/arm/mach-omap2/Kconfig +10 -0
index dc21df1..e65948a 100644
@@ -76,6 +76,16 @@ config SOC_AM43XX
  	select ARM_GIC
  	select MACH_OMAP_GENERIC
 
+config SOC_DRA7XX
+	bool "TI DRA7XX"
+	depends on ARCH_MULTI_V7
+	select ARCH_OMAP2PLUS
+	select ARM_CPU_SUSPEND if PM
+	select ARM_GIC
+	select CPU_V7
+	select HAVE_SMP
+	select HAVE_ARM_ARCH_TIMER
+
  config ARCH_OMAP2PLUS
  	bool
  	select ARCH_HAS_BANDGAP
@@ -128,14 +138,6 @@ config SOC_HAS_REALTIME_COUNTER
  	depends on SOC_OMAP5 || SOC_DRA7XX
  	default y
 

Quoted 10 lines

arch/arm/mach-omap2/Kconfig config SOC_HAS_REALTIME_COUNTER · line 137
Quoted 7 lines
arch/arm/mach-omap2/Kconfig +0 -7
-config SOC_DRA7XX
-	bool "TI DRA7XX"
-	select ARM_ARCH_TIMER
-	select CPU_V7
-	select ARM_GIC
-	select HAVE_SMP
-	select COMMON_CLK
seems like you lost COMMON_CLK when moving this up, was that on purpose?

Yes. It comes through ARCH_OMAP2PLUS which is now selected.

-Tero

Felipe Balbi

2014-01-13 16:24 UTC #6 lore raw

cover ARM: DRA7XX/AM43XX build fixes

In reply to Tero Kristo

Quoted 7 lines · Tero Kristo

The move of clock code from mach-omap2 to drivers/clk/ti introduces a couple of new build errors with AM43XX/DRA7XX only builds. The following patches address these issues by modifying the Kconfig + Makefile under mach-omap2.
Also, it seems DRA7XX only build is not possible at the moment, added patch #2 to fix this.

looks like we still need some extra patches since OMAP2-only builds still fail :-(

Also omap1_defconfig fails miserably :-(

hoping this can still get fixed in time for 3.14 :-s

cheers

Signature · 8 lines

balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140113/2e974c57/attachment.sig>

Tero Kristo

author

2014-01-13 17:13 UTC #7 lore raw

cover ARM: DRA7XX/AM43XX build fixes

Quoted 9 lines · Felipe Balbi

Quoted 7 lines · Tero Kristo
The move of clock code from mach-omap2 to drivers/clk/ti introduces a couple of new build errors with AM43XX/DRA7XX only builds. The following patches address these issues by modifying the Kconfig + Makefile under mach-omap2.
Also, it seems DRA7XX only build is not possible at the moment, added patch #2 to fix this.

Quoted 6 lines

looks like we still need some extra patches since OMAP2-only builds still fail :-(
Also omap1_defconfig fails miserably :-(
hoping this can still get fixed in time for 3.14 :-s

Yeah, should be simple enough to fix those... Will look at these tomorrow.

Just wondering, who cares about omap1 / omap2 anyway these days? :) Basically I overlooked both with the Makefile setup I did.

-Tero