From b67866d36060766d58603f59b67b238e9825263e Mon Sep 17 00:00:00 2001 From: Markinus Date: Fri, 27 Aug 2010 16:01:33 +0200 Subject: [PATCH] config: add memory offset config parameter --- arch/arm/mach-msm/Kconfig | 5 +++++ arch/arm/mach-msm/board-htcleo.c | 2 +- arch/arm/mach-msm/include/mach/memory.h | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 5a464fda..8fed8f6e 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -1043,3 +1043,8 @@ config MSM_SSBI help Enable support for SSBI bus. This is required for communicatinig with Qualcomm PMICs and Audio codecs. + +config PHYS_OFFSET + hex + depends on MACH_HTCLEO + default "0x11800000" if MACH_HTCLEO diff --git a/arch/arm/mach-msm/board-htcleo.c b/arch/arm/mach-msm/board-htcleo.c index f7162b13..ebd1c99c 100644 --- a/arch/arm/mach-msm/board-htcleo.c +++ b/arch/arm/mach-msm/board-htcleo.c @@ -146,7 +146,7 @@ MACHINE_START(HTCLEO, "htcleo") .phys_io = MSM_DEBUG_UART_PHYS, .io_pg_offst = ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc, #endif - .boot_params = 0x11800100, + .boot_params = (CONFIG_PHYS_OFFSET + 0x00000100), .fixup = htcleo_fixup, .map_io = htcleo_map_io, .init_irq = msm_init_irq, diff --git a/arch/arm/mach-msm/include/mach/memory.h b/arch/arm/mach-msm/include/mach/memory.h index c3fc4bee..03aafb89 100644 --- a/arch/arm/mach-msm/include/mach/memory.h +++ b/arch/arm/mach-msm/include/mach/memory.h @@ -17,7 +17,9 @@ #define __ASM_ARCH_MEMORY_H /* physical offset of RAM */ -#if defined(CONFIG_ARCH_QSD8X50) +#if defined(CONFIG_PHYS_OFFSET) +#define PHYS_OFFSET UL(CONFIG_PHYS_OFFSET) +#elif defined(CONFIG_ARCH_QSD8X50) #define PHYS_OFFSET UL(0x20000000) #elif defined(CONFIG_ARCH_MSM7225) #define PHYS_OFFSET UL(0x02E00000)