@@ -6,6 +6,7 @@
#include <common.h>
#include <dm.h>
+#include <eeprom_legacy.h>
#include <env.h>
#include <i2c_eeprom.h>
#include <netdev.h>
@@ -7,6 +7,7 @@
*/
#include <common.h>
+#include <eeprom_legacy.h>
#include <i2c.h>
#include <eeprom_layout.h>
#include <eeprom_field.h>
@@ -5,6 +5,7 @@
* Andreas Bießmann <andreas.biessmann@corscience.de>
*/
#include <common.h>
+#include <eeprom_legacy.h>
#include <i2c.h>
#include <u-boot/crc.h>
@@ -7,6 +7,7 @@
#include <common.h>
#include <dm.h>
+#include <eeprom_legacy.h>
#include <init.h>
#include <dm/device-internal.h>
#include <asm/arch/clock.h>
@@ -10,6 +10,7 @@
*/
#include <common.h>
+#include <eeprom_legacy.h>
#include <env.h>
#include <init.h>
#include <ioports.h>
@@ -7,6 +7,7 @@
#include <common.h>
#include <dm.h>
+#include <eeprom_legacy.h>
#include <init.h>
#include <dm/device-internal.h>
#include <ahci.h>
@@ -4,6 +4,7 @@
* Author: Wadim Egorov <w.egorov@phytec.de>
*/
+#include <eeprom_legacy.h>
#include <init.h>
#include <asm/io.h>
#include <common.h>
@@ -5,6 +5,7 @@
#include <common.h>
#include <dm.h>
+#include <eeprom_legacy.h>
#include <env.h>
#include <i2c_eeprom.h>
#include <init.h>
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <eeprom_legacy.h>
#include <env.h>
#include <init.h>
#include <status_led.h>
@@ -8,6 +8,7 @@
*/
#include <common.h>
+#include <eeprom_legacy.h>
#include <env.h>
#include <i2c.h>
#include <init.h>
@@ -8,6 +8,7 @@
*/
#include <common.h>
+#include <eeprom_legacy.h>
#include <asm/arch/hardware.h>
#include <asm/omap_common.h>
#include <dm/uclass.h>
@@ -6,6 +6,7 @@
* Texas Instruments Incorporated, <www.ti.com>
*/
#include <common.h>
+#include <eeprom_legacy.h>
#include <env.h>
#include <init.h>
#include <asm/arch/clock.h>
@@ -22,6 +22,7 @@
#include <common.h>
#include <config.h>
#include <command.h>
+#include <eeprom_legacy.h>
#include <i2c.h>
#include <eeprom_layout.h>
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <eeprom_legacy.h>
#include <linux/err.h>
#include <linux/kernel.h>
#include <dm.h>
@@ -1,6 +1,7 @@
/* Three-wire (MicroWire) serial eeprom driver (for 93C46 and compatibles) */
#include <common.h>
+#include <eeprom_legacy.h>
#include <asm/ic/ssi.h>
/*
@@ -10,6 +10,7 @@
#include <common.h>
#include <command.h>
#include <dm.h>
+#include <eeprom_legacy.h>
#include <i2c.h>
#include <rtc.h>
@@ -9,6 +9,7 @@
#include <common.h>
#include <command.h>
+#include <eeprom_legacy.h>
#include <env.h>
#include <env_internal.h>
#include <linux/stddef.h>
@@ -116,21 +116,6 @@ phys_size_t get_effective_memsize(void);
void reset_phy (void);
void fdc_hw_init (void);
-/* $(BOARD)/eeprom.c */
-#ifdef CONFIG_CMD_EEPROM
-void eeprom_init (int bus);
-int eeprom_read (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt);
-int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt);
-#else
-/*
- * Some EEPROM code is depecated because it used the legacy I2C interface. Add
- * some macros here so we don't have to touch every one of those uses
- */
-#define eeprom_init(bus)
-#define eeprom_read(dev_addr, offset, buffer, cnt) ((void)-ENOSYS)
-#define eeprom_write(dev_addr, offset, buffer, cnt) ((void)-ENOSYS)
-#endif
-
#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR)
# define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
#endif
new file mode 100644
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2000-2009
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ */
+
+#ifndef __EEPROM_LEGACY_H
+#define __EEPROM_LEGACY_H
+
+#ifdef CONFIG_CMD_EEPROM
+void eeprom_init(int bus);
+int eeprom_read(uint dev_addr, uint offset, uchar *buffer, uint cnt);
+int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt);
+#else
+/*
+ * Some EEPROM code is depecated because it used the legacy I2C interface. Add
+ * some macros here so we don't have to touch every one of those uses
+ */
+#define eeprom_init(bus)
+#define eeprom_read(dev_addr, offset, buffer, cnt) ((void)-ENOSYS)
+#define eeprom_write(dev_addr, offset, buffer, cnt) ((void)-ENOSYS)
+#endif
+
+#endif
These functions do not use driver model but are still used. Move them to a new eeprom_legacy.h header file. Signed-off-by: Simon Glass <sjg@chromium.org> --- board/atmel/common/mac_eeprom.c | 1 + board/compulab/common/eeprom.c | 1 + board/corscience/tricorder/tricorder-eeprom.c | 1 + board/dhelectronics/dh_imx6/dh_imx6.c | 1 + board/freescale/mpc8323erdb/mpc8323erdb.c | 1 + board/kosagi/novena/novena.c | 1 + board/phytec/phycore_rk3288/phycore-rk3288.c | 1 + board/rockchip/tinker_rk3288/tinker-rk3288.c | 1 + board/samtec/vining_fpga/socfpga.c | 1 + board/ti/am43xx/board.c | 1 + board/ti/common/board_detect.c | 1 + board/ti/ks2_evm/board_k2g.c | 1 + cmd/eeprom.c | 1 + drivers/misc/i2c_eeprom.c | 1 + drivers/mtd/mw_eeprom.c | 1 + drivers/rtc/rv3029.c | 1 + env/eeprom.c | 1 + include/common.h | 15 ------------ include/eeprom_legacy.h | 24 +++++++++++++++++++ 19 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 include/eeprom_legacy.h