From c18afbe0ab4638b421c9eb5c5a89ee451a2ca127 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 17 Aug 2021 17:59:44 -0400 Subject: eeprom: Drop CONFIG_ENV_EEPROM_IS_ON_I2C usage At this point in time, there's no systems with "U-Boot environment exists on an EEPROM which is accessed over the I2C bus" that sets this option. Drop it. Signed-off-by: Tom Rini --- cmd/eeprom.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'cmd') diff --git a/cmd/eeprom.c b/cmd/eeprom.c index efd6f3ac032..447bc157fb7 100644 --- a/cmd/eeprom.c +++ b/cmd/eeprom.c @@ -53,13 +53,12 @@ * for CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 1 (8-bit EEPROM page address) offset is * 0x00000nxx for EEPROM address selectors and page number at n. */ -#if !defined(CONFIG_SPI) || defined(CONFIG_ENV_EEPROM_IS_ON_I2C) -#if !defined(CONFIG_SYS_I2C_EEPROM_ADDR_LEN) || \ - (CONFIG_SYS_I2C_EEPROM_ADDR_LEN < 1) || \ - (CONFIG_SYS_I2C_EEPROM_ADDR_LEN > 2) +#if !defined(CONFIG_SPI) && \ + (!defined(CONFIG_SYS_I2C_EEPROM_ADDR_LEN) || \ + (CONFIG_SYS_I2C_EEPROM_ADDR_LEN < 1) || \ + (CONFIG_SYS_I2C_EEPROM_ADDR_LEN > 2)) #error CONFIG_SYS_I2C_EEPROM_ADDR_LEN must be 1 or 2 #endif -#endif #if CONFIG_IS_ENABLED(DM_I2C) static int eeprom_i2c_bus; -- cgit v1.3.1