From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 08/12] i2c: Drop use of CONFIG_I2C_HARD
Date: Thu, 11 May 2017 18:23:57 -0600 [thread overview]
Message-ID: <20170512002401.13115-9-sjg@chromium.org> (raw)
In-Reply-To: <20170512002401.13115-1-sjg@chromium.org>
Drop use of this long-deprecated option.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Drop changes to omap board.c files
README | 16 ++++++++--------
cmd/eeprom.c | 2 --
common/board_f.c | 4 ++--
common/stdio.c | 5 +----
include/configs/PATI.h | 7 +++----
include/configs/am335x_evm.h | 5 -----
include/configs/am43xx_evm.h | 6 ------
include/configs/ti_armv7_keystone2.h | 1 -
scripts/config_whitelist.txt | 1 -
9 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/README b/README
index 6fa476ee4e..444f1dd3b6 100644
--- a/README
+++ b/README
@@ -2204,7 +2204,9 @@ The following options need to be configured:
If you do not have i2c muxes on your board, omit this define.
-- Legacy I2C Support: CONFIG_HARD_I2C
+----under removal:
+
+- Legacy I2C Support: CONFIG_SOFT_I2C
NOTE: It is intended to move drivers to CONFIG_SYS_I2C which
provides the following compelling advantages:
@@ -2213,14 +2215,12 @@ The following options need to be configured:
- approved multibus support
- better i2c mux support
- ** CONFIG_HARD_I2C is now being removed **
-
-----under removal:
+ ** CONFIG_SOFT_I2C is now being removed **
- In both cases you will need to define CONFIG_SYS_I2C_SPEED
- to be the frequency (in Hz) at which you wish your i2c bus
- to run and CONFIG_SYS_I2C_SLAVE to be the address of this node (ie
- the CPU's i2c node address).
+ With CONFIG_SOFT_I2C you will need to define
+ CONFIG_SYS_I2C_SPEED to be the frequency (in Hz) at which you
+ wish your i2c bus to run and CONFIG_SYS_I2C_SLAVE to be the
+ address of this node (ie the CPU's i2c node address).
Now, the u-boot i2c code for the mpc8xx
(arch/powerpc/cpu/mpc8xx/i2c.c) sets the CPU up as a master node
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 0a0e4a2c1c..c9fde0d682 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -73,13 +73,11 @@ void eeprom_init(int bus)
#endif
/* I2C EEPROM */
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C)
#if defined(CONFIG_SYS_I2C)
if (bus >= 0)
i2c_set_bus_num(bus);
#endif
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-#endif
}
static int eeprom_addr(unsigned dev_addr, unsigned offset, uchar *addr)
diff --git a/common/board_f.c b/common/board_f.c
index d9431ee79a..eed3e7be2a 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -184,7 +184,7 @@ __weak int dram_init_banksize(void)
return 0;
}
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C)
+#if defined(CONFIG_SYS_I2C)
static int init_func_i2c(void)
{
puts("I2C: ");
@@ -765,7 +765,7 @@ static const init_fnc_t init_sequence_f[] = {
misc_init_f,
#endif
INIT_FUNC_WATCHDOG_RESET
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C)
+#if defined(CONFIG_SYS_I2C)
init_func_i2c,
#endif
#if defined(CONFIG_HARD_SPI)
diff --git a/common/stdio.c b/common/stdio.c
index 4d30017530..ee4f0bda9e 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -21,7 +21,7 @@
#include <logbuff.h>
#endif
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C)
+#if defined(CONFIG_SYS_I2C)
#include <i2c.h>
#endif
@@ -346,9 +346,6 @@ int stdio_add_devices(void)
#ifdef CONFIG_SYS_I2C
i2c_init_all();
#else
-#if defined(CONFIG_HARD_I2C)
- i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-#endif
#endif
#ifdef CONFIG_DM_VIDEO
/*
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index e53db2485b..046aa0d5f1 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -38,7 +38,6 @@
*/
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_IRQ
#define CONFIG_BOOTCOMMAND "" /* autoboot command */
@@ -135,16 +134,16 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 128
-#define CONFIG_ENV_IS_IN_EEPROM
#ifdef CONFIG_ENV_IS_IN_EEPROM
#define CONFIG_ENV_OFFSET 0
#define CONFIG_ENV_SIZE 2048
#endif
-#undef CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 0x00002000 /* Set whole sector as env */
-#define CONFIG_ENV_OFFSET ((0 - CONFIG_SYS_FLASH_BASE) - CONFIG_ENV_SIZE) /* Environment starts at this adress */
+/* Environment starts at this adress */
+#define CONFIG_ENV_OFFSET ((0 - CONFIG_SYS_FLASH_BASE) - 2048)
#endif
#define CONFIG_SPI 1
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index fc8a08f5b7..5c1a6d64da 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -176,11 +176,6 @@
#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
-#define CONFIG_CMD_EEPROM
-#define CONFIG_ENV_EEPROM_IS_ON_I2C
-#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
-
/* PMIC support */
#define CONFIG_POWER_TPS65217
#define CONFIG_POWER_TPS65910
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 1feb946834..ba185ebf5a 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -22,12 +22,6 @@
#define CONFIG_SYS_NS16550_SERIAL
#endif
-/* I2C Configuration */
-#define CONFIG_CMD_EEPROM
-#define CONFIG_ENV_EEPROM_IS_ON_I2C
-#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
-
/* Power */
#define CONFIG_POWER
#define CONFIG_POWER_I2C
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 868464cd32..3161c50abb 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -208,7 +208,6 @@
/* U-Boot command configuration */
#define CONFIG_CMD_SAVES
#define CONFIG_CMD_UBIFS
-#define CONFIG_CMD_EEPROM
/* U-Boot general configuration */
#define CONFIG_MISC_INIT_R
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cd0165f934..42f669ce7c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1135,7 +1135,6 @@ CONFIG_G_DNL_UMS_VENDOR_NUM
CONFIG_H264_FREQ
CONFIG_H8300
CONFIG_HALEAKALA
-CONFIG_HARD_I2C
CONFIG_HARD_SPI
CONFIG_HASH_VERIFY
CONFIG_HAS_DATAFLASH
--
2.13.0.rc2.291.g57267f2277-goog
next prev parent reply other threads:[~2017-05-12 0:23 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-12 0:23 [U-Boot] [PATCH v2 00/12] i2c: Remove old I2C support Simon Glass
2017-05-12 0:23 ` [U-Boot] [PATCH v2 01/12] i2c: Drop use of CONFIG_I2C_HARD Simon Glass
2017-05-12 0:23 ` [U-Boot] [PATCH v2 02/12] i2c: powerpc: Remove use of CONFIG_HARD_I2C Simon Glass
2017-05-12 0:23 ` [U-Boot] [PATCH v2 03/12] i2c: cm5200: Drop use of CONFIG_I2C_HARD Simon Glass
2017-05-12 0:23 ` [U-Boot] [PATCH v2 04/12] i2c: pdm360ng: " Simon Glass
2017-05-12 0:23 ` [U-Boot] [PATCH v2 05/12] i2c: keymile: " Simon Glass
2017-05-12 0:23 ` [U-Boot] [PATCH v2 06/12] i2c: mxc_i2c: " Simon Glass
2017-05-12 0:23 ` [U-Boot] [PATCH v2 07/12] i2c: omap: Modify code to work without CONFIG_I2C_HARD Simon Glass
2017-05-12 0:30 ` Tom Rini
2017-05-12 0:23 ` Simon Glass [this message]
2017-05-12 0:33 ` [U-Boot] [PATCH v2 08/12] i2c: Drop use of CONFIG_I2C_HARD Tom Rini
2017-05-12 14:12 ` Simon Glass
2017-05-12 14:19 ` Tom Rini
2017-05-12 14:29 ` Simon Glass
2017-05-12 14:47 ` Tom Rini
2017-05-12 15:12 ` Simon Glass
2017-05-13 3:09 ` Simon Glass
2017-05-12 0:23 ` [U-Boot] [PATCH v2 09/12] i2c: README: Drop CONFIG_SYS_I2C_INIT_MPC5XXX Simon Glass
2017-05-12 0:23 ` [U-Boot] [PATCH v2 10/12] i2c: Drop CONFIG_SYS_I2C_BOARD_LATE_INIT Simon Glass
2017-05-12 0:24 ` [U-Boot] [PATCH v2 11/12] Drop CONFIG_I2CFAST Simon Glass
2017-05-12 0:24 ` [U-Boot] [PATCH v2 12/12] Drop use of CONFIG_I2C_SOFT Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170512002401.13115-9-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.