GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Rini 2014-08-29 11:07:35 -04:00
commit 7f14fb20f8
5 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/armv7/zynq/spl.c
View file

@ -8,7 +8,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/spl.h> #include <asm/spl.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

1
arch/arm/cpu/armv7/zynq/u-boot-spl.lds
View file

@ -22,6 +22,7 @@ SECTIONS
.text : .text :
{ {
__image_copy_start = .; __image_copy_start = .;
*(.vectors)
CPUDIR/start.o (.text*) CPUDIR/start.o (.text*)
*(.text*) *(.text*)
} > .sram } > .sram

18
arch/arm/include/asm/arch-zynq/spl.h
View file

@ -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

2
arch/arm/include/asm/arch-zynq/sys_proto.h
View file

@ -23,4 +23,6 @@ extern unsigned int zynq_get_silicon_version(void);
extern int zynq_sdhci_init(u32 regbase); extern int zynq_sdhci_init(u32 regbase);
extern int zynq_sdhci_of_init(const void *blob); extern int zynq_sdhci_of_init(const void *blob);
extern void ps7_init(void);
#endif /* _SYS_PROTO_H_ */ #endif /* _SYS_PROTO_H_ */

2
arch/arm/include/asm/spl.h
View file

@ -7,7 +7,7 @@
#ifndef _ASM_SPL_H_ #ifndef _ASM_SPL_H_
#define _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_EXYNOS4) || defined(CONFIG_EXYNOS5) \
|| defined(CONFIG_EXYNOS4210) || defined(CONFIG_EXYNOS4210)
/* Platform-specific defines */ /* Platform-specific defines */