All of lore.kernel.org
 help / color / mirror / Atom feed
From: nicolas.pitre@linaro.org (Nicolas Pitre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 46/52] ARM: mach-u300: convert boot_params to atag_offset
Date: Tue, 05 Jul 2011 22:47:31 -0400	[thread overview]
Message-ID: <1309920457-21913-46-git-send-email-nicolas.pitre@linaro.org> (raw)
In-Reply-To: <1309920457-21913-1-git-send-email-nicolas.pitre@linaro.org>

Someone was smoking good stuff with CONFIG_MACH_U300_2MB_ALIGNMENT_FIX here...

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
---
 arch/arm/mach-u300/include/mach/memory.h |    8 ++++----
 arch/arm/mach-u300/u300.c                |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-u300/include/mach/memory.h b/arch/arm/mach-u300/include/mach/memory.h
index 888e2e3..f98acd9 100644
--- a/arch/arm/mach-u300/include/mach/memory.h
+++ b/arch/arm/mach-u300/include/mach/memory.h
@@ -16,7 +16,7 @@
 #ifdef CONFIG_MACH_U300_DUAL_RAM
 
 #define PLAT_PHYS_OFFSET		UL(0x48000000)
-#define BOOT_PARAMS_OFFSET	(PHYS_OFFSET + 0x100)
+#define BOOT_PARAMS_OFFSET		0x100
 
 #else
 
@@ -24,14 +24,14 @@
 #define PLAT_PHYS_OFFSET (0x28000000 + \
 	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE - \
 	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)
+#define BOOT_PARAMS_OFFSET (0x100 + \
+	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1)*1024*1024*2)
 #else
 #define PLAT_PHYS_OFFSET (0x28000000 + \
 	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE +	\
 	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)
+#define BOOT_PARAMS_OFFSET 0x100
 #endif
