diff mbox series

[U-Boot,v4,1/3] board: atmel: Create board/$(VENDOR)/common folder

Message ID 20170901082618.30622-2-wenyou.yang@microchip.com
State Accepted
Commit d9b23e26f0b663752e915763d6e2da2fd12fe4b2
Delegated to: Tom Rini
Headers show
Series board: atmel: Set the ethernet mac address from eeprom | expand

Commit Message

Wenyou Yang Sept. 1, 2017, 8:26 a.m. UTC
Create board/$(VENDOR)/common folder to accommodate the common code
shared by other atmel boards, now put the code to set ethernet mac
address from eeprom, which uses the i2c eeprom driver.

Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
---

Changes in v4:
 - Follow up the env function renaming.

Changes in v3: None
Changes in v2: None

 arch/arm/mach-at91/include/mach/at91_common.h |  2 ++
 board/atmel/common/Makefile                   | 11 ++++++++
 board/atmel/common/board.c                    | 12 +++++++++
 board/atmel/common/mac_eeprom.c               | 36 +++++++++++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 board/atmel/common/Makefile
 create mode 100644 board/atmel/common/board.c
 create mode 100644 board/atmel/common/mac_eeprom.c

Comments

Simon Glass Sept. 9, 2017, 4:51 a.m. UTC | #1
On 1 September 2017 at 02:26, Wenyou Yang <wenyou.yang@microchip.com> wrote:
> Create board/$(VENDOR)/common folder to accommodate the common code
> shared by other atmel boards, now put the code to set ethernet mac
> address from eeprom, which uses the i2c eeprom driver.
>
> Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
> ---
>
> Changes in v4:
>  - Follow up the env function renaming.
>
> Changes in v3: None
> Changes in v2: None
>
>  arch/arm/mach-at91/include/mach/at91_common.h |  2 ++
>  board/atmel/common/Makefile                   | 11 ++++++++
>  board/atmel/common/board.c                    | 12 +++++++++
>  board/atmel/common/mac_eeprom.c               | 36 +++++++++++++++++++++++++++
>  4 files changed, 61 insertions(+)
>  create mode 100644 board/atmel/common/Makefile
>  create mode 100644 board/atmel/common/board.c
>  create mode 100644 board/atmel/common/mac_eeprom.c

Reviewed-by: Simon Glass <sjg@chromium.org>
Tom Rini Sept. 12, 2017, 1:31 p.m. UTC | #2
On Fri, Sep 01, 2017 at 04:26:16PM +0800, Wenyou Yang wrote:

> Create board/$(VENDOR)/common folder to accommodate the common code
> shared by other atmel boards, now put the code to set ethernet mac
> address from eeprom, which uses the i2c eeprom driver.
> 
> Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h
index 0742ffc56f..a95fe41610 100644
--- a/arch/arm/mach-at91/include/mach/at91_common.h
+++ b/arch/arm/mach-at91/include/mach/at91_common.h
@@ -36,4 +36,6 @@  void matrix_init(void);
 void redirect_int_from_saic_to_aic(void);
 void configure_2nd_sram_as_l2_cache(void);
 
+int at91_set_ethaddr(int offset);
+
 #endif /* AT91_COMMON_H */
diff --git a/board/atmel/common/Makefile b/board/atmel/common/Makefile
new file mode 100644
index 0000000000..6d9c6850b5
--- /dev/null
+++ b/board/atmel/common/Makefile
@@ -0,0 +1,11 @@ 
+#
+# Copyright (C) 2017 Microchip
+#		      Wenyou Yang <wenyou.yang@microchip.com>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y += board.o
+ifndef CONFIG_SPL_BUILD
+obj-$(CONFIG_I2C_EEPROM) += mac_eeprom.o
+endif
diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c
new file mode 100644
index 0000000000..7e326d925b
--- /dev/null
+++ b/board/atmel/common/board.c
@@ -0,0 +1,12 @@ 
+/*
+ * Copyright (C) 2017 Microchip
+ *		      Wenyou Yang <wenyou.yang@microchip.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+
+void dummy(void)
+{
+}
diff --git a/board/atmel/common/mac_eeprom.c b/board/atmel/common/mac_eeprom.c
new file mode 100644
index 0000000000..60ddf00d45
--- /dev/null
+++ b/board/atmel/common/mac_eeprom.c
@@ -0,0 +1,36 @@ 
+/*
+ * Copyright (C) 2017 Microchip
+ *		      Wenyou Yang <wenyou.yang@microchip.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <i2c_eeprom.h>
+#include <netdev.h>
+
+int at91_set_ethaddr(int offset)
+{
+	const int ETH_ADDR_LEN = 6;
+	unsigned char ethaddr[ETH_ADDR_LEN];
+	const char *ETHADDR_NAME = "ethaddr";
+	struct udevice *dev;
+	int ret;
+
+	if (env_get(ETHADDR_NAME))
+		return 0;
+
+	ret = uclass_first_device_err(UCLASS_I2C_EEPROM, &dev);
+	if (ret)
+		return ret;
+
+	ret = i2c_eeprom_read(dev, offset, ethaddr, 6);
+	if (ret)
+		return ret;
+
+	if (is_valid_ethaddr(ethaddr))
+		eth_env_set_enetaddr(ETHADDR_NAME, ethaddr);
+
+	return 0;
+}