mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-01-24 19:53:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Rini 2014-11-13 08:38:17 -05:00
commit 3deb013ae7
9 changed files with 71 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/armv7/zynq/Kconfig
View File

@ -15,6 +15,9 @@ config TARGET_ZYNQ_ZC70X
config TARGET_ZYNQ_ZC770
bool "Zynq ZC770 Board"
config TARGET_ZYNQ_ZYBO
bool "Zynq Zybo Board"
endchoice
config SYS_BOARD
@ -31,5 +34,6 @@ config SYS_CONFIG_NAME
default "zynq_microzed" if TARGET_ZYNQ_MICROZED
default "zynq_zc70x" if TARGET_ZYNQ_ZC70X
default "zynq_zc770" if TARGET_ZYNQ_ZC770
default "zynq_zybo" if TARGET_ZYNQ_ZYBO
endif

1
arch/arm/dts/Makefile
View File

@ -34,6 +34,7 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \
zynq-zc706.dtb \
zynq-zed.dtb \
zynq-zybo.dtb \
zynq-microzed.dtb \
zynq-zc770-xm010.dtb \
zynq-zc770-xm012.dtb \

23
arch/arm/dts/zynq-zybo.dts Normal file
View File

@ -0,0 +1,23 @@
/*
* Digilent ZYBO board DTS
*
* Copyright (C) 2013 Xilinx, Inc.
*
* SPDX-License-Identifier: GPL-2.0+
*/
/dts-v1/;
#include "zynq-7000.dtsi"
/ {
model = "Zynq ZYBO Board";
compatible = "xlnx,zynq-zybo", "xlnx,zynq-7000";
aliases {
serial0 = &uart1;
};
memory {
device_type = "memory";
reg = <0 0x20000000>;
};
};

1
board/xilinx/zynq/.gitignore vendored
View File

@ -1 +1,2 @@
ps7_init.[ch]
ps7_init_gpl.[ch]

6
board/xilinx/zynq/Makefile
View File

@ -7,9 +7,11 @@
obj-y := board.o
# Please copy ps7_init.c/h from hw project to this directory
# Please copy ps7_init_gpl.c/h from hw project to this directory
obj-$(CONFIG_SPL_BUILD) += \
$(if $(wildcard $(srctree)/$(src)/ps7_init.c), ps7_init.o)
$(if $(wildcard $(srctree)/$(src)/ps7_init_gpl.c), ps7_init_gpl.o, \
$(if $(wildcard $(srctree)/$(src)/ps7_init.c), ps7_init.o legacy.o))
# Suppress "warning: function declaration isn't a prototype"
CFLAGS_REMOVE_ps7_init_gpl.o := -Wstrict-prototypes
CFLAGS_REMOVE_ps7_init.o := -Wstrict-prototypes

2
board/xilinx/zynq/legacy.c Normal file
View File

@ -0,0 +1,2 @@
#warning usage of ps7_init files is deprecated please use ps7_init_gpl

2
board/xilinx/zynq/xil_io.h
View File

@ -6,7 +6,7 @@
#define XIL_IO_H
/*
* This empty file is here because ps7_init.c exported by hw project
* This empty file is here because ps7_init_gpl.c exported by hw project
* has #include "xil_io.h" line.
*/

4
configs/zynq_zybo_defconfig Normal file
View File

@ -0,0 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZYBO=y

31
include/configs/zynq_zybo.h Normal file
View File

@ -0,0 +1,31 @@
/*
* (C) Copyright 2012 Xilinx
* (C) Copyright 2014 Digilent Inc.
*
* Configuration for Zynq Development Board - ZYBO
* See zynq-common.h for Zynq common configs
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQ_ZYBO_H
#define __CONFIG_ZYNQ_ZYBO_H
#define CONFIG_SYS_SDRAM_SIZE (512 * 1024 * 1024)
#define CONFIG_ZYNQ_SERIAL_UART1
#define CONFIG_ZYNQ_GEM0
#define CONFIG_ZYNQ_GEM_PHY_ADDR0 0
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ZYNQ_SDHCI0
#define CONFIG_ZYNQ_BOOT_FREEBSD
#define CONFIG_DEFAULT_DEVICE_TREE zynq-zybo
/* Define ZYBO PS Clock Frequency to 50MHz */
#define CONFIG_ZYNQ_PS_CLK_FREQ 50000000UL
#include <configs/zynq-common.h>
#endif /* __CONFIG_ZYNQ_ZYBO_H */