Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 11:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: zynq: Convert dlc20 and zc70x board to DM_I2C

Browse source 
All these board have also eeprom enabled that's why it is also enabled
via defconfig.
There is also no need to have zc70x specific config file that's why also
remove it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Michal Simek 2019-01-22 14:43:04 +01:00
parent aeac8921ab
commit 217bb295e2
5 changed files with 18 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configs/zynq_dlc20_rev1_0_defconfig
View file

@ -18,7 +18,6 @@ CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_EEPROM=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADBP=y
@ -43,8 +42,12 @@ CONFIG_DFU_RAM=y
CONFIG_FPGA_XILINX=y CONFIG_FPGA_XILINX=y
CONFIG_FPGA_ZYNQPL=y CONFIG_FPGA_ZYNQPL=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_SYS_I2C_ZYNQ=y CONFIG_DM_I2C=y
CONFIG_ZYNQ_I2C0=y CONFIG_SYS_I2C_CADENCE=y
CONFIG_MISC=y
CONFIG_I2C_EEPROM=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x0
CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y

10
configs/zynq_zc702_defconfig
View file

@ -1,5 +1,4 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
CONFIG_ARCH_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_SPL=y CONFIG_SPL=y
@ -18,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_EEPROM=y
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
@ -44,10 +42,14 @@ CONFIG_DFU_RAM=y
CONFIG_FPGA_XILINX=y CONFIG_FPGA_XILINX=y
CONFIG_FPGA_ZYNQPL=y CONFIG_FPGA_ZYNQPL=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_SYS_I2C_ZYNQ=y CONFIG_DM_I2C=y
CONFIG_ZYNQ_I2C0=y CONFIG_SYS_I2C_CADENCE=y
CONFIG_LED=y CONFIG_LED=y
CONFIG_LED_GPIO=y CONFIG_LED_GPIO=y
CONFIG_MISC=y
CONFIG_I2C_EEPROM=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x0
CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y

10
configs/zynq_zc706_defconfig
View file

@ -1,5 +1,4 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
CONFIG_ARCH_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_SPL=y CONFIG_SPL=y
@ -21,7 +20,6 @@ CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_PROMPT="Zynq> " CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_THOR_DOWNLOAD=y
CONFIG_CMD_EEPROM=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADBP=y
@ -46,8 +44,12 @@ CONFIG_DFU_RAM=y
CONFIG_FPGA_XILINX=y CONFIG_FPGA_XILINX=y
CONFIG_FPGA_ZYNQPL=y CONFIG_FPGA_ZYNQPL=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_SYS_I2C_ZYNQ=y CONFIG_DM_I2C=y
CONFIG_ZYNQ_I2C0=y CONFIG_SYS_I2C_CADENCE=y
CONFIG_MISC=y
CONFIG_I2C_EEPROM=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x0
CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y

14
include/configs/zynq-common.h
View file

@ -102,20 +102,6 @@
# define DFU_ALT_INFO # define DFU_ALT_INFO
#endif #endif
/* I2C */
#if defined(CONFIG_SYS_I2C_ZYNQ)
# define CONFIG_SYS_I2C
#endif
/* EEPROM */
#ifdef CONFIG_ZYNQ_EEPROM
# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
# define CONFIG_SYS_I2C_EEPROM_ADDR 0x54
# define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4
# define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
# define CONFIG_SYS_EEPROM_SIZE 1024 /* Bytes */
#endif
/* Allow to overwrite serial and ethaddr */ /* Allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OVERWRITE

16
include/configs/zynq_zc70x.h
View file

@ -1,16 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 Xilinx, Inc.
*
* Configuration settings for the Xilinx Zynq ZC702 and ZC706 boards
* See zynq-common.h for Zynq common configs
*/
#ifndef __CONFIG_ZYNQ_ZC70X_H
#define __CONFIG_ZYNQ_ZC70X_H
#define CONFIG_ZYNQ_EEPROM
#include <configs/zynq-common.h>
#endif /* __CONFIG_ZYNQ_ZC70X_H */