-#define BOOT_PARAMS_OFFSET (0x28000000 + \
-	    (CONFIG_MACH_U300_ACCESS_MEM_SIZE +		\
-	    (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024 + 0x100)
 #endif
 
 /*
diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c
index 48b3b7f..80e7305 100644
--- a/arch/arm/mach-u300/u300.c
+++ b/arch/arm/mach-u300/u300.c
@@ -61,7 +61,7 @@ static void __init u300_init_machine(void)
 
 MACHINE_START(U300, MACH_U300_STRING)
 	/* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */
-	.boot_params	= BOOT_PARAMS_OFFSET,
+	.atag_offset	= BOOT_PARAMS_OFFSET,
 	.map_io		= u300_map_io,
 	.reserve	= u300_reserve,
 	.init_irq	= u300_init_irq,
-- 
1.7.4

  parent reply	other threads:[~2011-07-06  2:47 UTC|newest]

Thread overview: 81+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-06  2:46 [PATCH 01/52] ARM: introduce atag_offset to replace boot_params Nicolas Pitre
2011-07-06  2:46 ` [PATCH 02/52] ARM: mach-clps711x: convert boot_params to atag_offset Nicolas Pitre
2011-07-06  2:46 ` [PATCH 03/52] ARM: mach-cns3xxx: " Nicolas Pitre
2011-07-06  2:46 ` [PATCH 04/52] ARM: mach-davinci: " Nicolas Pitre
2011-07-06  2:46 ` [PATCH 05/52] ARM: mach-dove: convert boot-params " Nicolas Pitre
2011-07-06  2:46 ` [PATCH 06/52] ARM: mach-ebsa110: convert boot_params " Nicolas Pitre
2011-07-06  2:46 ` [PATCH 07/52] ARM: mach-ep93xx: " Nicolas Pitre
2011-07-07 16:32   ` H Hartley Sweeten
2011-07-07 16:59     ` Nicolas Pitre
2011-07-07 17:20       ` H Hartley Sweeten
2011-07-07 18:20         ` Nicolas Pitre
2011-07-06  2:46 ` [PATCH 08/52] ARM: mach-exynos4: " Nicolas Pitre
2011-07-06  2:46 ` [PATCH 09/52] ARM: mach-footbridge: " Nicolas Pitre
2011-07-06  2:46 ` [PATCH 10/52] ARM: mach-gemini: " Nicolas Pitre
2011-07-06  2:46 ` [PATCH 11/52] ARM: mach-h720x: " Nicolas Pitre
2011-07-06  2:46 ` [PATCH 12/52] ARM: mach-imx: " Nicolas Pitre
2011-07-06  2:46 ` [PATCH 13/52] ARM: mach-integrator: " Nicolas Pitre
2011-07-06  2:46 ` [PATCH 14/52] ARM: mach-iop13xx: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 15/52] ARM: mach-iop32x: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 16/52] ARM: mach-iop33x: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 17/52] ARM: mach-ixp2000: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 18/52] ARM: mach-ixp23xx: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 19/52] ARM: mach-ixp4xx: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 20/52] ARM: mach-kirkwood: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 21/52] ARM: mach-ks8695: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 22/52] ARM: mach-loki: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 23/52] ARM: mach-lpc32xx: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 24/52] ARM: mach-msm: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 25/52] ARM: mach-mv78xx0: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 26/52] ARM: mach-mx5: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 27/52] ARM: mach-netx: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 28/52] ARM: mach-nomadik: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 29/52] ARM: mach-nuc93x: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 30/52] ARM: mach-omap1: " Nicolas Pitre
2011-07-07 14:28   ` Tony Lindgren
2011-07-06  2:47 ` [PATCH 31/52] ARM: mach-omap2: " Nicolas Pitre
2011-07-07 14:28   ` Tony Lindgren
2011-07-07 15:35     ` Nicolas Pitre
2011-07-06  2:47 ` [PATCH 32/52] ARM: mach-orion5x: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 33/52] ARM: mach-pnx4008: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 34/52] ARM: mach-pxa: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 35/52] ARM: mach-realview: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 36/52] ARM: mach-rpc: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 37/52] ARM: mach-s3c24*: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 38/52] ARM: mach-s5p64x0: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 39/52] ARM: mach-s3c64xx: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 40/52] ARM: mach-s5pc100, mach-s5pv210: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 41/52] ARM: mach-sa1100: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 42/52] ARM: mach-shark: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 43/52] ARM: mach-spear*: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 44/52] ARM: mach-tcc8k: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 45/52] ARM: mach-tegra: " Nicolas Pitre
2011-07-06  2:47 ` Nicolas Pitre [this message]
2011-07-08 13:12   ` [PATCH 46/52] ARM: mach-u300: " Linus Walleij
2011-07-08 21:20     ` Russell King - ARM Linux
2011-07-06  2:47 ` [PATCH 47/52] ARM: mach-ux500: convert boot-params " Nicolas Pitre
2011-07-08 13:18   ` Linus Walleij
2011-07-06  2:47 ` [PATCH 48/52] ARM: mach-versatile: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 49/52] ARM: vexpress: convert boot_params " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 50/52] ARM: mach-vt8500: " Nicolas Pitre
2011-07-06  2:47 ` [PATCH 51/52] ARM: mach-w90x900: remove useless boot_params entries Nicolas Pitre
2011-07-06  2:47 ` [PATCH 52/52] ARM: remove boot_params from struct machine_desc Nicolas Pitre
2011-07-06  4:28 ` [PATCH 01/52] ARM: introduce atag_offset to replace boot_params Stephen Boyd
2011-07-06 12:54   ` Nicolas Pitre
2011-07-06 17:59     ` Stephen Boyd
2011-07-07  0:43 ` H Hartley Sweeten
2011-07-07  4:04   ` Nicolas Pitre
2011-07-07 18:28     ` H Hartley Sweeten
2011-07-07 11:37 ` Sergei Shtylyov
2011-07-07 15:37   ` Nicolas Pitre
2011-07-07 15:45 ` Arnd Bergmann
2011-07-08 20:36 ` Russell King - ARM Linux
2011-07-08 21:20   ` Nicolas Pitre
2011-07-11 14:59     ` Nicolas Pitre
2011-07-11 17:17       ` H Hartley Sweeten
2011-07-12 20:48         ` Petr Štetiar
2011-07-12 21:39           ` H Hartley Sweeten
2011-07-15  6:48             ` Petr Štetiar
2011-07-15 22:40               ` H Hartley Sweeten
2011-07-16  2:44                 ` Nicolas Pitre
2011-07-13  3:22           ` Nicolas Pitre

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1309920457-21913-46-git-send-email-nicolas.pitre@linaro.org \
    --to=nicolas.pitre@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.