aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-08-18 23:12:37 -0400
committerTom Rini <trini@konsulko.com>2021-08-30 14:10:08 -0400
commitfc8d3b9a2f03eb6a92e1b34c6d841285a6d47bb1 (patch)
tree02f5b06a988953376f97b2ea29b2f9ca007c2036 /include
parent81bc599dfa9cf536ecab05f8b091257d180b3bce (diff)
downloadu-boot-fc8d3b9a2f03eb6a92e1b34c6d841285a6d47bb1.zip
u-boot-fc8d3b9a2f03eb6a92e1b34c6d841285a6d47bb1.tar.gz
u-boot-fc8d3b9a2f03eb6a92e1b34c6d841285a6d47bb1.tar.bz2
Convert CONFIG_I2C_SET_DEFAULT_BUS_NUM et al to Kconfig
This converts the following to Kconfig: CONFIG_I2C_SET_DEFAULT_BUS_NUM CONFIG_I2C_DEFAULT_BUS_NUMBER Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/MPC8548CDS.h2
-rw-r--r--include/configs/P1010RDB.h4
-rw-r--r--include/configs/P2041RDB.h4
-rw-r--r--include/configs/T102xRDB.h4
-rw-r--r--include/configs/T104xRDB.h4
-rw-r--r--include/configs/T208xRDB.h4
-rw-r--r--include/configs/T4240RDB.h4
-rw-r--r--include/configs/corenet_ds.h4
-rw-r--r--include/configs/ls1012a_common.h5
-rw-r--r--include/configs/ls1021aiot.h6
-rw-r--r--include/configs/ls1021aqds.h5
-rw-r--r--include/configs/ls1021atsn.h5
-rw-r--r--include/configs/ls1021atwr.h5
-rw-r--r--include/configs/ls1043a_common.h5
-rw-r--r--include/configs/ls1046a_common.h5
-rw-r--r--include/configs/p1_p2_rdb_pc.h3
16 files changed, 0 insertions, 69 deletions
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 3576764..3341b3b 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -298,8 +298,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
#else
#define CONFIG_SYS_SPD_BUS_NUM 0
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
#endif
/* EEPROM */
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 4fdde0c..b3fadc6 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -497,10 +497,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600)
/* I2C */
-#if CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
#define I2C_PCA9557_ADDR1 0x18
#define I2C_PCA9557_ADDR2 0x19
#define I2C_PCA9557_BUS_NUM 0
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 8d97dd3..74008f6 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -256,10 +256,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
/* I2C */
-#if CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
/*
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index dc36c6d..3d8c126 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -417,10 +417,6 @@ unsigned long get_board_ddr_clk(void);
#endif
/* I2C */
-#if CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
#define I2C_PCA6408_BUS_NUM 1
#define I2C_PCA6408_ADDR 0x20
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index c4a311d..b008fdf 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -452,10 +452,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#endif
/* I2C */
-#if CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
/* I2C bus multiplexer */
#define I2C_MUX_PCA_ADDR 0x70
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index dcef441..0813ffbc 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -319,10 +319,6 @@ unsigned long get_board_ddr_clk(void);
/*
* I2C
*/
-#if CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
#define I2C_MUX_PCA_ADDR_PRI 0x77 /* I2C bus multiplexer,primary */
#define I2C_MUX_PCA_ADDR_SEC1 0x75 /* I2C bus multiplexer,secondary 1 */
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 4d7a131..09ae468 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -154,10 +154,6 @@
#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
/* I2C */
-#if CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
/*
* General PCI
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 27232de..58c1e91 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -266,10 +266,6 @@
#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
/* I2C */
-#if CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
/*
* RapidIO
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 701292c..c914a02 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -55,11 +55,6 @@
CONFIG_SYS_SCSI_MAX_LUN)
/* I2C */
-#if !CONFIG_IS_ENABLED(DM_I2C)
-#else
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
/* GPIO */
#ifdef CONFIG_DM_GPIO
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index fd14ee4..6c1cedf 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -98,12 +98,6 @@
* I2C
*/
-#if !CONFIG_IS_ENABLED(DM_I2C)
-#else
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
-
/* EEPROM */
#define CONFIG_SYS_I2C_EEPROM_NXID
#define CONFIG_SYS_EEPROM_BUS_NUM 0
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 194cd69..a71c3e8 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -330,11 +330,6 @@ unsigned long get_board_ddr_clk(void);
/*
* I2C
*/
-#if !CONFIG_IS_ENABLED(DM_I2C)
-#else
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
/* GPIO */
#ifdef CONFIG_DM_GPIO
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 2bf5b01..7ce808b 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -104,11 +104,6 @@
#define CONFIG_SYS_NS16550_CLK get_serial_clock()
/* I2C */
-#if !CONFIG_IS_ENABLED(DM_I2C)
-#else
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
/* EEPROM */
#define CONFIG_SYS_I2C_EEPROM_NXID
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 38c31e8..379a143 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -208,11 +208,6 @@
/*
* I2C
*/
-#if !CONFIG_IS_ENABLED(DM_I2C)
-#else
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
/* GPIO */
#ifdef CONFIG_DM_GPIO
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index e516d8f..c75da97 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -149,11 +149,6 @@
#endif
/* I2C */
-#if !CONFIG_IS_ENABLED(DM_I2C)
-#else
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
/* PCIe */
#ifndef SPL_NO_PCIE
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 524d639..4377034 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -133,11 +133,6 @@
#endif
/* I2C */
-#if !CONFIG_IS_ENABLED(DM_I2C)
-#else
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
-#endif
/* PCIe */
#define CONFIG_PCIE1 /* PCIE controller 1 */
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 25f3b41..cb3dcc0 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -465,9 +465,6 @@
/* I2C */
#if !CONFIG_IS_ENABLED(DM_I2C)
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x29} }
-#else
-#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
-#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
#endif
#define CONFIG_SYS_SPD_BUS_NUM 1 /* For rom_loc and flash bank */