From: Luis Araneda <luaraneda@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/4] arm: zynq: migrate EEPROM MAC address options to kconfig
Date: Mon, 9 Jul 2018 01:00:04 -0400 [thread overview]
Message-ID: <20180709050006.30056-3-luaraneda@gmail.com> (raw)
In-Reply-To: <20180709050006.30056-1-luaraneda@gmail.com>
Migrate boards to use the generic kconfig options to
read the MAC address
Signed-off-by: Luis Araneda <luaraneda@gmail.com>
---
board/xilinx/zynq/board.c | 7 +++----
configs/syzygy_hub_defconfig | 4 +++-
configs/zynq_zybo_defconfig | 4 +++-
include/configs/syzygy_hub.h | 1 -
include/configs/zynq_zybo.h | 1 -
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 1106f5c2a8..dcbf788918 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -75,10 +75,9 @@ int board_late_init(void)
int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
{
-#if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR) && \
- defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET)
- if (eeprom_read(CONFIG_ZYNQ_GEM_EEPROM_ADDR,
- CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET,
+#if defined(CONFIG_MAC_ADDR_IN_I2C_EEPROM)
+ if (eeprom_read(CONFIG_MAC_ADDR_I2C_EEPROM_CHIP_ADDR,
+ CONFIG_MAC_ADDR_I2C_EEPROM_DATA_ADDR_START,
ethaddr, 6))
printf("I2C EEPROM MAC address read failed\n");
#endif
diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig
index 6fb56afbe9..221349ba6f 100644
--- a/configs/syzygy_hub_defconfig
+++ b/configs/syzygy_hub_defconfig
@@ -39,7 +39,9 @@ CONFIG_FPGA_ZYNQPL=y
CONFIG_DM_GPIO=y
CONFIG_SYS_I2C_ZYNQ=y
CONFIG_ZYNQ_I2C1=y
-CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
+CONFIG_MAC_ADDR_IN_I2C_EEPROM=y
+CONFIG_MAC_ADDR_I2C_EEPROM_CHIP_ADDR=0x57
+CONFIG_MAC_ADDR_I2C_EEPROM_DATA_ADDR_START=0xFA
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_PHY_MARVELL=y
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index 3dfc62162f..03958f399d 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -46,7 +46,9 @@ CONFIG_DM_GPIO=y
CONFIG_SYS_I2C_ZYNQ=y
CONFIG_ZYNQ_I2C0=y
CONFIG_ZYNQ_I2C1=y
-CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
+CONFIG_MAC_ADDR_IN_I2C_EEPROM=y
+CONFIG_MAC_ADDR_I2C_EEPROM_CHIP_ADDR=0x50
+CONFIG_MAC_ADDR_I2C_EEPROM_DATA_ADDR_START=0xFA
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y
diff --git a/include/configs/syzygy_hub.h b/include/configs/syzygy_hub.h
index 88ee772848..17938398c2 100644
--- a/include/configs/syzygy_hub.h
+++ b/include/configs/syzygy_hub.h
@@ -11,7 +11,6 @@
#define __CONFIG_SYZYGY_HUB_H
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
-#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x57
#define CONFIG_EXTRA_ENV_SETTINGS \
"fit_image=fit.itb\0" \
diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index 547ecb68fd..c3abf41f76 100644
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -11,7 +11,6 @@
#define __CONFIG_ZYNQ_ZYBO_H
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
-#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x50
#define CONFIG_DISPLAY
#define CONFIG_I2C_EDID
--
2.18.0
next prev parent reply other threads:[~2018-07-09 5:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-09 5:00 [U-Boot] [PATCH 0/4] arm: zynq: migrate to DM I2C driver Luis Araneda
2018-07-09 5:00 ` [U-Boot] [PATCH 1/4] drivers/misc: add options to read MAC address from EEPROM Luis Araneda
2018-07-09 5:00 ` Luis Araneda [this message]
2018-07-09 5:00 ` [U-Boot] [PATCH 3/4] arm64: zynqmp: migrate EEPROM MAC address options to kconfig Luis Araneda
2018-07-09 5:00 ` [U-Boot] [PATCH 4/4] arm: zynq: use i2c cadence DM driver Luis Araneda
2018-07-20 10:57 ` Michal Simek
2018-07-21 7:20 ` Luis Araneda
2018-07-19 7:28 ` [U-Boot] [PATCH 0/4] arm: zynq: migrate to DM I2C driver Michal Simek
2018-07-20 6:12 ` Luis Araneda
2018-07-20 11:09 ` Michal Simek
2018-07-21 6:14 ` Luis Araneda
2018-08-17 13:31 ` Olliver Schinagl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180709050006.30056-3-luaraneda@gmail.com \
--to=luaraneda@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox