diff mbox

[2/5] ARM: davinci: da850, omapl138: share boot_params

Message ID 4b305c5bad3d09ba46420ae9a440efb2c7fb88ba.1313702401.git.bengardiner@nanometrics.ca (mailing list archive)
State Rejected
Headers show

Commit Message

Ben Gardiner Aug. 18, 2011, 9:50 p.m. UTC 
Extract the value of .boot_params used by the da850/omapl138 machines to
a common DA850_REFERENCE_BOOT_PARAMS defined in the da850-reference.h
header introduced in a previous commit.

Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Reviewed-by: James Nuss <jamesnuss@nanometrics.ca>
---
 arch/arm/mach-davinci/board-da850-evm.c            |    2 +-
 arch/arm/mach-davinci/board-mityomapl138.c         |    2 +-
 arch/arm/mach-davinci/board-omapl138-hawk.c        |    2 +-
 .../mach-davinci/include/mach/da850-reference.h    |    4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

Comments

Felipe Balbi Aug. 18, 2011, 9:56 p.m. UTC | #1 
Hi,

On Thu, Aug 18, 2011 at 05:50:48PM -0400, Ben Gardiner wrote:
> diff --git a/arch/arm/mach-davinci/include/mach/da850-reference.h b/arch/arm/mach-davinci/include/mach/da850-reference.h
> index d3beb13..6837a98 100644
> --- a/arch/arm/mach-davinci/include/mach/da850-reference.h
> +++ b/arch/arm/mach-davinci/include/mach/da850-reference.h
> @@ -9,6 +9,10 @@
>  #ifndef __ASM_ARCH_DAVINCI_DA850_REFERENCE_H
>  #define __ASM_ARCH_DAVINCI_DA850_REFERENCE_H
>  
> +#include <mach/memory.h>
> +
> +#define DA850_REFERENCE_BOOT_PARAMS (DA8XX_DDR_BASE + 0x100)

why don't you define this at the same location where DA8XX_DDR_BASE is
defined ??
diff mbox

Patch

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 3ee12f3..f707bb2 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -1259,7 +1259,7 @@  console_initcall(da850_evm_console_init);
 #endif
 
 MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")
-	.boot_params	= (DA8XX_DDR_BASE + 0x100),
+	.boot_params	= DA850_REFERENCE_BOOT_PARAMS,
 	.map_io		= da850_reference_map_io,
 	.init_irq	= cp_intc_init,
 	.timer		= &davinci_timer,
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index c256858..998cd2e 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -561,7 +561,7 @@  console_initcall(mityomapl138_console_init);
 #endif
 
 MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808")
-	.boot_params	= (DA8XX_DDR_BASE + 0x100),
+	.boot_params	= DA850_REFERENCE_BOOT_PARAMS,
 	.map_io		= da850_reference_map_io,
 	.init_irq	= cp_intc_init,
 	.timer		= &davinci_timer,
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index 5d556cf..cfad483 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -334,7 +334,7 @@  console_initcall(omapl138_hawk_console_init);
 #endif
 
 MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard")
-	.boot_params	= (DA8XX_DDR_BASE + 0x100),
+	.boot_params	= DA850_REFERENCE_BOOT_PARAMS,
 	.map_io		= da850_reference_map_io,
 	.init_irq	= cp_intc_init,
 	.timer		= &davinci_timer,
diff --git a/arch/arm/mach-davinci/include/mach/da850-reference.h b/arch/arm/mach-davinci/include/mach/da850-reference.h
index d3beb13..6837a98 100644
--- a/arch/arm/mach-davinci/include/mach/da850-reference.h
+++ b/arch/arm/mach-davinci/include/mach/da850-reference.h
@@ -9,6 +9,10 @@ 
 #ifndef __ASM_ARCH_DAVINCI_DA850_REFERENCE_H
 #define __ASM_ARCH_DAVINCI_DA850_REFERENCE_H
 
+#include <mach/memory.h>
+
+#define DA850_REFERENCE_BOOT_PARAMS (DA8XX_DDR_BASE + 0x100)
+
 void __init da850_reference_map_io(void);
 
 #endif /* __ASM_ARCH_DAVINCI_DA850_REFERENCE_H */