summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2014-08-11 14:01:57 +0200
committerMichal Simek <michal.simek@xilinx.com>2014-08-19 08:48:00 +0200
commitdbc31f6a20d84edeec1ffbb9be0713e102610083 (patch)
treeec6c3d84bac3a811aae2f8c67904ebfb83815c19 /arch/arm
parentfb8d8766988e536056788358a6ed8d41a03c4290 (diff)
downloadblackbird-obmc-uboot-dbc31f6a20d84edeec1ffbb9be0713e102610083.tar.gz
blackbird-obmc-uboot-dbc31f6a20d84edeec1ffbb9be0713e102610083.zip
ARM: zynq: Move ps7_init() out of spl.h
Prepare for spl.h removal. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/arch-zynq/spl.h2
-rw-r--r--arch/arm/include/asm/arch-zynq/sys_proto.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-zynq/spl.h b/arch/arm/include/asm/arch-zynq/spl.h
index 5789d28bb3..17f37cb8eb 100644
--- a/arch/arm/include/asm/arch-zynq/spl.h
+++ b/arch/arm/include/asm/arch-zynq/spl.h
@@ -6,8 +6,6 @@
#ifndef _ASM_ARCH_SPL_H_
#define _ASM_ARCH_SPL_H_
-extern void ps7_init(void);
-
#define BOOT_DEVICE_NONE 0
#define BOOT_DEVICE_RAM 1
#define BOOT_DEVICE_SPI 2
diff --git a/arch/arm/include/asm/arch-zynq/sys_proto.h b/arch/arm/include/asm/arch-zynq/sys_proto.h
index 53c30ec6cf..89c47f3bd3 100644
--- a/arch/arm/include/asm/arch-zynq/sys_proto.h
+++ b/arch/arm/include/asm/arch-zynq/sys_proto.h
@@ -23,4 +23,6 @@ extern unsigned int zynq_get_silicon_version(void);
extern int zynq_sdhci_init(u32 regbase);
extern int zynq_sdhci_of_init(const void *blob);
+extern void ps7_init(void);
+
#endif /* _SYS_PROTO_H_ */
OpenPOWER on IntegriCloud