Mark A. Greer wrote:

Add support for the DA830/OMAP-L137 Evaluation Module (EVM
from TI.  The EVM has User Interface (UI) and Audio cards
that can be connected that contain various devices.
Support for those devices and ones on the EVM will be
added in subsequent patches.

Signed-off-by: Mark A. Greer <[email protected]>

[...]

diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S 
b/arch/arm/mach-davinci/include/mach/debug-macro.S
index de3fc21..c45a8ad 100644
--- a/arch/arm/mach-davinci/include/mach/debug-macro.S
+++ b/arch/arm/mach-davinci/include/mach/debug-macro.S
@@ -24,7 +24,14 @@
                tst     \rx, #1                 @ MMU enabled?
                moveq   \rx, #0x01000000        @ physical base address
                movne   \rx, #0xfe000000        @ virtual base
+#if defined(CONFIG_ARCH_DAVINCI_DA830_EVM) && defined(CONFIG_ARCH_DAVINCI_TRUE)

There are no such config. option as CONFIG_ARCH_DAVINCI_DA830_EVM and you've renamed CONFIG_ARCH_DAVINCI_TRUE to CONFIG_ARCH_DAVINCI_DMx.

+#error Cannot enable DaVinci and DA830 platforms concurrently
+#elif defined(CONFIG_MACH_DAVINCI_DA830_EVM)
+               orr     \rx, \rx, #0x00d00000   @ physical base address
+               orr     \rx, \rx, #0x0000d000   @ physical base address
+#else
                orr     \rx, \rx, #0x00c20000   @ UART 0
+#endif

WBR, Sergei

_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Reply via email to