diff for duplicates of <87vcta7r9f.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index 6e3fd1f..1b70ce3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,47 +9,3 @@ merged the seris from Nico) so any board stuff we add is sure to do it correctly. Kevin - - ->From 4c5699a5feb1a037e1ae3147ca7d7e9fe3eb62c1 Mon Sep 17 00:00:00 2001 -From: Kevin Hilman <khilman@ti.com> -Date: Fri, 2 Sep 2011 11:00:12 -0700 -Subject: [PATCH] OMAP: convert new boards to atag_offset - -These boards were added after the bulk converson from boot_params to -atag_offset (queued for v3.2.) Fix them up. - -Signed-off-by: Kevin Hilman <khilman@ti.com> ---- - arch/arm/mach-omap2/board-omap3encore.c | 2 +- - arch/arm/mach-omap2/board-omap4pcm049.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/mach-omap2/board-omap3encore.c b/arch/arm/mach-omap2/board-omap3encore.c -index eb70fe1..07ed8ab 100644 ---- a/arch/arm/mach-omap2/board-omap3encore.c -+++ b/arch/arm/mach-omap2/board-omap3encore.c -@@ -338,7 +338,7 @@ static void __init omap_encore_init(void) - } - - MACHINE_START(ENCORE, "encore") -- .boot_params = 0x80000100, -+ .atag_offset = 0x100, - .reserve = omap_reserve, - .map_io = omap3_map_io, - .init_early = omap_encore_init_early, -diff --git a/arch/arm/mach-omap2/board-omap4pcm049.c b/arch/arm/mach-omap2/board-omap4pcm049.c -index d889110..260f2cb 100644 ---- a/arch/arm/mach-omap2/board-omap4pcm049.c -+++ b/arch/arm/mach-omap2/board-omap4pcm049.c -@@ -578,7 +578,7 @@ static void __init pcm049_map_io(void) - - MACHINE_START(PCM049, "phyCORE OMAP4") - /* Maintainer: Jan Weitzel - Phytec Messtechnik GmbH */ -- .boot_params = 0x80000100, -+ .atag_offset = 0x100, - .reserve = omap_reserve, - .map_io = pcm049_map_io, - .init_early = pcm049_init_early, --- -1.7.6 diff --git a/a/content_digest b/N1/content_digest index fcc4ec8..c8f9509 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,7 @@ - "From\0Kevin Hilman <khilman@ti.com>\0" + "From\0khilman@ti.com (Kevin Hilman)\0" "Subject\0testing-board branch: rebase to RMK's devel-stable?\0" "Date\0Fri, 02 Sep 2011 11:06:52 -0700\0" - "To\0Tony Lindgren <tony@atomide.com>\0" - "Cc\0linux-omap <linux-omap@vger.kernel.org>" - linux-arm-kernel <linux-arm-kernel@lists.infradead.org> - " Nicolas Pitre <nicolas.pitre@linaro.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Tony,\n" @@ -17,50 +14,6 @@ "merged the seris from Nico) so any board stuff we add is sure to do it\n" "correctly.\n" "\n" - "Kevin\n" - "\n" - "\n" - ">From 4c5699a5feb1a037e1ae3147ca7d7e9fe3eb62c1 Mon Sep 17 00:00:00 2001\n" - "From: Kevin Hilman <khilman@ti.com>\n" - "Date: Fri, 2 Sep 2011 11:00:12 -0700\n" - "Subject: [PATCH] OMAP: convert new boards to atag_offset\n" - "\n" - "These boards were added after the bulk converson from boot_params to\n" - "atag_offset (queued for v3.2.) Fix them up.\n" - "\n" - "Signed-off-by: Kevin Hilman <khilman@ti.com>\n" - "---\n" - " arch/arm/mach-omap2/board-omap3encore.c | 2 +-\n" - " arch/arm/mach-omap2/board-omap4pcm049.c | 2 +-\n" - " 2 files changed, 2 insertions(+), 2 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-omap2/board-omap3encore.c b/arch/arm/mach-omap2/board-omap3encore.c\n" - "index eb70fe1..07ed8ab 100644\n" - "--- a/arch/arm/mach-omap2/board-omap3encore.c\n" - "+++ b/arch/arm/mach-omap2/board-omap3encore.c\n" - "@@ -338,7 +338,7 @@ static void __init omap_encore_init(void)\n" - " }\n" - " \n" - " MACHINE_START(ENCORE, \"encore\")\n" - "-\t.boot_params\t= 0x80000100,\n" - "+\t.atag_offset\t= 0x100,\n" - " \t.reserve\t= omap_reserve,\n" - " \t.map_io\t\t= omap3_map_io,\n" - " \t.init_early\t= omap_encore_init_early,\n" - "diff --git a/arch/arm/mach-omap2/board-omap4pcm049.c b/arch/arm/mach-omap2/board-omap4pcm049.c\n" - "index d889110..260f2cb 100644\n" - "--- a/arch/arm/mach-omap2/board-omap4pcm049.c\n" - "+++ b/arch/arm/mach-omap2/board-omap4pcm049.c\n" - "@@ -578,7 +578,7 @@ static void __init pcm049_map_io(void)\n" - " \n" - " MACHINE_START(PCM049, \"phyCORE OMAP4\")\n" - " \t/* Maintainer: Jan Weitzel - Phytec Messtechnik GmbH */\n" - "-\t.boot_params\t= 0x80000100,\n" - "+\t.atag_offset\t= 0x100,\n" - " \t.reserve\t= omap_reserve,\n" - " \t.map_io\t\t= pcm049_map_io,\n" - " \t.init_early\t= pcm049_init_early,\n" - "-- \n" - 1.7.6 + Kevin -c4e8444b764c9a74214e6932e8ce34fca5a11d585dedc882aed49daa009c5cb1 +1ade4654302075fbf2b97d34048a8a537ac93c35486caf9bc55601890426e223
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.