Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze

diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c
index d73e5cbaa745a23c74b511fa866d3e51096f4db6..9ff2ef2ae36023cab39846a8fe2b1b07e0195735 100644 (file)
--- 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 0c4501e5c776504eb0f5b1263ef480cb2a9076e9..0f2f756f8354e8663a160dfab28356fa70e05bd2 100644 (file)
--- 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 (file)
index 5789d28..0000000
--- 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 53c30ec6cf3a3b3b92c62d0150a3019dc0428751..89c47f3bd3fa2b87bbea973515b61c8e185ae806 100644 (file)
--- 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 18a319de2f6ab25c146f1d8f3d35f1f08934f6b8..e5daf89127125c4d4379ed5b08775c7e4d0cc5ec 100644 (file)
--- 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 */