common: Move old EEPROM functions into a new header

These functions do not use driver model but are still used. Move them to a
new eeprom.h header file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2019-11-14 12:57:50 -07:00 committed by Tom Rini
parent 533cee0a9c
commit cb3ef6810a
19 changed files with 41 additions and 15 deletions

View File

@ -6,6 +6,7 @@
#include <common.h>
#include <dm.h>
#include <eeprom.h>
#include <env.h>
#include <i2c_eeprom.h>
#include <netdev.h>

View File

@ -7,6 +7,7 @@
*/
#include <common.h>
#include <eeprom.h>
#include <i2c.h>
#include <eeprom_layout.h>
#include <eeprom_field.h>

View File

@ -5,6 +5,7 @@
* Andreas Bießmann <andreas.biessmann@corscience.de>
*/
#include <common.h>
#include <eeprom.h>
#include <i2c.h>
#include <u-boot/crc.h>

View File

@ -7,6 +7,7 @@
#include <common.h>
#include <dm.h>
#include <eeprom.h>
#include <init.h>
#include <dm/device-internal.h>
#include <asm/arch/clock.h>

View File

@ -10,6 +10,7 @@
*/
#include <common.h>
#include <eeprom.h>
#include <env.h>
#include <init.h>
#include <ioports.h>

View File

@ -7,6 +7,7 @@
#include <common.h>
#include <dm.h>
#include <eeprom.h>
#include <init.h>
#include <dm/device-internal.h>
#include <ahci.h>

View File

@ -4,6 +4,7 @@
* Author: Wadim Egorov <w.egorov@phytec.de>
*/
#include <eeprom.h>
#include <init.h>
#include <asm/io.h>
#include <common.h>

View File

@ -5,6 +5,7 @@
#include <common.h>
#include <dm.h>
#include <eeprom.h>
#include <env.h>
#include <i2c_eeprom.h>
#include <init.h>

View File

@ -4,6 +4,7 @@
*/
#include <common.h>
#include <eeprom.h>
#include <env.h>
#include <init.h>
#include <status_led.h>

View File

@ -8,6 +8,7 @@
*/
#include <common.h>
#include <eeprom.h>
#include <env.h>
#include <i2c.h>
#include <init.h>

View File

@ -8,6 +8,7 @@
*/
#include <common.h>
#include <eeprom.h>
#include <asm/arch/hardware.h>
#include <asm/omap_common.h>
#include <dm/uclass.h>

View File

@ -6,6 +6,7 @@
* Texas Instruments Incorporated, <www.ti.com>
*/
#include <common.h>
#include <eeprom.h>
#include <env.h>
#include <init.h>
#include <asm/arch/clock.h>

View File

@ -22,6 +22,7 @@
#include <common.h>
#include <config.h>
#include <command.h>
#include <eeprom.h>
#include <i2c.h>
#include <eeprom_layout.h>

View File

@ -4,6 +4,7 @@
*/
#include <common.h>
#include <eeprom.h>
#include <linux/err.h>
#include <linux/kernel.h>
#include <dm.h>

View File

@ -1,6 +1,7 @@
/* Three-wire (MicroWire) serial eeprom driver (for 93C46 and compatibles) */
#include <common.h>
#include <eeprom.h>
#include <asm/ic/ssi.h>
/*

View File

@ -10,6 +10,7 @@
#include <common.h>
#include <command.h>
#include <dm.h>
#include <eeprom.h>
#include <i2c.h>
#include <rtc.h>

1
env/eeprom.c vendored
View File

@ -9,6 +9,7 @@
#include <common.h>
#include <command.h>
#include <eeprom.h>
#include <env.h>
#include <env_internal.h>
#include <linux/stddef.h>

View File

@ -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

24
include/eeprom.h Normal file
View File

@ -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