Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

zynqmp: Define ep config for ZynqMP

Browse source 
Define a new config "zynqmp_ep" for ZynqMP instead
of xilinx_zynqmp. This defconfig supports all emulation
platforms of ZynqMP. Also renamed TARGET_XILINX_ZYNQMP
to ARCH_ZYNQMP.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Siva Durga Prasad Paladugu 2015-06-10 15:50:57 +05:30 committed by Michal Simek
parent 7558000721
commit 0b54a9dd09
7 changed files with 43 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/Kconfig
View file

@ -681,7 +681,7 @@ config ARCH_ZYNQ
select DM_SPI
select DM_SPI_FLASH
config TARGET_XILINX_ZYNQMP
config ARCH_ZYNQMP
bool "Support Xilinx ZynqMP Platform"
select ARM64

2
arch/arm/cpu/armv8/Makefile
View file

@ -16,4 +16,4 @@ obj-y += tlb.o
obj-y += transition.o
obj-$(CONFIG_FSL_LSCH3) += fsl-lsch3/
obj-$(CONFIG_TARGET_XILINX_ZYNQMP) += zynqmp/
obj-$(CONFIG_ARCH_ZYNQMP) += zynqmp/

12
arch/arm/cpu/armv8/zynqmp/Kconfig
View file

@ -1,4 +1,12 @@
if TARGET_XILINX_ZYNQMP
if ARCH_ZYNQMP
choice
prompt "Xilinx ZynqMP board select"
config TARGET_ZYNQMP_EP
bool "ZynqMP EP Board"
endchoice
config SYS_BOARD
default "zynqmp"
@ -10,6 +18,6 @@ config SYS_SOC
default "zynqmp"
config SYS_CONFIG_NAME
default "xilinx_zynqmp"
default "xilinx_zynqmp_ep" if TARGET_ZYNQMP_EP
endif

5
board/xilinx/zynqmp/MAINTAINERS
View file

@ -1,6 +1,7 @@
XILINX_ZYNQMP BOARD
XILINX_ZYNQMP_EP BOARD
M: Michal Simek <michal.simek@xilinx.com>
S: Maintained
F: board/xilinx/zynqmp/
F: include/configs/xilinx_zynqmp.h
F: configs/xilinx_zynqmp_defconfig
F: include/configs/xilinx_zynqmp_ep.h
F: configs/xilinx_zynqmp_ep_defconfig

4
configs/xilinx_zynqmp_defconfig → configs/xilinx_zynqmp_ep_defconfig
View file

@ -1,6 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_XILINX_ZYNQMP=y
CONFIG_DEFAULT_DEVICE_TREE="zynqmp"
CONFIG_ARCH_ZYNQMP=y
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep"
# CONFIG_CMD_CONSOLE is not set
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_XIMG is not set

8
include/configs/xilinx_zynqmp.h
View file

@ -53,7 +53,6 @@
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x400000)
/* Serial setup */
#define CONFIG_ZYNQ_SERIAL_UART0
#define CONFIG_ZYNQ_SERIAL
#define CONFIG_CONS_INDEX 0
@ -61,8 +60,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE \
{ 4800, 9600, 19200, 38400, 57600, 115200 }
#define CONFIG_ZYNQ_SDHCI0
/* Command line configuration */
#define CONFIG_CMD_ENV
#define CONFIG_CMD_EXT2
@ -127,9 +124,6 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_MAXARGS 64
#define CONFIG_ZYNQ_I2C0
#define CONFIG_SYS_I2C_ZYNQ
/* I2C */
#if defined(CONFIG_SYS_I2C_ZYNQ)
# define CONFIG_CMD_I2C
@ -138,8 +132,6 @@
# define CONFIG_SYS_I2C_ZYNQ_SLAVE 0
#endif
#define CONFIG_ZYNQMP_EEPROM
/* EEPROM */
#ifdef CONFIG_ZYNQMP_EEPROM
# define CONFIG_CMD_EEPROM

26
include/configs/xilinx_zynqmp_ep.h Normal file
View file

@ -0,0 +1,26 @@
/*
* Configuration for Xilinx ZynqMP emulation
* platforms. See zynqmp-common.h for ZynqMP
* common configs
*
* (C) Copyright 2014 - 2015 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
* Siva Durga Prasad Paladugu <sivadur@xilinx.com>
*
* Based on Configuration for Versatile Express
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_EP_H
#define __CONFIG_ZYNQMP_EP_H
#define CONFIG_ZYNQ_SERIAL_UART0
#define CONFIG_ZYNQ_SDHCI0
#define CONFIG_ZYNQ_I2C0
#define CONFIG_SYS_I2C_ZYNQ
#define CONFIG_ZYNQ_EEPROM
#include <configs/xilinx_zynqmp.h>
#endif /* __CONFIG_ZYNQMP_EP_H */