aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorMatteo Facchinetti <matteo.facchinetti@sirius-es.it>2013-03-20 03:41:52 -0400
committerAnatolij Gustschin <agust@denx.de>2013-04-01 03:25:00 -0400
commitb9e7196ecdf6d7cd7a41b560e596c9af94413c05 (patch)
treed6b7a0a092c09daa32aa622803d185546ce5ea3b /arch/powerpc/platforms
parent534ada5ede3c9236f0bf3c5d77e0d060e66caa4f (diff)
powerpc/512x: move mpc5121_generic platform to mpc512x_generic.
This provides a base for using 512x_generic platform on mpc5125 boards. By this way 512x_GENERIC it could be used for all generic mpc512x boards and kernel could be compiled with mpc512x_defconfig. Signed-off-by: Matteo Facchinetti <matteo.facchinetti@sirius-es.it> [agust: applied s/mpc5121/mpc512x in mpc512x_generic.c] Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/512x/Kconfig8
-rw-r--r--arch/powerpc/platforms/512x/Makefile2
-rw-r--r--arch/powerpc/platforms/512x/mpc512x_generic.c (renamed from arch/powerpc/platforms/512x/mpc5121_generic.c)10
3 files changed, 10 insertions, 10 deletions
diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig
index c16999802ecf..eb4620355e7b 100644
--- a/arch/powerpc/platforms/512x/Kconfig
+++ b/arch/powerpc/platforms/512x/Kconfig
@@ -15,16 +15,16 @@ config MPC5121_ADS
15 help 15 help
16 This option enables support for the MPC5121E ADS board. 16 This option enables support for the MPC5121E ADS board.
17 17
18config MPC5121_GENERIC 18config MPC512x_GENERIC
19 bool "Generic support for simple MPC5121 based boards" 19 bool "Generic support for simple MPC512x based boards"
20 depends on PPC_MPC512x 20 depends on PPC_MPC512x
21 select DEFAULT_UIMAGE 21 select DEFAULT_UIMAGE
22 help 22 help
23 This option enables support for simple MPC5121 based boards 23 This option enables support for simple MPC512x based boards
24 which do not need custom platform specific setup. 24 which do not need custom platform specific setup.
25 25
26 Compatible boards include: Protonic LVT base boards (ZANMCU 26 Compatible boards include: Protonic LVT base boards (ZANMCU
27 and VICVT2). 27 and VICVT2), Freescale MPC5125 Tower system.
28 28
29config PDM360NG 29config PDM360NG
30 bool "ifm PDM360NG board" 30 bool "ifm PDM360NG board"
diff --git a/arch/powerpc/platforms/512x/Makefile b/arch/powerpc/platforms/512x/Makefile
index 4efc1c4b6fb5..72fb9340e09f 100644
--- a/arch/powerpc/platforms/512x/Makefile
+++ b/arch/powerpc/platforms/512x/Makefile
@@ -3,5 +3,5 @@
3# 3#
4obj-y += clock.o mpc512x_shared.o 4obj-y += clock.o mpc512x_shared.o
5obj-$(CONFIG_MPC5121_ADS) += mpc5121_ads.o mpc5121_ads_cpld.o 5obj-$(CONFIG_MPC5121_ADS) += mpc5121_ads.o mpc5121_ads_cpld.o
6obj-$(CONFIG_MPC5121_GENERIC) += mpc5121_generic.o 6obj-$(CONFIG_MPC512x_GENERIC) += mpc512x_generic.o
7obj-$(CONFIG_PDM360NG) += pdm360ng.o 7obj-$(CONFIG_PDM360NG) += pdm360ng.o
diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc512x_generic.c
index ca1ca6669990..d53fa4fdff26 100644
--- a/arch/powerpc/platforms/512x/mpc5121_generic.c
+++ b/arch/powerpc/platforms/512x/mpc512x_generic.c
@@ -4,7 +4,7 @@
4 * Author: John Rigby, <jrigby@freescale.com> 4 * Author: John Rigby, <jrigby@freescale.com>
5 * 5 *
6 * Description: 6 * Description:
7 * MPC5121 SoC setup 7 * MPC512x SoC setup
8 * 8 *
9 * This is free software; you can redistribute it and/or modify it 9 * This is free software; you can redistribute it and/or modify it
10 * under the terms of the GNU General Public License as published by 10 * under the terms of the GNU General Public License as published by
@@ -34,14 +34,14 @@ static const char * const board[] __initconst = {
34/* 34/*
35 * Called very early, MMU is off, device-tree isn't unflattened 35 * Called very early, MMU is off, device-tree isn't unflattened
36 */ 36 */
37static int __init mpc5121_generic_probe(void) 37static int __init mpc512x_generic_probe(void)
38{ 38{
39 return of_flat_dt_match(of_get_flat_dt_root(), board); 39 return of_flat_dt_match(of_get_flat_dt_root(), board);
40} 40}
41 41
42define_machine(mpc5121_generic) { 42define_machine(mpc512x_generic) {
43 .name = "MPC5121 generic", 43 .name = "MPC512x generic",
44 .probe = mpc5121_generic_probe, 44 .probe = mpc512x_generic_probe,
45 .init = mpc512x_init, 45 .init = mpc512x_init,
46 .init_early = mpc512x_init_diu, 46 .init_early = mpc512x_init_diu,
47 .setup_arch = mpc512x_setup_diu, 47 .setup_arch = mpc512x_setup_diu,