aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHector Oron <hector.oron@gmail.com>2012-02-20 18:09:28 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-16 03:54:50 -0400
commit33076883bc45bfdd5fa5c9bff7f012a460719aba (patch)
tree1ec9aa2b7a428cef4fa3771fdd7f740bcf14aad0
parentd5be0d73ab8655e785ae49e4f19bf031a938b336 (diff)
ARM: i.MX: efikamx: match machine descriptions with legacy
Rename machine descriptions to match legacy descriptions distributed by manufacturer BSP. This way distributions can do clean upgrades from userspace scripts which check for these values to differentiate platforms with single kernel binaries. Signed-off-by: Hector Oron <hector.oron@gmail.com> Acked-by: Matt Sealey <matt@genesi-usa.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/mach-mx51_efikamx.c3
-rw-r--r--arch/arm/mach-imx/mach-mx51_efikasb.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-mx51_efikamx.c b/arch/arm/mach-imx/mach-mx51_efikamx.c
index 586e9f822124..86e96ef11f9d 100644
--- a/arch/arm/mach-imx/mach-mx51_efikamx.c
+++ b/arch/arm/mach-imx/mach-mx51_efikamx.c
@@ -284,8 +284,7 @@ static struct sys_timer mx51_efikamx_timer = {
284 .init = mx51_efikamx_timer_init, 284 .init = mx51_efikamx_timer_init,
285}; 285};
286 286
287MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop") 287MACHINE_START(MX51_EFIKAMX, "Genesi Efika MX (Smarttop)")
288 /* Maintainer: Amit Kucheria <amit.kucheria@linaro.org> */
289 .atag_offset = 0x100, 288 .atag_offset = 0x100,
290 .map_io = mx51_map_io, 289 .map_io = mx51_map_io,
291 .init_early = imx51_init_early, 290 .init_early = imx51_init_early,
diff --git a/arch/arm/mach-imx/mach-mx51_efikasb.c b/arch/arm/mach-imx/mach-mx51_efikasb.c
index 24aded9e109f..88f837a6cc76 100644
--- a/arch/arm/mach-imx/mach-mx51_efikasb.c
+++ b/arch/arm/mach-imx/mach-mx51_efikasb.c
@@ -280,7 +280,7 @@ static struct sys_timer mx51_efikasb_timer = {
280 .init = mx51_efikasb_timer_init, 280 .init = mx51_efikasb_timer_init,
281}; 281};
282 282
283MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook") 283MACHINE_START(MX51_EFIKASB, "Genesi Efika MX (Smartbook)")
284 .atag_offset = 0x100, 284 .atag_offset = 0x100,
285 .map_io = mx51_map_io, 285 .map_io = mx51_map_io,
286 .init_early = imx51_init_early, 286 .init_early = imx51_init_early,