[PATCH 12/35] common: Move CONFIG_SYS_DEF_EEPROM_ADDR out of common.h

Simon Glass sjg at chromium.org
Thu Dec 12 01:47:31 CET 2019


This define seems better suited to the eeprom header file, particularly
as it is only used in the eeprom.c file.

Move it.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 include/common.h | 4 ----
 include/eeprom.h | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/common.h b/include/common.h
index f3adf06a37..454e88323c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -88,10 +88,6 @@ const char *symbol_lookup(unsigned long addr, unsigned long *caddr);
 long	get_ram_size  (long *, long);
 phys_size_t get_effective_memsize(void);
 
-#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
-
 #if defined(CONFIG_SYS_DRAM_TEST)
 int testdram(void);
 #endif /* CONFIG_SYS_DRAM_TEST */
diff --git a/include/eeprom.h b/include/eeprom.h
index 61eb826a73..79118eb83d 100644
--- a/include/eeprom.h
+++ b/include/eeprom.h
@@ -21,4 +21,8 @@ int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt);
 #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
+
 #endif
-- 
2.24.0.525.g8f36a354ae-goog



More information about the U-Boot mailing list