[U-Boot] [PATCH 1/2] ARM: zynq: Move ps7_init() out of spl.h

Prepare for spl.h removal.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
arch/arm/include/asm/arch-zynq/spl.h | 2 -- arch/arm/include/asm/arch-zynq/sys_proto.h | 2 ++ 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 5789d28bb3ed..17f37cb8eb61 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 53c30ec6cf3a..89c47f3bd3fa 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_ */ -- 1.8.2.3

Do not specify own zynq specific SPL macros because there is no need for that.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
arch/arm/cpu/armv7/zynq/spl.c | 2 +- arch/arm/include/asm/arch-zynq/spl.h | 16 ---------------- arch/arm/include/asm/spl.h | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 arch/arm/include/asm/arch-zynq/spl.h
diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c index d73e5cbaa745..9ff2ef2ae360 100644 --- a/arch/arm/cpu/armv7/zynq/spl.c +++ b/arch/arm/cpu/armv7/zynq/spl.c @@ -8,7 +8,7 @@
#include <asm/io.h> #include <asm/arch/hardware.h> -#include <asm/arch/spl.h> +#include <asm/spl.h> #include <asm/arch/sys_proto.h>
DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/include/asm/arch-zynq/spl.h b/arch/arm/include/asm/arch-zynq/spl.h deleted file mode 100644 index 17f37cb8eb61..000000000000 --- a/arch/arm/include/asm/arch-zynq/spl.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * (C) Copyright 2014 Xilinx, Inc. Michal Simek - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#ifndef _ASM_ARCH_SPL_H_ -#define _ASM_ARCH_SPL_H_ - -#define BOOT_DEVICE_NONE 0 -#define BOOT_DEVICE_RAM 1 -#define BOOT_DEVICE_SPI 2 -#define BOOT_DEVICE_MMC1 3 -#define BOOT_DEVICE_MMC2 4 -#define BOOT_DEVICE_MMC2_2 5 - -#endif diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h index 18a319de2f6a..e5daf8912712 100644 --- a/arch/arm/include/asm/spl.h +++ b/arch/arm/include/asm/spl.h @@ -7,7 +7,7 @@ #ifndef _ASM_SPL_H_ #define _ASM_SPL_H_
-#if defined(CONFIG_OMAP) || defined(CONFIG_SOCFPGA) || defined(CONFIG_ZYNQ) \ +#if defined(CONFIG_OMAP) || defined(CONFIG_SOCFPGA) \ || defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \ || defined(CONFIG_EXYNOS4210) /* Platform-specific defines */ -- 1.8.2.3

Hi Michal,
On Mon, 11 Aug 2014 15:05:21 +0200 Michal Simek michal.simek@xilinx.com wrote:
Do not specify own zynq specific SPL macros because there is no need for that.
Signed-off-by: Michal Simek michal.simek@xilinx.com
This is exactly what I have expected. Thanks!!
Reviewed-by: Masahiro Yamada yamada.m@jp.panasonic.com

On Mon, 11 Aug 2014 15:05:20 +0200 Michal Simek michal.simek@xilinx.com wrote:
Prepare for spl.h removal.
Signed-off-by: Michal Simek michal.simek@xilinx.com
Reviewed-by: Masahiro Yamada yamada.m@jp.panasonic.com
participants (2)
-
Masahiro Yamada
-
Michal Simek