| Message ID | 1247067535-7997-3-git-send-email-khilman@deeprootsystems.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Hello. Kevin Hilman wrote: > Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> > [...] > diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S > index 69837a6..642f000 100644 > --- a/arch/arm/mach-davinci/include/mach/debug-macro.S > +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S > @@ -26,7 +26,7 @@ > movne \rx, #0xfe000000 @ virtual base > #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) > #error Cannot enable DaVinci and DA8XX platforms concurrently > -#elif defined(CONFIG_MACH_DAVINCI_DA8XX_EVM) > +#elif defined(CONFIG_ARCH_DAVINCI_DA8XX) > Er, debug UART depends on the board, not SoC. And this change is not related to the mach-type name change. > orr \rx, \rx, #0x00d00000 @ physical base address > orr \rx, \rx, #0x0000d000 @ of UART 2 > #else WBR, Sergei
Sergei Shtylyov <sshtylyov@ru.mvista.com> writes: > Hello. > > Kevin Hilman wrote: > >> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> >> > > [...] > >> diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S >> index 69837a6..642f000 100644 >> --- a/arch/arm/mach-davinci/include/mach/debug-macro.S >> +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S >> @@ -26,7 +26,7 @@ >> movne \rx, #0xfe000000 @ virtual base >> #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) >> #error Cannot enable DaVinci and DA8XX platforms concurrently >> -#elif defined(CONFIG_MACH_DAVINCI_DA8XX_EVM) >> +#elif defined(CONFIG_ARCH_DAVINCI_DA8XX) >> > > Er, debug UART depends on the board, not SoC. True, but so far both da8xx EVMs use the same UART, so I removed the board-specific parts making it SoC specific. If we need to eventually make this board-specific, I'd rather not do it with #ifdefs. But I get your point, and you're right. For this series, I should just do a da8xx-->da830 change and save the other change for a later patch. Will update. BTW, this this boot for you? I don't have a da830 EVM. Thanks, Kevin
On Thu, Jul 09, 2009 at 07:44:34AM -0700, Kevin Hilman wrote: > Sergei Shtylyov <sshtylyov@ru.mvista.com> writes: > > > Hello. > > > > Kevin Hilman wrote: > > > >> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> > >> > > > > [...] > > > >> diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S > >> index 69837a6..642f000 100644 > >> --- a/arch/arm/mach-davinci/include/mach/debug-macro.S > >> +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S > >> @@ -26,7 +26,7 @@ > >> movne \rx, #0xfe000000 @ virtual base > >> #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) > >> #error Cannot enable DaVinci and DA8XX platforms concurrently > >> -#elif defined(CONFIG_MACH_DAVINCI_DA8XX_EVM) > >> +#elif defined(CONFIG_ARCH_DAVINCI_DA8XX) > >> > > > > Er, debug UART depends on the board, not SoC. > > True, but so far both da8xx EVMs use the same UART, so I removed > the board-specific parts making it SoC specific. > > If we need to eventually make this board-specific, I'd rather not do it > with #ifdefs. Yes, the '_EVM' was very intentional but you do have a good point. Mark --
"Mark A. Greer" <mgreer@mvista.com> writes: > On Thu, Jul 09, 2009 at 07:44:34AM -0700, Kevin Hilman wrote: >> Sergei Shtylyov <sshtylyov@ru.mvista.com> writes: >> >> > Hello. >> > >> > Kevin Hilman wrote: >> > >> >> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> >> >> >> > >> > [...] >> > >> >> diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S >> >> index 69837a6..642f000 100644 >> >> --- a/arch/arm/mach-davinci/include/mach/debug-macro.S >> >> +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S >> >> @@ -26,7 +26,7 @@ >> >> movne \rx, #0xfe000000 @ virtual base >> >> #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) >> >> #error Cannot enable DaVinci and DA8XX platforms concurrently >> >> -#elif defined(CONFIG_MACH_DAVINCI_DA8XX_EVM) >> >> +#elif defined(CONFIG_ARCH_DAVINCI_DA8XX) >> >> >> > >> > Er, debug UART depends on the board, not SoC. >> >> True, but so far both da8xx EVMs use the same UART, so I removed >> the board-specific parts making it SoC specific. >> >> If we need to eventually make this board-specific, I'd rather not do it >> with #ifdefs. > > Yes, the '_EVM' was very intentional but you do have a good point. > ok, I put it back in v2 so that patch now just does a simple name change. Kevin
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 0409eb6..9185a70 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -116,7 +116,7 @@ static void __init da830_evm_map_io(void) da830_init(); } -MACHINE_START(DAVINCI_DA8XX_EVM, "DaVinci DA830/OMAP L137 EVM") +MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP L137 EVM") .phys_io = IO_PHYS, .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc, .boot_params = (DA8XX_DDR_BASE + 0x100), diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S index 69837a6..642f000 100644 --- a/arch/arm/mach-davinci/include/mach/debug-macro.S +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S @@ -26,7 +26,7 @@ movne \rx, #0xfe000000 @ virtual base #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) #error Cannot enable DaVinci and DA8XX platforms concurrently -#elif defined(CONFIG_MACH_DAVINCI_DA8XX_EVM) +#elif defined(CONFIG_ARCH_DAVINCI_DA8XX) orr \rx, \rx, #0x00d00000 @ physical base address orr \rx, \rx, #0x0000d000 @ of UART 2 #else diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h index 0f1f12b..46a0c31 100644 --- a/arch/arm/mach-davinci/include/mach/uncompress.h +++ b/arch/arm/mach-davinci/include/mach/uncompress.h @@ -21,7 +21,7 @@ static u32 *uart; static u32 *get_uart_base(void) { - if (__machine_arch_type == MACH_TYPE_DAVINCI_DA8XX_EVM) + if (__machine_arch_type == MACH_TYPE_DAVINCI_DA830_EVM) return (u32 *)DA8XX_UART2_BASE; else return (u32 *)DAVINCI_UART0_BASE;
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> --- arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/include/mach/debug-macro.S | 2 +- arch/arm/mach-davinci/include/mach/uncompress.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)