diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2014-08-11 14:03:15 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-08-19 08:48:18 +0200 |
| commit | ae2ee77f982d83a9aca06973e39bebb224b5201c (patch) | |
| tree | 87c2151b9bc6ef15f68d00a71edc5f0864e5ab14 | |
| parent | dbc31f6a20d84edeec1ffbb9be0713e102610083 (diff) | |
ARM: zynq: Remove spl.h
Do not specify own zynq specific SPL macros
because there is no need for that.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
| -rw-r--r-- | arch/arm/cpu/armv7/zynq/spl.c | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-zynq/spl.h | 16 | ||||
| -rw-r--r-- | arch/arm/include/asm/spl.h | 2 |
3 files changed, 2 insertions, 18 deletions
diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c index d73e5cbaa7..9ff2ef2ae3 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 17f37cb8eb..0000000000 --- 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 18a319de2f..e5daf89127 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 */ |