Skip to contentSkip to conversation

ARM: OMAP: Set default OMAP2_CTRL_BASE for OMAP1

PATCH In review Dirk Behme 2 participants 2 messages Sep 18, 2007 – Oct 1, 2007

lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

PATCH 1/1 ARM: OMAP: Set default OMAP2_CTRL_BASE for OMAP1

In case no OMAP2_CTRL_BASE is set, set default one to fix compilation errors e.g. for OMAP1.

Signed-off-by Dirk Behme <[email protected]>
include/asm-arm/arch-omap/omap24xx.h +5 -0
Index: linux-osk/include/asm-arm/arch-omap/omap24xx.h
===================================================================
@@ -103,6 +103,11 @@
 
 #endif
 
+#if !defined(OMAP2_CTRL_BASE)
+/* If no one of the above configs is selected, use default */
+#define OMAP2_CTRL_BASE		L4_24XX_BASE
+#endif
+
 /* Control module */
 #define OMAP2_CONTROL_DEVCONF0	(OMAP2_CTRL_BASE + 0x274)
 #define OMAP2_CONTROL_DEVCONF1	(OMAP2_CTRL_BASE + 0x2e8)
#1 lore raw
Quoted 12 lines · Dirk Behme

In case no OMAP2_CTRL_BASE is set, set default one to fix compilation errors e.g. for OMAP1.

Signed-off-by Dirk Behme <[email protected]>

Index: linux-osk/include/asm-arm/arch-omap/omap24xx.h
===================================================================

include/asm-arm/arch-omap/omap24xx.h +0 -0
@@ -103,6 +103,11 @@

include/asm-arm/arch-omap/omap24xx.h line 113

Quoted 10 lines
include/asm-arm/arch-omap/omap24xx.h +5 -0
 #endif
 
+#if !defined(OMAP2_CTRL_BASE)
+/* If no one of the above configs is selected, use default */
+#define OMAP2_CTRL_BASE		L4_24XX_BASE
+#endif
+
 /* Control module */
 #define OMAP2_CONTROL_DEVCONF0	(OMAP2_CTRL_BASE + 0x274)
 #define OMAP2_CONTROL_DEVCONF1	(OMAP2_CTRL_BASE + 0x2e8)

Just for reference, this should not be needed any longer AFAIK.

Tony