ARM: omap3_logic boards: Convert to DM_ETH

[oweals/u-boot.git] / arch / arm / mach-zynq / ddrc.c

diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c
index d74f8dbbc45dfb9f6440ea38fa44552404f436ef..28988ef95b5ac3dca13d63ff86863407361f7d53 100644 (file)
--- a/arch/arm/mach-zynq/ddrc.c
+++ b/arch/arm/mach-zynq/ddrc.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 - 2013 Michal Simek <monstr@monstr.eu>
- * Copyright (C) 2012 - 2013 Xilinx, Inc. All rights reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright (C) 2012 - 2017 Xilinx, Inc. All rights reserved.
  */
 
 #include <common.h>
@@ -10,8 +9,9 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
+#ifndef CONFIG_ZYNQ_DDRC_INIT
+void zynq_ddrc_init(void) {}
+#else
 /* Control regsiter bitfield definitions */
 #define ZYNQ_DDRC_CTRLREG_BUSWIDTH_MASK                0xC
 #define ZYNQ_DDRC_CTRLREG_BUSWIDTH_SHIFT       2
@@ -46,3 +46,4 @@ void zynq_ddrc_init(void)
                puts("ECC disabled ");
        }
 }
+#endif