mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +00:00
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 <trini@konsulko.com>
This commit is contained in:
parent
abe50c1c82
commit
c18afbe0ab
13 changed files with 4 additions and 20 deletions
|
@ -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;
|
||||
|
|
4
env/Kconfig
vendored
4
env/Kconfig
vendored
|
@ -44,10 +44,6 @@ config ENV_IS_IN_EEPROM
|
|||
still be one byte because the extra address bits are hidden
|
||||
in the chip address.
|
||||
|
||||
- CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
define this, if you have I2C and SPI activated, and your
|
||||
EEPROM, which holds the environment, is on the I2C bus.
|
||||
|
||||
- CONFIG_I2C_ENV_EEPROM_BUS
|
||||
if you have an Environment on an EEPROM reached over
|
||||
I2C muxes, you can define here, how to reach this
|
||||
|
|
|
@ -168,7 +168,6 @@
|
|||
#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
|
||||
#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
|
||||
|
||||
#define CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
|
||||
|
||||
|
|
|
@ -55,7 +55,6 @@
|
|||
#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
|
||||
#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
|
||||
|
||||
#define CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#endif
|
||||
|
||||
/* I2C Configuration */
|
||||
#define CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
|
||||
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
|
||||
#define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
|
||||
|
||||
#define CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
|
||||
|
||||
|
|
|
@ -204,7 +204,6 @@
|
|||
#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
|
||||
#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
|
||||
|
||||
#define CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
|
||||
|
||||
|
|
|
@ -201,7 +201,6 @@
|
|||
#define CONFIG_VIDEO_BMP_LOGO
|
||||
|
||||
/* EEPROM */
|
||||
#define CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
|
||||
|
|
|
@ -128,7 +128,6 @@
|
|||
/* Status LED polarity is inversed, so init it in the "off" state */
|
||||
|
||||
/* EEPROM */
|
||||
#define CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
|
||||
|
|
|
@ -114,7 +114,6 @@
|
|||
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
|
||||
|
||||
/* EEPROM */
|
||||
#define CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
|
||||
#define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
|
||||
|
||||
#define CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
|
||||
|
||||
|
|
|
@ -143,7 +143,6 @@ extern void __set_direction(unsigned pin, int high);
|
|||
#define CONFIG_ENV_TOTAL_SIZE 0x20000 /* no bracets! */
|
||||
#else
|
||||
#define CONFIG_SYS_DEF_EEPROM_ADDR 0x50
|
||||
#define CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
#define CONFIG_SYS_EEPROM_WREN
|
||||
#define CONFIG_I2C_ENV_EEPROM_BUS 5 /* I2C2 (Mux-Port 5) */
|
||||
#endif
|
||||
|
|
|
@ -124,7 +124,6 @@
|
|||
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 20
|
||||
#define CONFIG_ENV_EEPROM_IS_ON_I2C
|
||||
|
||||
/* NAND Configuration */
|
||||
#define CONFIG_KEYSTONE_RBL_NAND
|
||||
|
|
Loading…
Reference in a new issue