| From cf5f4028141186f861bb0a32d50258d53f059b23 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Thu, 13 Jun 2013 14:13:37 +0200 |
| Subject: ARM: zynq: use DT_MACHINE_START |
| |
| The zynq platform code only supports DT based booting, so we |
| should use DT_MACHINE_START rather than MACHINE_START. |
| |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Cc: Michal Simek <michal.simek@xilinx.com> |
| (cherry picked from commit 514a590847ff42dc00ba6c6165736128ad7730a8) |
| Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> |
| Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> |
| --- |
| arch/arm/mach-zynq/common.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c |
| index 4130e65a0e3f..5b799c29886e 100644 |
| --- a/arch/arm/mach-zynq/common.c |
| +++ b/arch/arm/mach-zynq/common.c |
| @@ -101,7 +101,7 @@ static const char * const zynq_dt_match[] = { |
| NULL |
| }; |
| |
| -MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") |
| +DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") |
| .smp = smp_ops(zynq_smp_ops), |
| .map_io = zynq_map_io, |
| .init_machine = zynq_init_machine, |
| -- |
| 1.8.5.rc3 |
| |
