From patchwork Mon Sep 12 04:39:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 4017 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id BD66D23FA0 for ; Mon, 12 Sep 2011 04:42:53 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id A1165A18683 for ; Mon, 12 Sep 2011 04:42:53 +0000 (UTC) Received: by fxe23 with SMTP id 23so1278080fxe.11 for ; Sun, 11 Sep 2011 21:42:53 -0700 (PDT) Received: by 10.223.63.8 with SMTP id z8mr2687113fah.84.1315802573454; Sun, 11 Sep 2011 21:42:53 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.11.8 with SMTP id m8cs89347lab; Sun, 11 Sep 2011 21:42:53 -0700 (PDT) Received: by 10.68.58.6 with SMTP id m6mr1573315pbq.215.1315802571537; Sun, 11 Sep 2011 21:42:51 -0700 (PDT) Received: from mail-pz0-f45.google.com (mail-pz0-f45.google.com [209.85.210.45]) by mx.google.com with ESMTPS id g1si14597158pbl.32.2011.09.11.21.42.50 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Sep 2011 21:42:51 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.45 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.210.45; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.45 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) smtp.mail=tushar.behera@linaro.org Received: by pzk33 with SMTP id 33so7056803pzk.32 for ; Sun, 11 Sep 2011 21:42:50 -0700 (PDT) Received: by 10.68.15.39 with SMTP id u7mr3162879pbc.476.1315802569207; Sun, 11 Sep 2011 21:42:49 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id e8sm40331677pbc.8.2011.09.11.21.42.45 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Sep 2011 21:42:48 -0700 (PDT) From: Tushar Behera To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, linaro-dev@lists.linaro.org, patches@linaro.org, Nicolas Pitre Subject: [PATCH] ARM: EXYNOS4: convert boot_params to atag_offset Date: Mon, 12 Sep 2011 10:09:09 +0530 Message-Id: <1315802349-3892-1-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.4.1 Based on "ARM: introduce atag_offset to replace boot_params" by Nicolas Pitre (2bb9839e312ed55a6d5824ffa6077ce3d7d63b1e). Since boot_params variable is deleted from machine_desc, the variable is modified in the newer board files. CC: Nicolas Pitre Signed-off-by: Tushar Behera --- This is required when Kukjin's for-next branch is merged with Russell's devel-stable branch. Nicolas's patchset already has changes for other EXYNSO4 based boards. arch/arm/mach-exynos4/mach-origen.c | 2 +- arch/arm/mach-exynos4/mach-smdk4212.c | 2 +- arch/arm/mach-exynos4/mach-smdkv310.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos4/mach-origen.c b/arch/arm/mach-exynos4/mach-origen.c index ed59f86..b5f6f38 100644 --- a/arch/arm/mach-exynos4/mach-origen.c +++ b/arch/arm/mach-exynos4/mach-origen.c @@ -100,7 +100,7 @@ static void __init origen_machine_init(void) MACHINE_START(ORIGEN, "ORIGEN") /* Maintainer: JeongHyeon Kim */ - .boot_params = S5P_PA_SDRAM + 0x100, + .atag_offset = 0x100, .init_irq = exynos4_init_irq, .map_io = origen_map_io, .init_machine = origen_machine_init, diff --git a/arch/arm/mach-exynos4/mach-smdk4212.c b/arch/arm/mach-exynos4/mach-smdk4212.c index 3479a93..8c41ae1 100644 --- a/arch/arm/mach-exynos4/mach-smdk4212.c +++ b/arch/arm/mach-exynos4/mach-smdk4212.c @@ -284,7 +284,7 @@ static void __init smdk4212_machine_init(void) MACHINE_START(SMDK4212, "SMDK4212") /* Maintainer: Kukjin Kim */ - .boot_params = S5P_PA_SDRAM + 0x100, + .atag_offset = 0x100, .init_irq = exynos4_init_irq, .map_io = smdk4212_map_io, .init_machine = smdk4212_machine_init, diff --git a/arch/arm/mach-exynos4/mach-smdkv310.c b/arch/arm/mach-exynos4/mach-smdkv310.c index 57cf632..7ce4d8b 100644 --- a/arch/arm/mach-exynos4/mach-smdkv310.c +++ b/arch/arm/mach-exynos4/mach-smdkv310.c @@ -344,7 +344,7 @@ MACHINE_END MACHINE_START(SMDKC210, "SMDKC210") /* Maintainer: Kukjin Kim */ - .boot_params = S5P_PA_SDRAM + 0x100, + .atag_offset = 0x100, .init_irq = exynos4_init_irq, .map_io = smdkv310_map_io, .init_machine = smdkv310_machine_init,