diff options
| author | Tom Rini <trini@ti.com> | 2014-08-29 11:07:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-29 11:07:35 -0400 |
| commit | 7f14fb20f895016fb38d30ce71aeb4d441b5bcb8 (patch) | |
| tree | d413cf73725c528b786610896446834721decdd3 /arch | |
| parent | 5ddc329341a9a143f0567494e5f874008b22e1a7 (diff) | |
| parent | ae2ee77f982d83a9aca06973e39bebb224b5201c (diff) | |
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/zynq/spl.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/zynq/u-boot-spl.lds | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-zynq/spl.h | 18 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-zynq/sys_proto.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/spl.h | 2 |
5 files changed, 5 insertions, 20 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/cpu/armv7/zynq/u-boot-spl.lds b/arch/arm/cpu/armv7/zynq/u-boot-spl.lds index 0c4501e5c7..0f2f756f83 100644 --- a/arch/arm/cpu/armv7/zynq/u-boot-spl.lds +++ b/arch/arm/cpu/armv7/zynq/u-boot-spl.lds @@ -22,6 +22,7 @@ SECTIONS .text : { __image_copy_start = .; + *(.vectors) CPUDIR/start.o (.text*) *(.text*) } > .sram 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 5789d28bb3..0000000000 --- a/arch/arm/include/asm/arch-zynq/spl.h +++ /dev/null @@ -1,18 +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_ - -extern void ps7_init(void); - -#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/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_ */ 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 */ |