Convert CONFIG_SYS_I2C_MXC et al to Kconfig

author Tom Rini <trini@konsulko.com>

Thu, 19 Aug 2021 03:12:33 +0000 (23:12 -0400)

committer Tom Rini <trini@konsulko.com>

Mon, 30 Aug 2021 18:10:07 +0000 (14:10 -0400)
author Tom Rini <trini@konsulko.com>
Thu, 19 Aug 2021 03:12:33 +0000 (23:12 -0400)
committer Tom Rini <trini@konsulko.com>
Mon, 30 Aug 2021 18:10:07 +0000 (14:10 -0400)
diff --git a/README b/README

index 9313dbcd2e348ccbc1976039cb333e3e9f25ffc4..d59d3be073bb494e636172855d5a77e49159e853 100644 (file)
--- a/README
+++ b/README
@@ -1484,23 +1484,6 @@ The following options need to be configured:
                   - CONFIG_SYS_I2C_PPC4XX_CH0 activate hardware channel 0
                   - CONFIG_SYS_I2C_PPC4XX_CH1 activate hardware channel 1
  
-               - drivers/i2c/i2c_mxc.c
-                 - activate this driver with CONFIG_SYS_I2C_MXC
-                 - enable bus 1 with CONFIG_SYS_I2C_MXC_I2C1
-                 - enable bus 2 with CONFIG_SYS_I2C_MXC_I2C2
-                 - enable bus 3 with CONFIG_SYS_I2C_MXC_I2C3
-                 - enable bus 4 with CONFIG_SYS_I2C_MXC_I2C4
-                 - define speed for bus 1 with CONFIG_SYS_MXC_I2C1_SPEED
-                 - define slave for bus 1 with CONFIG_SYS_MXC_I2C1_SLAVE
-                 - define speed for bus 2 with CONFIG_SYS_MXC_I2C2_SPEED
-                 - define slave for bus 2 with CONFIG_SYS_MXC_I2C2_SLAVE
-                 - define speed for bus 3 with CONFIG_SYS_MXC_I2C3_SPEED
-                 - define slave for bus 3 with CONFIG_SYS_MXC_I2C3_SLAVE
-                 - define speed for bus 4 with CONFIG_SYS_MXC_I2C4_SPEED
-                 - define slave for bus 4 with CONFIG_SYS_MXC_I2C4_SLAVE
-               If those defines are not set, default value is 100000
-               for speed, and 0 for slave.
-
                 - drivers/i2c/rcar_i2c.c:
                   - activate this driver with CONFIG_SYS_I2C_RCAR
                   - This driver adds 4 i2c buses
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig

index 2d59562665f4bc4c3594a37d035553566266d729..695c75312b27ba1231515976486ead26c5f18b71 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -797,6 +797,7 @@ config ARCH_IMX8M
         select SYS_FSL_HAS_SEC if IMX_HAB
         select SYS_FSL_SEC_COMPAT_4
         select SYS_FSL_SEC_LE
+       select SYS_I2C_MXC
         select DM
         select SUPPORT_SPL
         imply CMD_DM
diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig

index 747059b56a52965ccd2d49e7e22ee5ad43f9cb1b..f919d02db428cadc96801c0568e90f2b85e2c3aa 100644 (file)
--- a/arch/arm/cpu/armv7/ls102xa/Kconfig
+++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
@@ -20,6 +20,7 @@ config ARCH_LS1021A
         select SYS_FSL_SEC_LE
         select SYS_FSL_SRDS_1
         select SYS_HAS_SERDES
+       select SYS_I2C_MXC
         imply CMD_PCI
         imply SCSI
         imply SCSI_AHCI
diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig

index 196db0044639a8b3f4d16952316efeb935a691f4..62821d6bf509dfc774a948d7648e1cc3d0613662 100644 (file)
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -11,6 +11,9 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xFFFFDE00
  CONFIG_MX6Q=y
  CONFIG_TARGET_APALIS_IMX6=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis"
  CONFIG_SPL_TEXT_BASE=0x00908000
@@ -71,6 +74,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
  CONFIG_BOOTCOUNT_ENV=y
  CONFIG_DM_I2C=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
+CONFIG_SYS_MXC_I2C3_SPEED=400000
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_PHYLIB=y
diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig

index 60783a80ce5d2474f3df2068377e5ee4cf268097..d4442cc6bb6196835c2f95c208bf3c8fa00a1141 100644 (file)
--- a/configs/cl-som-imx7_defconfig
+++ b/configs/cl-som-imx7_defconfig
@@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
  CONFIG_ENV_SECT_SIZE=0x10000
+CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb"
  CONFIG_TARGET_CL_SOM_IMX7=y
@@ -63,6 +64,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_CMD_PCA953X=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig

index 46255dd4e5bb2c9a5fbaa88c6db41a79d485c7f1..daedd391529bc1e5f4e5d058cbbbafcf691b8ccc 100644 (file)
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -10,6 +10,9 @@ CONFIG_ENV_OFFSET=0xC0000
  CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_MX6QDL=y
  CONFIG_TARGET_CM_FX6=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-cm-fx6"
  CONFIG_SPL_TEXT_BASE=0x00908000
  CONFIG_SPL_MMC_SUPPORT=y
@@ -68,6 +71,8 @@ CONFIG_DWC_AHSATA=y
  # CONFIG_DWC_AHSATA_AHCI is not set
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
+CONFIG_SYS_MXC_I2C3_SPEED=400000
  CONFIG_SYS_I2C_EEPROM_ADDR=0x50
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig

index 7a16d3daba603af0123bc9b209f6b9be7c9cdb44..3a53faff0f3b942a0b5c8dbc2056649eaaa5aeec 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -11,6 +11,9 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xFFFFDE00
  CONFIG_MX6DL=y
  CONFIG_TARGET_COLIBRI_IMX6=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri"
  CONFIG_SPL_TEXT_BASE=0x00908000
@@ -70,6 +73,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
  CONFIG_BOOTCOUNT_ENV=y
  CONFIG_DM_I2C=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
+CONFIG_SYS_MXC_I2C3_SPEED=400000
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_PHYLIB=y
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig

index 39149167e0008e4538c275f4baabd746451b01af..70455ecbc4ccfa0e132c4ffbeb68fd22f7cc2f88 100644 (file)
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -62,6 +62,7 @@ CONFIG_BOOTCOUNT_ENV=y
  CONFIG_FSL_CAAM=y
  CONFIG_DFU_NAND=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_MTD=y
diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig

index 87527671fef198ece9e3776d82b43ae7c083465c..375e3944bf87a82cabc70a6144882d0f68b54eb2 100644 (file)
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -62,6 +62,7 @@ CONFIG_FASTBOOT_FLASH=y
  CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig

index e91017d6e540d435fb807fa6c151090a937b9dcf..61d77ebded16487ea341a206ede76ad5ed0d1002 100644 (file)
--- a/configs/flea3_defconfig
+++ b/configs/flea3_defconfig
@@ -5,6 +5,9 @@ CONFIG_SYS_TEXT_BASE=0xA0000000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_SECT_SIZE=0x10000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_FIT=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_BOOTDELAY=3
@@ -30,6 +33,8 @@ CONFIG_ENV_ADDR=0xA0080000
  CONFIG_ENV_ADDR_REDUND=0xA0090000
  CONFIG_MXC_GPIO=y
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
+CONFIG_SYS_MXC_I2C3_SLAVE=0xfe
  # CONFIG_MMC is not set
  CONFIG_MTD=y
  CONFIG_MTD_NOR_FLASH=y
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig

index 16e95bdfd62a9f2be7b3731835101d62ae6f5980..2383e1a660fa2b74f1f831099be843f53aeea0a2 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -9,6 +9,9 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0xB1400
  CONFIG_MX6QDL=y
  CONFIG_TARGET_GW_VENTANA=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_CMD_EECONFIG=y
  CONFIG_CMD_GSC=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-gw54xx"
@@ -82,6 +85,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_DWC_AHSATA=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_LED=y
  CONFIG_LED_BLINK=y
  CONFIG_LED_GPIO=y
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig

index 4c8ed35dd4f5d3e5434fda1d2183d43c2cb2e220..eabe45b9eb041aa3863086b25721e09c83822e4f 100644 (file)
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -9,6 +9,9 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0xB1400
  CONFIG_MX6QDL=y
  CONFIG_TARGET_GW_VENTANA=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_CMD_EECONFIG=y
  CONFIG_CMD_GSC=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-gw54xx"
@@ -82,6 +85,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_DWC_AHSATA=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_LED=y
  CONFIG_LED_BLINK=y
  CONFIG_LED_GPIO=y
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig

index a9c4e30dc68057f9efae7eca20693028630df934..f988170a0ec18c5ba1e84d2eb60d35dd899f408e 100644 (file)
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -9,6 +9,9 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x1000000
  CONFIG_MX6QDL=y
  CONFIG_TARGET_GW_VENTANA=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_CMD_EECONFIG=y
  CONFIG_CMD_GSC=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-gw54xx"
@@ -84,6 +87,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_DWC_AHSATA=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_LED=y
  CONFIG_LED_BLINK=y
  CONFIG_LED_GPIO=y
diff --git a/configs/imx8mm-cl-iot-gate_defconfig b/configs/imx8mm-cl-iot-gate_defconfig

index 79e4bde07036dcbc7ae53ac38e72fcc7987d9ba7..06d587bab0fb7ac4efa4663a68055f24eb7c29da 100644 (file)
--- a/configs/imx8mm-cl-iot-gate_defconfig
+++ b/configs/imx8mm-cl-iot-gate_defconfig
@@ -9,9 +9,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_ENV_OFFSET=0x4400
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mm-cl-iot-gate"
  CONFIG_SPL_TEXT_BASE=0x7E1000
@@ -83,7 +80,6 @@ CONFIG_FASTBOOT_FLASH=y
  CONFIG_FASTBOOT_FLASH_MMC_DEV=2
  CONFIG_MXC_GPIO=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_DM_KEYBOARD=y
  CONFIG_SUPPORT_EMMC_RPMB=y
  CONFIG_SUPPORT_EMMC_BOOT=y
diff --git a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig

index abc4d659c385e6b6235f4f3a5423345ec1220f06..e743070d6255513e3fd98502c2b73808747f3a58 100644 (file)
--- a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig
+++ b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig
@@ -56,7 +56,6 @@ CONFIG_CLK_IMX8MM=y
  CONFIG_MXC_GPIO=y
  CONFIG_DM_PCA953X=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_PHYLIB=y
diff --git a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig

index 5f45e3352fbcb9d0c7b3e411319173d84f172651..5805238122bd81a3ece4eae2cdacef9aadf9c16b 100644 (file)
--- a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig
+++ b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig
@@ -56,7 +56,6 @@ CONFIG_CLK_IMX8MM=y
  CONFIG_MXC_GPIO=y
  CONFIG_DM_PCA953X=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_PHYLIB=y
diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig

index 78334c45e74358498698a9b02baa7a1b4290a6a9..a6839b0b9d1e694c0a7f5a66e642cbd7e7c23038 100644 (file)
--- a/configs/imx8mm_beacon_defconfig
+++ b/configs/imx8mm_beacon_defconfig
@@ -7,9 +7,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x400000
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mm-beacon-kit"
  CONFIG_SPL_TEXT_BASE=0x7E1000
@@ -69,7 +66,6 @@ CONFIG_CLK_IMX8MM=y
  CONFIG_MXC_GPIO=y
  CONFIG_DM_PCA953X=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_MMC_IO_VOLTAGE=y
  CONFIG_SPL_MMC_IO_VOLTAGE=y
diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig

index f7f39b8dc63c564c0d36f4951f5e3401060d78e7..3a25dfc033043e38987c6a305dfaa7c845d08022 100644 (file)
--- a/configs/imx8mm_evk_defconfig
+++ b/configs/imx8mm_evk_defconfig
@@ -7,9 +7,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x400000
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mm-evk"
  CONFIG_SPL_TEXT_BASE=0x7E1000
@@ -57,7 +54,6 @@ CONFIG_SPL_CLK_IMX8MM=y
  CONFIG_CLK_IMX8MM=y
  CONFIG_MXC_GPIO=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_MMC_IO_VOLTAGE=y
  CONFIG_MMC_UHS_SUPPORT=y
diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig

index 44ff5f84da469399b4f04d2e4f850fb258130573..2f62bebc80f368c9d9de23e3271fd272246e93da 100644 (file)
--- a/configs/imx8mm_venice_defconfig
+++ b/configs/imx8mm_venice_defconfig
@@ -9,9 +9,6 @@ CONFIG_SYS_MEMTEST_START=0x40000000
  CONFIG_SYS_MEMTEST_END=0x80000000
  CONFIG_ENV_SIZE=0x8000
  CONFIG_ENV_OFFSET=0xff0000
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mm-venice"
  CONFIG_SPL_TEXT_BASE=0x7E1000
@@ -72,7 +69,6 @@ CONFIG_SPL_CLK_IMX8MM=y
  CONFIG_CLK_IMX8MM=y
  CONFIG_MXC_GPIO=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_LED=y
  CONFIG_LED_BLINK=y
  CONFIG_LED_GPIO=y
diff --git a/configs/imx8mn_beacon_2g_defconfig b/configs/imx8mn_beacon_2g_defconfig

index 8fec003edd3618595e9d86730742c44e46467d7c..d165de081542be2e306fbb5c38e00f33ad34761f 100644 (file)
--- a/configs/imx8mn_beacon_2g_defconfig
+++ b/configs/imx8mn_beacon_2g_defconfig
@@ -10,9 +10,6 @@ CONFIG_SYS_MEMTEST_START=0x40000000
  CONFIG_SYS_MEMTEST_END=0x44000000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xFFFFDE00
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mn-beacon-kit"
  CONFIG_SPL_TEXT_BASE=0x912000
@@ -84,7 +81,6 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_MXC_GPIO=y
  CONFIG_DM_PCA953X=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_MMC_IO_VOLTAGE=y
  CONFIG_MMC_UHS_SUPPORT=y
diff --git a/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig

index 5296204aad84c3822d8d83920edfbdd6c46f1b35..bb706c83cbffb9fa4ebc116b7883c5c15a1b42a7 100644 (file)
--- a/configs/imx8mn_beacon_defconfig
+++ b/configs/imx8mn_beacon_defconfig
@@ -10,9 +10,6 @@ CONFIG_SYS_MEMTEST_START=0x40000000
  CONFIG_SYS_MEMTEST_END=0x44000000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xFFFFDE00
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mn-beacon-kit"
  CONFIG_SPL_TEXT_BASE=0x912000
@@ -84,7 +81,6 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_MXC_GPIO=y
  CONFIG_DM_PCA953X=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_MMC_IO_VOLTAGE=y
  CONFIG_MMC_UHS_SUPPORT=y
diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig

index 78943dd91d38b84a2522845703e4ba9c4690be68..030bbda78677ffefaa8ec75e7ba16f67ec08b17e 100644 (file)
--- a/configs/imx8mn_ddr4_evk_defconfig
+++ b/configs/imx8mn_ddr4_evk_defconfig
@@ -7,9 +7,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x400000
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mn-ddr4-evk"
  CONFIG_SPL_TEXT_BASE=0x912000
@@ -60,7 +57,6 @@ CONFIG_SPL_CLK_IMX8MN=y
  CONFIG_CLK_IMX8MN=y
  CONFIG_MXC_GPIO=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_MMC_IO_VOLTAGE=y
  CONFIG_MMC_UHS_SUPPORT=y
diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig

index 4b4a0d0d0b2847266364a56785395e47c44cb296..834d73c4ab2ebd25a5b9218372f06fa81bc24f90 100644 (file)
--- a/configs/imx8mn_evk_defconfig
+++ b/configs/imx8mn_evk_defconfig
@@ -9,9 +9,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x400000
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mn-evk"
  CONFIG_SPL_TEXT_BASE=0x912000
@@ -62,7 +59,6 @@ CONFIG_SPL_CLK_IMX8MN=y
  CONFIG_CLK_IMX8MN=y
  CONFIG_MXC_GPIO=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_MMC_IO_VOLTAGE=y
  CONFIG_MMC_UHS_SUPPORT=y
diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig

index 125771705bce7534ea8843365cf1b01cb5310901..397897261745078fff4d93e49a6eaa763ad94b2d 100644 (file)
--- a/configs/imx8mp_evk_defconfig
+++ b/configs/imx8mp_evk_defconfig
@@ -63,7 +63,6 @@ CONFIG_DM_PCA953X=y
  CONFIG_DM_I2C=y
  # CONFIG_SPL_DM_I2C is not set
  CONFIG_SPL_SYS_I2C_LEGACY=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_LED=y
  CONFIG_LED_GPIO=y
  CONFIG_SUPPORT_EMMC_BOOT=y
diff --git a/configs/imx8mq_cm_defconfig b/configs/imx8mq_cm_defconfig

index e904c6ac270060695babd2f74259506d6d81b281..57925b7b591765b2c4e9fdbcdd9207e4a716c689 100644 (file)
--- a/configs/imx8mq_cm_defconfig
+++ b/configs/imx8mq_cm_defconfig
@@ -47,7 +47,6 @@ CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000
  CONFIG_MXC_GPIO=y
  CONFIG_DM_I2C=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_MMC_IO_VOLTAGE=y
  CONFIG_MMC_UHS_SUPPORT=y
diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig

index b778c17adabbb7d0af646689d2270fdf6b5714ea..ac1e7815768aa95c5e65cdf921f6866f0f0b61e5 100644 (file)
--- a/configs/imx8mq_evk_defconfig
+++ b/configs/imx8mq_evk_defconfig
@@ -3,6 +3,9 @@ CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x400000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mq-evk"
  CONFIG_SPL_TEXT_BASE=0x7E1000
@@ -39,7 +42,6 @@ CONFIG_SYS_MMC_ENV_DEV=1
  CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000
  CONFIG_DM_I2C=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_PHYLIB=y
diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig

index 39306d10bb2fffe186ef2da94dbb42feb2d2c692..41c99cd4faf0b48d5bd887ca8dc447818cb75f8a 100644 (file)
--- a/configs/imx8mq_phanbell_defconfig
+++ b/configs/imx8mq_phanbell_defconfig
@@ -4,6 +4,9 @@ CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_SYS_MALLOC_F_LEN=0x4000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x400000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mq-phanbell"
  CONFIG_SPL_TEXT_BASE=0x7E1000
@@ -45,7 +48,6 @@ CONFIG_SYS_MMC_ENV_DEV=1
  CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000
  CONFIG_DM_I2C=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_DM_ETH=y
diff --git a/configs/kp_imx53_defconfig b/configs/kp_imx53_defconfig

index 4a2d8afe4ee38f255cedacedb40422e9125f883b..abca8645c5f43ddc05fce4f71c38c8f4bc7ba4af 100644 (file)
--- a/configs/kp_imx53_defconfig
+++ b/configs/kp_imx53_defconfig
@@ -38,6 +38,7 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
  CONFIG_I2C_DEFAULT_BUS_NUMBER=0x1
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_ESDHC_IMX=y
  CONFIG_MTD=y
  CONFIG_PHYLIB=y
diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig

index 96c1061683bdc5c8d5f3db2a40aaa5742683c30b..34418aeee3344a5a5f29df93d7400a753f9d8a36 100644 (file)
--- a/configs/kp_imx6q_tpc_defconfig
+++ b/configs/kp_imx6q_tpc_defconfig
@@ -11,8 +11,6 @@ CONFIG_ENV_OFFSET=0x100000
  CONFIG_MX6QDL=y
  CONFIG_MX6_DDRCAL=y
  CONFIG_TARGET_KP_IMX6Q_TPC=y
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-kp"
  CONFIG_SPL_TEXT_BASE=0x00908000
  CONFIG_SPL_MMC_SUPPORT=y
diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig

index 7784ce1777f9a6a805b489ef6a3d8a2034ba9fc5..63657b116f00c450695dfc2eb436faa9380ef38b 100644 (file)
--- a/configs/ls1021aiot_qspi_defconfig
+++ b/configs/ls1021aiot_qspi_defconfig
@@ -5,6 +5,9 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_ENV_SECT_SIZE=0x10000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
  CONFIG_AHCI=y
diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig

index 1044a9ef180b1f32df90c3747e8a03c6c4a1df6a..cd31e41cf96bf9729b170dbbe2a2b5e200f602d9 100644 (file)
--- a/configs/ls1021aiot_sdcard_defconfig
+++ b/configs/ls1021aiot_sdcard_defconfig
@@ -4,6 +4,9 @@ CONFIG_SYS_TEXT_BASE=0x82000000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x100000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig

index 889d905a0c09b3f451b21bef215aa9d66aa703fe..376cbd0fea16f3b3a4f9aec2773f4d3cfc3d1cf1 100644 (file)
--- a/configs/ls1021aqds_ddr4_nor_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -6,6 +6,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig

index 76ad102ffc2a50bd72d42abeeec4921929f8f96f..a793331bcd905b5f87bfcc5728c68b9340901e59 100644 (file)
--- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@ -6,6 +6,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig

index 48129fd8a33ed2b771ca10eba70b8df56da3d0d8..9ca413fbdb37eee2624f4ec6fe9cc39f82f61a28 100644 (file)
--- a/configs/ls1021aqds_nand_defconfig
+++ b/configs/ls1021aqds_nand_defconfig
@@ -8,6 +8,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x140000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig

index 464c6a31034459e06a05910432ef8643a7bdd86d..4b9d693d659de9b19ab5d0843400ba6bf0c7ace3 100644 (file)
--- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@ -6,6 +6,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_NXP_ESBC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig

index 45a00f6d05ce4e9a3c6dfbc44d84984854fc6a0b..fc4a4631ed7f08ecedfd50618a124240e28d0f32 100644 (file)
--- a/configs/ls1021aqds_nor_defconfig
+++ b/configs/ls1021aqds_nor_defconfig
@@ -6,6 +6,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig

index 7334d656d1fad4cea1b897ff6533b63a7d0bc9e4..ddb92bcf1a781550e6260eb9e9edfd97053dba60 100644 (file)
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -6,6 +6,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig

index 08ef0d8afe3335b652e19a7c4c656c43a68721f4..69366dc45ba143f23821280b416185a22fe513f4 100644 (file)
--- a/configs/ls1021aqds_qspi_defconfig
+++ b/configs/ls1021aqds_qspi_defconfig
@@ -7,6 +7,9 @@ CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
  CONFIG_ENV_SECT_SIZE=0x10000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig b/configs/ls1021aqds_sdcard_ifc_defconfig

index b11647627ecd758af7a409327b9022703611d9bb..f1ad40d2f1e524b098c3325c0d258f41e3594875 100644 (file)
--- a/configs/ls1021aqds_sdcard_ifc_defconfig
+++ b/configs/ls1021aqds_sdcard_ifc_defconfig
@@ -8,6 +8,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig b/configs/ls1021aqds_sdcard_qspi_defconfig

index 95db092d2de7b7eb7db88f0be5271b1d6e65130e..427a28e02e03f9cd285d2f7b5d3c0380a0a912c2 100644 (file)
--- a/configs/ls1021aqds_sdcard_qspi_defconfig
+++ b/configs/ls1021aqds_sdcard_qspi_defconfig
@@ -8,6 +8,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1021atsn_qspi_defconfig b/configs/ls1021atsn_qspi_defconfig

index ab21efcd31719c2fc57c530da9be8268d5cb7e78..c5d13aad3ec6930e20dc25ce777e8b905508b321 100644 (file)
--- a/configs/ls1021atsn_qspi_defconfig
+++ b/configs/ls1021atsn_qspi_defconfig
@@ -5,6 +5,9 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
  CONFIG_ENV_SECT_SIZE=0x40000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-tsn"
  CONFIG_AHCI=y
diff --git a/configs/ls1021atsn_sdcard_defconfig b/configs/ls1021atsn_sdcard_defconfig

index 225d45354a9e24e86cd259fe071166ebaf321af0..4663a991275b26ee9ece143a4810065d4c74afa9 100644 (file)
--- a/configs/ls1021atsn_sdcard_defconfig
+++ b/configs/ls1021atsn_sdcard_defconfig
@@ -6,6 +6,9 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-tsn"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig

index 0adc76fc7d0b484ceb18e30e4faa40a59765d152..14714dca309b69c0f62bdc0c725749fa08876583 100644 (file)
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -6,6 +6,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_NXP_ESBC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
  CONFIG_AHCI=y
diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig

index 1772d34cdad8f9d9beae10e7a73c432bcf565063..fb05b984d64041d58e84219517bb2953568a3f21 100644 (file)
--- a/configs/ls1021atwr_nor_defconfig
+++ b/configs/ls1021atwr_nor_defconfig
@@ -6,6 +6,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
  CONFIG_AHCI=y
diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig

index 52067cc97b7b31c61f4093dadc0c71e2e751ffaa..cae0f266f694304933a10224f307acefe56d41e4 100644 (file)
--- a/configs/ls1021atwr_nor_lpuart_defconfig
+++ b/configs/ls1021atwr_nor_lpuart_defconfig
@@ -6,6 +6,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-lpuart"
  CONFIG_AHCI=y
diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig

index 955072eaf3609c15997cc3896446aa52af0d3349..6b07335ab4f8460ea0dc093cd7b0f2375f8a12ff 100644 (file)
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -7,6 +7,9 @@ CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
  CONFIG_ENV_SECT_SIZE=0x10000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
  CONFIG_AHCI=y
diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig

index a40191ed63122a2e896758c277a1a470036845b2..8a446e22eee60b5113535c9848e0e21f4c3faf96 100644 (file)
--- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
@@ -8,6 +8,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_NXP_ESBC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig

index 97c0953689e7dbbc73321b630238767e17d160c1..cf98227e851e81b963369c7c7c48cee54d3767b4 100644 (file)
--- a/configs/ls1021atwr_sdcard_ifc_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_defconfig
@@ -8,6 +8,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig

index 26f16e5a4bd47d535d1f6abfabcdec2a7ecf9171..b75318dc30a4c3b30dca0118b0884976f456c7ac 100644 (file)
--- a/configs/ls1021atwr_sdcard_qspi_defconfig
+++ b/configs/ls1021atwr_sdcard_qspi_defconfig
@@ -8,6 +8,9 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1043aqds_defconfig b/configs/ls1043aqds_defconfig

index 46be58980add91f488fc1c37008f2800f013f223..700fcec27478abb8613b25d81a4f212aa3c1bef1 100644 (file)
--- a/configs/ls1043aqds_defconfig
+++ b/configs/ls1043aqds_defconfig
@@ -6,6 +6,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1043aqds_lpuart_defconfig b/configs/ls1043aqds_lpuart_defconfig

index b3e024af675ceeaf5b272b77d52e6ee22f8a02fa..735a4ffc5ce9af5d80bbd5ae08be79bb3c1b43ca 100644 (file)
--- a/configs/ls1043aqds_lpuart_defconfig
+++ b/configs/ls1043aqds_lpuart_defconfig
@@ -6,6 +6,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-lpuart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1043aqds_nand_defconfig b/configs/ls1043aqds_nand_defconfig

index a55d5c11b30a4bc0ccb19a831c64e035ca6284a9..53425d194d4dee0e91c99758b2821debf16ba7f4 100644 (file)
--- a/configs/ls1043aqds_nand_defconfig
+++ b/configs/ls1043aqds_nand_defconfig
@@ -8,6 +8,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1043aqds_nor_ddr3_defconfig b/configs/ls1043aqds_nor_ddr3_defconfig

index c68e027b452fd96e440558fab314dc712514c70f..55dedfd2c10621da33cc8705c97ba3367e1568bd 100644 (file)
--- a/configs/ls1043aqds_nor_ddr3_defconfig
+++ b/configs/ls1043aqds_nor_ddr3_defconfig
@@ -6,6 +6,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1043aqds_qspi_defconfig b/configs/ls1043aqds_qspi_defconfig

index dabaadf73d49140dfa850b4e0736022e6339c4f4..c8a85dacfff6bcec0963fc2e2dd5f459fa1e08d9 100644 (file)
--- a/configs/ls1043aqds_qspi_defconfig
+++ b/configs/ls1043aqds_qspi_defconfig
@@ -7,6 +7,10 @@ CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
  CONFIG_ENV_SECT_SIZE=0x10000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1043aqds_sdcard_ifc_defconfig b/configs/ls1043aqds_sdcard_ifc_defconfig

index 234ac16b9bd02d270c6a1956e15893f4abdceb71..e1ed0b023059f6dd03d6e3f67eb19eeaa22d41df 100644 (file)
--- a/configs/ls1043aqds_sdcard_ifc_defconfig
+++ b/configs/ls1043aqds_sdcard_ifc_defconfig
@@ -8,6 +8,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1043aqds_sdcard_qspi_defconfig b/configs/ls1043aqds_sdcard_qspi_defconfig

index 750fd544deeb06142b204538971de7900800ca21..20138f47de627e229071d21bb3433fdfdc0f2256 100644 (file)
--- a/configs/ls1043aqds_sdcard_qspi_defconfig
+++ b/configs/ls1043aqds_sdcard_qspi_defconfig
@@ -8,6 +8,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig

index c9d22e73750b96d766ac9a940454e753ca324420..2ba76411e8dd3ebb9c1e1a80a79fbb94a3069e50 100644 (file)
--- a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
@@ -7,6 +7,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_NXP_ESBC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1043aqds_tfa_defconfig b/configs/ls1043aqds_tfa_defconfig

index 12240b0147ce29bd4c002a223dd5c9c9a6ef7b93..c9116d71ce7ea04367cad273bed401a8ecbae40d 100644 (file)
--- a/configs/ls1043aqds_tfa_defconfig
+++ b/configs/ls1043aqds_tfa_defconfig
@@ -8,6 +8,10 @@ CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x500000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig

index 8d233b17d0a94ef732651f92b4597d30a25bed11..83d8a7f34c1ba647b0c9dedc3f5221b544b646e0 100644 (file)
--- a/configs/ls1043ardb_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_SECURE_BOOT_defconfig
@@ -4,6 +4,10 @@ CONFIG_SYS_TEXT_BASE=0x60100000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x20000
  CONFIG_NXP_ESBC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
  CONFIG_FSL_LS_PPA=y
diff --git a/configs/ls1043ardb_defconfig b/configs/ls1043ardb_defconfig

index 63f73d77c90e642440e95dd0027f2283be5e5ea7..2cf3c3772b0943a321f8e0effd89d59fb3caf609 100644 (file)
--- a/configs/ls1043ardb_defconfig
+++ b/configs/ls1043ardb_defconfig
@@ -4,6 +4,10 @@ CONFIG_SYS_TEXT_BASE=0x60100000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
  CONFIG_FSL_LS_PPA=y
diff --git a/configs/ls1043ardb_nand_defconfig b/configs/ls1043ardb_nand_defconfig

index a964650b11b8a8e2a9e3994e2d18ee6873c9d6e1..783efe0e67fd76438d2b527f8cf313bafa2f74d7 100644 (file)
--- a/configs/ls1043ardb_nand_defconfig
+++ b/configs/ls1043ardb_nand_defconfig
@@ -6,6 +6,10 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1043ardb_sdcard_defconfig b/configs/ls1043ardb_sdcard_defconfig

index 96ba7867e7ee2cc0ea6dc3a49b9b627a90a2a289..ec7d770485ff2bcb2e70a47440a052623f133c5f 100644 (file)
--- a/configs/ls1043ardb_sdcard_defconfig
+++ b/configs/ls1043ardb_sdcard_defconfig
@@ -6,6 +6,10 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig

index f24cc9ada3a1370d40cc12a983502485454b9341..5f23315c6d8323be9edf2fc18c2ca181eccd10a7 100644 (file)
--- a/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
@@ -5,6 +5,10 @@ CONFIG_SYS_TEXT_BASE=0x82000000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_NXP_ESBC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
diff --git a/configs/ls1043ardb_tfa_defconfig b/configs/ls1043ardb_tfa_defconfig

index dcb74a66ea9507e5252342eebe8202d219ae4810..0587538cae357ec9c072208af155390f9aee9b71 100644 (file)
--- a/configs/ls1043ardb_tfa_defconfig
+++ b/configs/ls1043ardb_tfa_defconfig
@@ -6,6 +6,10 @@ CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x500000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
  CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
diff --git a/configs/ls1046aqds_SECURE_BOOT_defconfig b/configs/ls1046aqds_SECURE_BOOT_defconfig

index 2de1b96e7654a7cb04c199d87831d9965106e3d8..8609fb3137194938b95471227640ce756850c14f 100644 (file)
--- a/configs/ls1046aqds_SECURE_BOOT_defconfig
+++ b/configs/ls1046aqds_SECURE_BOOT_defconfig
@@ -6,6 +6,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_NXP_ESBC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig

index 1fe59ea67ab059903338eb711cc981eae5a5f20c..e2dc8db2b6f3735392d134f37c564f7e023846d9 100644 (file)
--- a/configs/ls1046aqds_defconfig
+++ b/configs/ls1046aqds_defconfig
@@ -6,6 +6,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig

index 8e665a60af823b1bdd1347bc9f977e6f725b1f9c..b0aa453d4d1577b79bf647ab5b38f65ec9e40011 100644 (file)
--- a/configs/ls1046aqds_lpuart_defconfig
+++ b/configs/ls1046aqds_lpuart_defconfig
@@ -6,6 +6,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-lpuart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1046aqds_nand_defconfig b/configs/ls1046aqds_nand_defconfig

index 64dbaeab98e11725f1bd4804c8fc6097620e361b..bff3a64983f3b52b1b38788e2ca81cbda1f52a2d 100644 (file)
--- a/configs/ls1046aqds_nand_defconfig
+++ b/configs/ls1046aqds_nand_defconfig
@@ -6,6 +6,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1046aqds_qspi_defconfig b/configs/ls1046aqds_qspi_defconfig

index 1b06cc640853c21edaa5c11df646cdf17091fec2..e597ca68f217e13c8987180047ef6fa7bef4ad92 100644 (file)
--- a/configs/ls1046aqds_qspi_defconfig
+++ b/configs/ls1046aqds_qspi_defconfig
@@ -7,6 +7,10 @@ CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
  CONFIG_ENV_SECT_SIZE=0x10000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1046aqds_sdcard_ifc_defconfig b/configs/ls1046aqds_sdcard_ifc_defconfig

index c73e380fa8f5c90c9b7b90a8a65b98442fcd1982..17764716a3aee7fbc60da7ee902115117e96289b 100644 (file)
--- a/configs/ls1046aqds_sdcard_ifc_defconfig
+++ b/configs/ls1046aqds_sdcard_ifc_defconfig
@@ -8,6 +8,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1046aqds_sdcard_qspi_defconfig b/configs/ls1046aqds_sdcard_qspi_defconfig

index 16fb3c41dfa5ec9e0a8cbaab2b11176cfe89e6a2..79de051e4da21b90af4f7b950768fa436aab0370 100644 (file)
--- a/configs/ls1046aqds_sdcard_qspi_defconfig
+++ b/configs/ls1046aqds_sdcard_qspi_defconfig
@@ -8,6 +8,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig

index d12c8b6a0caeb319bc874c7fb1f96534c4351238..4c6df4bb06e74bc137cc9426b78ba00e9f93dd57 100644 (file)
--- a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
@@ -7,6 +7,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_NXP_ESBC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig

index 6ff00d56abbb158014f95b080a053ae0b8795aea..4fad6adfc9dee3a73905d6a813f4ab0a91ab2c60 100644 (file)
--- a/configs/ls1046aqds_tfa_defconfig
+++ b/configs/ls1046aqds_tfa_defconfig
@@ -8,6 +8,10 @@ CONFIG_SYS_MEMTEST_END=0x9fffffff
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x500000
  CONFIG_ENV_SECT_SIZE=0x10000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart"
  CONFIG_FSL_USE_PCA9547_MUX=y
diff --git a/configs/ls1046ardb_emmc_defconfig b/configs/ls1046ardb_emmc_defconfig

index 88c060b7e1cab27885c42267f72c4b7767406436..43b0c7e6ca6f9721ef8edd2929f2eb16f5cc0b0c 100644 (file)
--- a/configs/ls1046ardb_emmc_defconfig
+++ b/configs/ls1046ardb_emmc_defconfig
@@ -6,6 +6,10 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig

index 55d59067743325f84b9c74d0158aa896fa373273..da5a9858b03ceaddd6be463a5877283591cf5279 100644 (file)
--- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
@@ -4,6 +4,10 @@ CONFIG_SYS_TEXT_BASE=0x40100000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_NXP_ESBC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
  CONFIG_FSL_LS_PPA=y
diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig

index a1b027b3c53e2ad1d08a6d5fb15a302a5562d8f0..b8febb7bb8ee6e1da1739096ec837c4b69bba24f 100644 (file)
--- a/configs/ls1046ardb_qspi_defconfig
+++ b/configs/ls1046ardb_qspi_defconfig
@@ -5,6 +5,10 @@ CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
  CONFIG_ENV_SECT_SIZE=0x40000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
  CONFIG_FSL_LS_PPA=y
diff --git a/configs/ls1046ardb_qspi_spl_defconfig b/configs/ls1046ardb_qspi_spl_defconfig

index 5be54deaab024ed1ffdf66ed57edab0e2c88040e..6d133676cf198b20f77df8d70c93e3a685df1ce1 100644 (file)
--- a/configs/ls1046ardb_qspi_spl_defconfig
+++ b/configs/ls1046ardb_qspi_spl_defconfig
@@ -7,6 +7,10 @@ CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
  CONFIG_ENV_SECT_SIZE=0x40000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig

index 9b08d0a9368511830fa1c3dcd0c36b2b03d55da4..4b65d4ef351cb6178b523c333c8fbc5e178105b3 100644 (file)
--- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
@@ -6,6 +6,10 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_NXP_ESBC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1046ardb_sdcard_defconfig b/configs/ls1046ardb_sdcard_defconfig

index 19a6956ba650939658f646ba6c6f40a7dd283d31..2da4a008310101edb523765974e79fc4f9c39922 100644 (file)
--- a/configs/ls1046ardb_sdcard_defconfig
+++ b/configs/ls1046ardb_sdcard_defconfig
@@ -6,6 +6,10 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x300000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
  CONFIG_SPL_TEXT_BASE=0x10000000
diff --git a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig

index 2e8cea922d8d4a20627bc126e0e64ef0f8a7a1d3..704a5841dfe14f565d31d20646189e1d273f12f7 100644 (file)
--- a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
@@ -5,6 +5,10 @@ CONFIG_SYS_TEXT_BASE=0x82000000
  CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_NXP_ESBC=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
  CONFIG_QSPI_AHB_INIT=y
diff --git a/configs/ls1046ardb_tfa_defconfig b/configs/ls1046ardb_tfa_defconfig

index 15f2f89e20091ee2179ae6557288d5290bd5a64c..890a8db8a167eee9102ca2e955d07d2ad205a6b4 100644 (file)
--- a/configs/ls1046ardb_tfa_defconfig
+++ b/configs/ls1046ardb_tfa_defconfig
@@ -6,6 +6,10 @@ CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x500000
  CONFIG_ENV_SECT_SIZE=0x40000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
  CONFIG_QSPI_AHB_INIT=y
diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig

index 42d9bd473b0c898f9a3a69cc2d6865e7653a1354..a3be68574e7f32cc2c62c39539fa66679cdce973 100644 (file)
--- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
@@ -46,6 +46,8 @@ CONFIG_DM=y
  CONFIG_SCSI_AHCI=y
  CONFIG_SATA_CEVA=y
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_MXC_I2C1_SPEED=40000000
+CONFIG_SYS_MXC_I2C2_SPEED=40000000
  CONFIG_SYS_I2C_EEPROM_ADDR=0x57
  CONFIG_FSL_ESDHC=y
  CONFIG_MTD=y
diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig

index 7c769a1bd3bcbb48789438ac562be94b1e485e3e..27433b692738919e51e88553bd8eb151d51cda7c 100644 (file)
--- a/configs/ls1088ardb_qspi_defconfig
+++ b/configs/ls1088ardb_qspi_defconfig
@@ -49,6 +49,8 @@ CONFIG_DM=y
  CONFIG_SCSI_AHCI=y
  CONFIG_SATA_CEVA=y
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_MXC_I2C1_SPEED=40000000
+CONFIG_SYS_MXC_I2C2_SPEED=40000000
  CONFIG_SYS_I2C_EEPROM_ADDR=0x57
  CONFIG_FSL_ESDHC=y
  CONFIG_MTD=y
diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig

index c75f4726bc5ce2a0fbb58ac2dc3d8b76fff4bee9..0a21addbd8427a536379c6c2dfbaa0494e42f0cf 100644 (file)
--- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
@@ -60,6 +60,8 @@ CONFIG_SPL_DM=y
  CONFIG_SCSI_AHCI=y
  # CONFIG_SPL_BLK is not set
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_MXC_I2C1_SPEED=40000000
+CONFIG_SYS_MXC_I2C2_SPEED=40000000
  CONFIG_SYS_I2C_EEPROM_ADDR=0x57
  # CONFIG_SPL_DM_MMC is not set
  CONFIG_FSL_ESDHC=y
diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_sdcard_qspi_defconfig

index a2f9d714c1d47651abb5ec27adbda6a583488dc5..73f638145cc18f7a6fd01130592d4fa82743f154 100644 (file)
--- a/configs/ls1088ardb_sdcard_qspi_defconfig
+++ b/configs/ls1088ardb_sdcard_qspi_defconfig
@@ -59,6 +59,8 @@ CONFIG_DM=y
  CONFIG_SCSI_AHCI=y
  CONFIG_SATA_CEVA=y
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_MXC_I2C1_SPEED=40000000
+CONFIG_SYS_MXC_I2C2_SPEED=40000000
  CONFIG_SYS_I2C_EEPROM_ADDR=0x57
  CONFIG_FSL_ESDHC=y
  CONFIG_MTD=y
diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig

index ad4058838451d729d7829ed8cd97eee5b4ffc4be..0c21c66e279e20ab33d7f543b77364051adb6590 100644 (file)
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -9,6 +9,9 @@ CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x4000
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_TARGET_M53MENLO=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx53-m53menlo"
  CONFIG_SPL_TEXT_BASE=0x70008000
@@ -68,6 +71,7 @@ CONFIG_BOOTCOUNT_LIMIT=y
  CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_ESDHC_IMX=y
  CONFIG_MTD=y
  CONFIG_MTD_RAW_NAND=y
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig

index a9cff225f5b346320e0dc55dc95c914a8e7cc27d..2c7906c0b3fb39ce1b8cfe54a2c5eb8d1247fc41 100644 (file)
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -7,6 +7,9 @@ CONFIG_ENV_OFFSET=0xC0000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_MX6Q=y
  CONFIG_TARGET_EMBESTMX6BOARDS=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-marsboard"
  CONFIG_DISTRO_DEFAULTS=y
@@ -31,6 +34,7 @@ CONFIG_DM=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SF_DEFAULT_MODE=0
diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig

index 2c82e3ca45b68fe5f975c5a1afa4e15c1c2ecb93..6d954984991aae61ec801d69fb08afafb5d89dcd 100644 (file)
--- a/configs/mccmon6_nor_defconfig
+++ b/configs/mccmon6_nor_defconfig
@@ -8,8 +8,6 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_MX6QDL=y
  CONFIG_TARGET_MCCMON6=y
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-mccmon6"
  CONFIG_SPL_TEXT_BASE=0x00908000
  CONFIG_SPL_SERIAL_SUPPORT=y
diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig

index 5c1aea8f7a8618c227b567c66f894e2078763db4..6039b955d057148dc48396fb013d6299fd78e317 100644 (file)
--- a/configs/mccmon6_sd_defconfig
+++ b/configs/mccmon6_sd_defconfig
@@ -8,8 +8,6 @@ CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
  CONFIG_MX6QDL=y
  CONFIG_TARGET_MCCMON6=y
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-mccmon6"
  CONFIG_SPL_TEXT_BASE=0x00908000
  CONFIG_SPL_MMC_SUPPORT=y
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig

index 7068189e1dd2b46f083d7f277ba15f63a5393b7d..07c6ca40e8c93a505e21f9d4ba1304c3597e4a92 100644 (file)
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -6,6 +6,9 @@ CONFIG_NR_DRAM_BANKS=2
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
  CONFIG_TARGET_MX53LOCO=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx53-qsb"
  # CONFIG_CMD_BMODE is not set
@@ -33,6 +36,7 @@ CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_ESDHC_IMX=y
  CONFIG_MTD=y
  CONFIG_PHYLIB=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig

index a8d0dad899c1208fbf8809ff468f71885e9a04d9..27cc261c14364f9c468628fde9f5b4a0c54aa396 100644 (file)
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -9,6 +9,9 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
  CONFIG_MX6Q=y
  CONFIG_TARGET_NITROGEN6X=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabrelite"
  CONFIG_CMD_HDMIDETECT=y
@@ -49,6 +52,7 @@ CONFIG_DWC_AHSATA=y
  CONFIG_USB_FUNCTION_FASTBOOT=y
  CONFIG_FASTBOOT_BUF_ADDR=0x12000000
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig

index f8b905136a0838e3f05aaaa64783990d8df2e94e..60f54a9f338f249a431837e275c8465a7fa3dfca 100644 (file)
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -10,6 +10,9 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
  CONFIG_MX6QDL=y
  CONFIG_TARGET_MX6SABREAUTO=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto"
  CONFIG_SPL_TEXT_BASE=0x00908000
@@ -70,6 +73,7 @@ CONFIG_DFU_MMC=y
  CONFIG_DFU_SF=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_MTD_RAW_NAND=y
diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig

index 7a16152e6b0fbec158d19111191bd73a88ee55fa..533cf292d6ae1285da459a42e40a0bf6c43187af 100644 (file)
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -10,6 +10,9 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
  CONFIG_MX6QDL=y
  CONFIG_TARGET_MX6SABRESD=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabresd"
  CONFIG_SPL_TEXT_BASE=0x00908000
@@ -79,6 +82,7 @@ CONFIG_FASTBOOT_FLASH=y
  CONFIG_FASTBOOT_FLASH_MMC_DEV=2
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig

index 9e1032938f120a64eb9e3a825b2ba49d482242b1..af426cd8c8222ae5834f6c7b868e07c28b50aa4b 100644 (file)
--- a/configs/mx6slevk_defconfig
+++ b/configs/mx6slevk_defconfig
@@ -38,6 +38,7 @@ CONFIG_SYS_MMC_ENV_DEV=1
  CONFIG_DM=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig

index 8df10ed2ae5de0215c0d119cef63150381285f9c..3304d4689f751d749198c8c3682d28553ce53b75 100644 (file)
--- a/configs/mx6slevk_spinor_defconfig
+++ b/configs/mx6slevk_spinor_defconfig
@@ -38,6 +38,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig

index ca1042b4b57c8159ac207c04f7092189955af730..cf5b24e3df55045a3edc919125b60d275707398c 100644 (file)
--- a/configs/mx6slevk_spl_defconfig
+++ b/configs/mx6slevk_spl_defconfig
@@ -9,6 +9,9 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x80000
  CONFIG_MX6SL=y
  CONFIG_TARGET_MX6SLEVK=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
  CONFIG_SPL_TEXT_BASE=0x00908000
@@ -48,6 +51,7 @@ CONFIG_DM=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_DM_I2C=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/mx6sllevk_defconfig b/configs/mx6sllevk_defconfig

index 9f02ec838a033a0178c8c78f974ff78d1164cbee..3f4bc099bafc2c30faf3c8738da2edb49af107fc 100644 (file)
--- a/configs/mx6sllevk_defconfig
+++ b/configs/mx6sllevk_defconfig
@@ -36,6 +36,7 @@ CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_PINCTRL=y
diff --git a/configs/mx6sllevk_plugin_defconfig b/configs/mx6sllevk_plugin_defconfig

index 6fc49150b3c17555a433cc7a972d32e60e075ddd..c29121dacd2e87e5dfc4411971846d8af3624fe6 100644 (file)
--- a/configs/mx6sllevk_plugin_defconfig
+++ b/configs/mx6sllevk_plugin_defconfig
@@ -37,6 +37,7 @@ CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_PINCTRL=y
diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig

index d888e7255d2dab73de89c7a4e1ffd5ed09579a82..16781a07b6154df1753acffa635c497f30e45425 100644 (file)
--- a/configs/mx6sxsabreauto_defconfig
+++ b/configs/mx6sxsabreauto_defconfig
@@ -37,6 +37,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_DM_PCA953X=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_MTD_RAW_NAND=y
diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig

index 67dfcda8fa7473b89acd39ce8cc351a268c845d0..e099e991dc33f304116519f081f474957f0d47da 100644 (file)
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -40,6 +40,7 @@ CONFIG_SYS_MMC_ENV_DEV=2
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig

index fa97b8fea4c42be7d4f5cba7c6ddc50bb7630eba..3519dec368fa1cadfec068b78aa1c7008ab5073d 100644 (file)
--- a/configs/mx6ul_14x14_evk_defconfig
+++ b/configs/mx6ul_14x14_evk_defconfig
@@ -11,6 +11,8 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
  CONFIG_MX6UL=y
  CONFIG_TARGET_MX6UL_14X14_EVK=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6ul-14x14-evk"
  CONFIG_SPL_TEXT_BASE=0x00908000
@@ -58,6 +60,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
  CONFIG_DM_74X164=y
  CONFIG_DM_I2C=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig

index 1717f07f80c553a3e7ad191070c37fb482283973..81f2538aea18b31c958ce61fd0662c3a90ad6948 100644 (file)
--- a/configs/mx6ul_9x9_evk_defconfig
+++ b/configs/mx6ul_9x9_evk_defconfig
@@ -11,6 +11,8 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x80000
  CONFIG_MX6UL=y
  CONFIG_TARGET_MX6UL_9X9_EVK=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6ul-9x9-evk"
  CONFIG_SPL_TEXT_BASE=0x00908000
@@ -51,6 +53,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_DM_I2C=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/mx6ull_14x14_evk_defconfig b/configs/mx6ull_14x14_evk_defconfig

index 24e18c1d4ebde7ac96eab1b969596abb7a4cdfde..71a0b392eb0d0a3fe3e2bb48ff1c87a996891bf7 100644 (file)
--- a/configs/mx6ull_14x14_evk_defconfig
+++ b/configs/mx6ull_14x14_evk_defconfig
@@ -36,6 +36,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_DM_74X164=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig b/configs/mx6ull_14x14_evk_plugin_defconfig

index 2700f98e6c6a8d17b2d99025867d86f236f2d4b9..93c09655238b95687e6db62726a34f6722323670 100644 (file)
--- a/configs/mx6ull_14x14_evk_plugin_defconfig
+++ b/configs/mx6ull_14x14_evk_plugin_defconfig
@@ -37,6 +37,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_DM_74X164=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/mx6ulz_14x14_evk_defconfig b/configs/mx6ulz_14x14_evk_defconfig

index 23c821079e5dcfe74ebb7aa92c597eae4745778c..a3cd54fa93962376c0dd4893c6e149ff3a009f5f 100644 (file)
--- a/configs/mx6ulz_14x14_evk_defconfig
+++ b/configs/mx6ulz_14x14_evk_defconfig
@@ -35,6 +35,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_DM_74X164=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_ESDHC_IMX=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig

index 39e73042bfb9c58e942cd4912530215b5356a57d..eb333a9b8a388833ac7ad382393ad43e9f4d2331 100644 (file)
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -45,6 +45,7 @@ CONFIG_DFU_MMC=y
  CONFIG_DFU_RAM=y
  CONFIG_DM_74X164=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_MMC_IO_VOLTAGE=y
  CONFIG_MMC_UHS_SUPPORT=y
diff --git a/configs/mx7dsabresd_qspi_defconfig b/configs/mx7dsabresd_qspi_defconfig

index f5d2f253657ccb39855412117ecde9fcada54fe7..3503ddfc0262abff92f168a2f2d8adaa222debbc 100644 (file)
--- a/configs/mx7dsabresd_qspi_defconfig
+++ b/configs/mx7dsabresd_qspi_defconfig
@@ -44,6 +44,7 @@ CONFIG_DFU_MMC=y
  CONFIG_DFU_RAM=y
  CONFIG_DM_74X164=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_MMC_IO_VOLTAGE=y
  CONFIG_MMC_UHS_SUPPORT=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig

index 98b91c5977b8e2a25c342b625e01075147853066..f8ac49b0e8f92fc7a00fd3610ccab1e340694204 100644 (file)
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -10,6 +10,9 @@ CONFIG_ENV_OFFSET=0xC0000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_MX6DL=y
  CONFIG_TARGET_NITROGEN6X=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
  CONFIG_CMD_HDMIDETECT=y
@@ -52,6 +55,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_USB_FUNCTION_FASTBOOT=y
  CONFIG_FASTBOOT_BUF_ADDR=0x12000000
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig

index 963a765ea188efbc539b8587715254e602dc36c3..90ce8ca08284f143f770abbfc7cd8272ef68db19 100644 (file)
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -10,6 +10,9 @@ CONFIG_ENV_OFFSET=0xC0000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_MX6DL=y
  CONFIG_TARGET_NITROGEN6X=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
  CONFIG_CMD_HDMIDETECT=y
@@ -52,6 +55,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_USB_FUNCTION_FASTBOOT=y
  CONFIG_FASTBOOT_BUF_ADDR=0x12000000
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig

index e68a5989a794fa6c13d7e96623539525916e1b6b..eba34a3cb7026b163541f8c61c3e3d1fe929bd29 100644 (file)
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -10,6 +10,9 @@ CONFIG_ENV_OFFSET=0xC0000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_MX6Q=y
  CONFIG_TARGET_NITROGEN6X=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-nitrogen6x"
  CONFIG_CMD_HDMIDETECT=y
@@ -54,6 +57,7 @@ CONFIG_DWC_AHSATA=y
  CONFIG_USB_FUNCTION_FASTBOOT=y
  CONFIG_FASTBOOT_BUF_ADDR=0x12000000
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig

index 56eeb90a80df7ff37caa3c97387aeeec3d11315a..e439ab890b7e6b6bae98b571803c4736e2053766 100644 (file)
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -10,6 +10,9 @@ CONFIG_ENV_OFFSET=0xC0000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_MX6Q=y
  CONFIG_TARGET_NITROGEN6X=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-nitrogen6x"
  CONFIG_CMD_HDMIDETECT=y
@@ -54,6 +57,7 @@ CONFIG_DWC_AHSATA=y
  CONFIG_USB_FUNCTION_FASTBOOT=y
  CONFIG_FASTBOOT_BUF_ADDR=0x12000000
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig

index 483fbee64b080514c76fb8c4932ddb42a591ccf7..47ce844013e8f7afeb7166b96121f3ea13bbbcd3 100644 (file)
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -10,6 +10,9 @@ CONFIG_ENV_OFFSET=0xC0000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_MX6S=y
  CONFIG_TARGET_NITROGEN6X=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
  CONFIG_CMD_HDMIDETECT=y
@@ -52,6 +55,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_USB_FUNCTION_FASTBOOT=y
  CONFIG_FASTBOOT_BUF_ADDR=0x12000000
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig

index 396ca912fa87fcecf47e9058ce01eb2cad2f6275..878991c81b04d89528ea60761263b705544faf43 100644 (file)
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -10,6 +10,9 @@ CONFIG_ENV_OFFSET=0xC0000
  CONFIG_ENV_SECT_SIZE=0x2000
  CONFIG_MX6S=y
  CONFIG_TARGET_NITROGEN6X=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
  CONFIG_CMD_HDMIDETECT=y
@@ -52,6 +55,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_USB_FUNCTION_FASTBOOT=y
  CONFIG_FASTBOOT_BUF_ADDR=0x12000000
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig

index f303f7b8201a8379a3f7776106396a5bd6f0dcc3..05f21d58774648643587448c2ca71e46df59da2b 100644 (file)
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -10,6 +10,9 @@ CONFIG_ENV_OFFSET=0x80000
  CONFIG_MX6Q=y
  CONFIG_MX6_DDRCAL=y
  CONFIG_TARGET_KOSAGI_NOVENA=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6q-novena"
  CONFIG_SPL_TEXT_BASE=0x00908000
  CONFIG_SPL_MMC_SUPPORT=y
@@ -56,6 +59,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_DWC_AHSATA=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_PHYLIB=y
  CONFIG_PHY_MICREL=y
diff --git a/configs/pg_wcom_expu1_defconfig b/configs/pg_wcom_expu1_defconfig

index 884cb7a3b8c2421ff0cc28e2b0680fa53eff730d..549ddc71228ff9f47d1f3b4d3659bfe7cb25f48e 100644 (file)
--- a/configs/pg_wcom_expu1_defconfig
+++ b/configs/pg_wcom_expu1_defconfig
@@ -50,7 +50,6 @@ CONFIG_DM=y
  CONFIG_BOOTCOUNT_LIMIT=y
  CONFIG_SYS_FSL_DDR3=y
  CONFIG_SYS_I2C_LEGACY=y
-CONFIG_SYS_I2C_MXC=y
  # CONFIG_MMC is not set
  CONFIG_MTD=y
  CONFIG_MTD_NOR_FLASH=y
diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig

index 13912952bc02f5104c4ea986a9c81440a21ab1a8..32160650dd8c604d530b3993111ac037cbf3a6a1 100644 (file)
--- a/configs/pg_wcom_seli8_defconfig
+++ b/configs/pg_wcom_seli8_defconfig
@@ -50,7 +50,6 @@ CONFIG_DM=y
  CONFIG_BOOTCOUNT_LIMIT=y
  CONFIG_SYS_FSL_DDR3=y
  CONFIG_SYS_I2C_LEGACY=y
-CONFIG_SYS_I2C_MXC=y
  # CONFIG_MMC is not set
  CONFIG_MTD=y
  CONFIG_MTD_NOR_FLASH=y
diff --git a/configs/phycore-imx8mm_defconfig b/configs/phycore-imx8mm_defconfig

index a1ebf206c2a8b18dc894c38675dabf90bd15df59..f3a94bb5817d283cfc5611c0ce0bbf13d7f011cb 100644 (file)
--- a/configs/phycore-imx8mm_defconfig
+++ b/configs/phycore-imx8mm_defconfig
@@ -7,9 +7,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x10000
  CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0x3C0000
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="phycore-imx8mm"
  CONFIG_SPL_TEXT_BASE=0x7E1000
@@ -70,7 +67,6 @@ CONFIG_SPL_CLK_IMX8MM=y
  CONFIG_CLK_IMX8MM=y
  CONFIG_MXC_GPIO=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_MISC=y
  CONFIG_I2C_EEPROM=y
  CONFIG_SYS_I2C_EEPROM_ADDR=0x51
diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig

index 887d245d57f43fabf4a9a52efb32011ce4bb4dd7..720988403ba8d8600630eff59907438e1fdcaff6 100644 (file)
--- a/configs/phycore-imx8mp_defconfig
+++ b/configs/phycore-imx8mp_defconfig
@@ -71,7 +71,6 @@ CONFIG_MXC_GPIO=y
  CONFIG_DM_I2C=y
  # CONFIG_SPL_DM_I2C is not set
  CONFIG_SPL_SYS_I2C_LEGACY=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_MISC=y
  CONFIG_I2C_EEPROM=y
  CONFIG_SYS_I2C_EEPROM_ADDR=0x51
diff --git a/configs/pico-dwarf-imx6ul_defconfig b/configs/pico-dwarf-imx6ul_defconfig

index 673911ca63296b3888b4ce0fb0848aa08f668c8f..1b1849bfca72d5fcd9287de87e501da2f26077d2 100644 (file)
--- a/configs/pico-dwarf-imx6ul_defconfig
+++ b/configs/pico-dwarf-imx6ul_defconfig
@@ -50,6 +50,7 @@ CONFIG_FASTBOOT_FLASH=y
  CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_PHYLIB=y
  CONFIG_PHY_MICREL=y
diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig

index 41208c6c00938ab27914cb8995d7a06922a04aeb..fb1834eb1f1b54e710292a6d3e6ef1b20cd96857 100644 (file)
--- a/configs/pico-dwarf-imx7d_defconfig
+++ b/configs/pico-dwarf-imx7d_defconfig
@@ -6,6 +6,10 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi"
  CONFIG_TARGET_PICO_IMX7D=y
@@ -55,6 +59,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
diff --git a/configs/pico-hobbit-imx6ul_defconfig b/configs/pico-hobbit-imx6ul_defconfig

index 0c11d0c88cf66ebf613f902aa27610e72dde5b0f..f6d70864a2ba659ad4faee8645b0f5653af0f51c 100644 (file)
--- a/configs/pico-hobbit-imx6ul_defconfig
+++ b/configs/pico-hobbit-imx6ul_defconfig
@@ -51,6 +51,7 @@ CONFIG_FASTBOOT_FLASH=y
  CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_PHYLIB=y
diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig

index 0fea29086953b840c2f7787b6b9fb9d32ebe8612..ffda9f359fa51f2f48e7bfb3959d966f899c4725 100644 (file)
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -6,6 +6,10 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi"
  CONFIG_TARGET_PICO_IMX7D=y
@@ -55,6 +59,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig

index f027c866f564aff8c0542b485f8bba8e5ed02ccf..9abfa7539b856141fd9b33734f5b0a5212ad2ca6 100644 (file)
--- a/configs/pico-imx6ul_defconfig
+++ b/configs/pico-imx6ul_defconfig
@@ -54,6 +54,7 @@ CONFIG_FASTBOOT_FLASH=y
  CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_PHYLIB=y
diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig

index 33fc277ff99ad3b1f4c2a3348eb7caf0c07db2db..495ff84912a3ea555ac553f913b4f5621f7c90bd 100644 (file)
--- a/configs/pico-imx7d_bl33_defconfig
+++ b/configs/pico-imx7d_bl33_defconfig
@@ -7,6 +7,10 @@ CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0xa0000000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi"
  CONFIG_TARGET_PICO_IMX7D=y
@@ -50,6 +54,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_DFU_MMC=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_PHYLIB=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig

index d5ed7c101faca57f076939282a5785235622c302..038b4d460dba7b17debe89503c93204e660557c1 100644 (file)
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -6,6 +6,10 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi"
  CONFIG_TARGET_PICO_IMX7D=y
@@ -55,6 +59,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig

index 18ba8ef8bbd1c451f52e54d00412d44544e41869..15c8455b5ac7d64c74f942900286159f03365d34 100644 (file)
--- a/configs/pico-imx8mq_defconfig
+++ b/configs/pico-imx8mq_defconfig
@@ -3,6 +3,9 @@ CONFIG_ARCH_IMX8M=y
  CONFIG_SYS_TEXT_BASE=0x40200000
  CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x400000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mq-pico-pi"
  CONFIG_SPL_TEXT_BASE=0x7E1000
@@ -43,7 +46,6 @@ CONFIG_SYS_MMC_ENV_DEV=1
  CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000
  CONFIG_DM_I2C=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_DM_ETH=y
diff --git a/configs/pico-nymph-imx7d_defconfig b/configs/pico-nymph-imx7d_defconfig

index 41208c6c00938ab27914cb8995d7a06922a04aeb..fb1834eb1f1b54e710292a6d3e6ef1b20cd96857 100644 (file)
--- a/configs/pico-nymph-imx7d_defconfig
+++ b/configs/pico-nymph-imx7d_defconfig
@@ -6,6 +6,10 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi"
  CONFIG_TARGET_PICO_IMX7D=y
@@ -55,6 +59,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig

index 93606bf487875f0498447019b88b92fbdfad4a5c..b8c81d5b616553064276dfaa662833b4755c7ad2 100644 (file)
--- a/configs/pico-pi-imx6ul_defconfig
+++ b/configs/pico-pi-imx6ul_defconfig
@@ -51,6 +51,7 @@ CONFIG_FASTBOOT_FLASH=y
  CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_PHYLIB=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig

index ac6af5bd23ea6ea1aec0c57a5eaf3d41175e8437..399b8d287d7824c09c2df49c8094fee1a1faf5f8 100644 (file)
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -6,6 +6,10 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
+CONFIG_SYS_I2C_MXC_I2C4=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi"
  CONFIG_TARGET_PICO_IMX7D=y
@@ -55,6 +59,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig

index e0c20c8ecdc18fc8cd68d86ea56634b7e4c5ae20..498278ac3ce3de268d05070065ebe16d23f75485 100644 (file)
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -9,6 +9,9 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x60000
  CONFIG_MX6S=y
  CONFIG_TARGET_EMBESTMX6BOARDS=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6dl-riotboard"
  CONFIG_SPL_TEXT_BASE=0x00908000
@@ -42,6 +45,7 @@ CONFIG_DM=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_DM_SPI_FLASH=y
diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig

index c83a6dd2e31e7ed94a14960dc9fe9b2d9f63d193..13c31987f67b70f8ae2d989e016ac08f2f87abf1 100644 (file)
--- a/configs/udoo_neo_defconfig
+++ b/configs/udoo_neo_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x80000
  CONFIG_MX6SX=y
  CONFIG_TARGET_UDOO_NEO=y
+CONFIG_SYS_I2C_MXC_I2C1=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6sx-udoo-neo-basic"
  CONFIG_SPL_TEXT_BASE=0x00908000
@@ -38,6 +39,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_USDHC=y
  CONFIG_PHYLIB=y
  CONFIG_PHY_MICREL=y
diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig

index 5e581d977d0738ea5fb807e6c804ada1756ed2d5..427ea7b98f4a8409b6cfa9201296c9cace5fd97b 100644 (file)
--- a/configs/usbarmory_defconfig
+++ b/configs/usbarmory_defconfig
@@ -7,6 +7,8 @@ CONFIG_SYS_MEMTEST_END=0x90000000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x60000
  CONFIG_TARGET_USBARMORY=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx53-usbarmory"
  # CONFIG_CMD_BMODE is not set
@@ -24,6 +26,7 @@ CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_ESDHC_IMX=y
  CONFIG_MTD=y
  CONFIG_PINCTRL=y
diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig

index 624f1b99096e435033161898f5f577150cffecc3..9bb576bcadad980a9b9fb701388111bc53972444 100644 (file)
--- a/configs/verdin-imx8mm_defconfig
+++ b/configs/verdin-imx8mm_defconfig
@@ -9,9 +9,6 @@ CONFIG_SYS_MEMTEST_START=0x40000000
  CONFIG_SYS_MEMTEST_END=0x80000000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xFFFFDE00
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx8mm-verdin"
  CONFIG_SPL_TEXT_BASE=0x7E1000
@@ -73,7 +70,6 @@ CONFIG_SPL_CLK_IMX8MM=y
  CONFIG_CLK_IMX8MM=y
  CONFIG_MXC_GPIO=y
  CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_MXC=y
  CONFIG_MISC=y
  CONFIG_I2C_EEPROM=y
  CONFIG_SUPPORT_EMMC_BOOT=y
diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig

index e5e0f51b23b5dce1b9075003d8677abddaa01429..f1693e814c57b52b13897c07284719a2e07d76e2 100644 (file)
--- a/configs/vf610twr_defconfig
+++ b/configs/vf610twr_defconfig
@@ -7,6 +7,8 @@ CONFIG_SYS_MEMTEST_START=0x80010000
  CONFIG_SYS_MEMTEST_END=0x87c00000
  CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0xC0000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="vf610-twr"
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg"
@@ -38,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y
  CONFIG_VYBRID_GPIO=y
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_ESDHC_IMX=y
  CONFIG_MTD=y
  CONFIG_NAND_VF610_NFC=y
diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig

index 391567405ead3ece02d96296937fe1ef13dcd1f9..0cd9cb78eede1ad7a7480acb61c41faef7255ac5 100644 (file)
--- a/configs/vf610twr_nand_defconfig
+++ b/configs/vf610twr_nand_defconfig
@@ -7,6 +7,8 @@ CONFIG_SYS_MEMTEST_START=0x80010000
  CONFIG_SYS_MEMTEST_END=0x87c00000
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0x180000
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="vf610-twr"
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg"
@@ -38,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_DM=y
  CONFIG_VYBRID_GPIO=y
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_FSL_ESDHC_IMX=y
  CONFIG_MTD=y
  CONFIG_NAND_VF610_NFC=y
diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig

index 3317c465fce0c2f58962c6d5737bb59dd4dfe5b7..dcfaff7a476a07226e111b9f9c97d9df24a27457 100644 (file)
--- a/configs/vining_2000_defconfig
+++ b/configs/vining_2000_defconfig
@@ -11,6 +11,8 @@ CONFIG_ENV_OFFSET=0x80000
  CONFIG_MX6SX=y
  CONFIG_MX6_DDRCAL=y
  CONFIG_TARGET_SOFTING_VINING_2000=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C3=y
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="imx6sx-softing-vining-2000"
  CONFIG_SPL_TEXT_BASE=0x00908000
@@ -63,6 +65,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_SYS_I2C_LEGACY=y
  CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_RPMB=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig

index ec078178abf80b6abdb7f366bcf031d9a9ade67e..e21237ffc10c2d7e29b474cccc87385f57aadec1 100644 (file)
--- a/configs/warp7_bl33_defconfig
+++ b/configs/warp7_bl33_defconfig
@@ -37,6 +37,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_DFU_MMC=y
  CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig

index 19c0c183f7e594e1e1230f2a36ce06a2a3b03c6b..b5d4f3d9cdc18baa825cdfe99272b95d76800b0b 100644 (file)
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -43,6 +43,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_DFU_MMC=y
  CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
  CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
diff --git a/configs/warp_defconfig b/configs/warp_defconfig

index 6e81acc363b9ec7fca16f6b0209d74e4f0fbcfdf..0dc800e3af3ffd3d5cb3a57c7987c24122fd777a 100644 (file)
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -6,6 +6,8 @@ CONFIG_ENV_SIZE=0x2000
  CONFIG_ENV_OFFSET=0x60000
  CONFIG_MX6SL=y
  CONFIG_TARGET_WARP=y
+CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_SYS_I2C_MXC_I2C2=y
  # CONFIG_CMD_BMODE is not set
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg"
@@ -33,6 +35,7 @@ CONFIG_BOUNCE_BUFFER=y
  CONFIG_DFU_MMC=y
  CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
  CONFIG_SYS_I2C_LEGACY=y
+CONFIG_SYS_I2C_MXC=y
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_FSL_USDHC=y
  CONFIG_MXC_UART=y
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig

index fb7736c62aed248db3e5c9afb06db324aff8ab78..d1f4d8c7c5f18b3038b82d8a7e107b9c132e35bc 100644 (file)
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -234,10 +234,7 @@ config SYS_I2C_MXC
           channels and operating on standard mode up to 100 kbits/s and fast
           mode up to 400 kbits/s.
  
-# These settings are not used with DM_I2C, however SPL doesn't use
-# DM_I2C even if DM_I2C is enabled, and so might use these settings even
-# when main u-boot does not!
-if SYS_I2C_MXC && (!DM_I2C || SPL)
+if SYS_I2C_MXC && (SYS_I2C_LEGACY || SPL_SYS_I2C_LEGACY)
  config SYS_I2C_MXC_I2C1
         bool "NXP MXC I2C1"
         help
@@ -296,7 +293,7 @@ config SYS_MXC_I2C1_SPEED
          MXC I2C Channel 1 speed
  
  config SYS_MXC_I2C1_SLAVE
-       int "I2C1 Slave"
+       hex "I2C1 Slave"
         default 0
         help
          MXC I2C1 Slave
@@ -311,7 +308,7 @@ config SYS_MXC_I2C2_SPEED
          MXC I2C Channel 2 speed
  
  config SYS_MXC_I2C2_SLAVE
-       int "I2C2 Slave"
+       hex "I2C2 Slave"
         default 0
         help
          MXC I2C2 Slave
@@ -325,7 +322,7 @@ config SYS_MXC_I2C3_SPEED
          MXC I2C Channel 3 speed
  
  config SYS_MXC_I2C3_SLAVE
-       int "I2C3 Slave"
+       hex "I2C3 Slave"
         default 0
         help
          MXC I2C3 Slave
@@ -339,7 +336,7 @@ config SYS_MXC_I2C4_SPEED
          MXC I2C Channel 4 speed
  
  config SYS_MXC_I2C4_SLAVE
-       int "I2C4 Slave"
+       hex "I2C4 Slave"
         default 0
         help
          MXC I2C4 Slave
@@ -353,7 +350,7 @@ config SYS_MXC_I2C5_SPEED
          MXC I2C Channel 5 speed
  
  config SYS_MXC_I2C5_SLAVE
-       int "I2C5 Slave"
+       hex "I2C5 Slave"
         default 0
         help
          MXC I2C5 Slave
@@ -367,7 +364,7 @@ config SYS_MXC_I2C6_SPEED
          MXC I2C Channel 6 speed
  
  config SYS_MXC_I2C6_SLAVE
-       int "I2C6 Slave"
+       hex "I2C6 Slave"
         default 0
         help
          MXC I2C6 Slave
@@ -381,7 +378,7 @@ config SYS_MXC_I2C7_SPEED
          MXC I2C Channel 7 speed
  
  config SYS_MXC_I2C7_SLAVE
-       int "I2C7 Slave"
+       hex "I2C7 Slave"
         default 0
         help
          MXC I2C7 Slave
@@ -395,7 +392,7 @@ config SYS_MXC_I2C8_SPEED
          MXC I2C Channel 8 speed
  
  config SYS_MXC_I2C8_SLAVE
-       int "I2C8 Slave"
+       hex "I2C8 Slave"
         default 0
         help
          MXC I2C8 Slave
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c

index 003aa33f6ecdbb508fb1c140369e47baf15c2741..5057bd966504b450b86ec3c75017a47f31c8620d 100644 (file)
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -110,32 +110,6 @@ static u16 i2c_clk_div[50][2] = {
  };
  #endif
  
-#ifndef CONFIG_SYS_MXC_I2C1_SPEED
-#define CONFIG_SYS_MXC_I2C1_SPEED 100000
-#endif
-#ifndef CONFIG_SYS_MXC_I2C2_SPEED
-#define CONFIG_SYS_MXC_I2C2_SPEED 100000
-#endif
-#ifndef CONFIG_SYS_MXC_I2C3_SPEED
-#define CONFIG_SYS_MXC_I2C3_SPEED 100000
-#endif
-#ifndef CONFIG_SYS_MXC_I2C4_SPEED
-#define CONFIG_SYS_MXC_I2C4_SPEED 100000
-#endif
-
-#ifndef CONFIG_SYS_MXC_I2C1_SLAVE
-#define CONFIG_SYS_MXC_I2C1_SLAVE 0
-#endif
-#ifndef CONFIG_SYS_MXC_I2C2_SLAVE
-#define CONFIG_SYS_MXC_I2C2_SLAVE 0
-#endif
-#ifndef CONFIG_SYS_MXC_I2C3_SLAVE
-#define CONFIG_SYS_MXC_I2C3_SLAVE 0
-#endif
-#ifndef CONFIG_SYS_MXC_I2C4_SLAVE
-#define CONFIG_SYS_MXC_I2C4_SLAVE 0
-#endif
-
  /*
   * Calculate and set proper clock divider
   */
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h

index 2d2a0346b1dc5071a96010517ff84ffca3b47013..d1d74559aced4b76f24bbe7079684998142cffc5 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -34,13 +34,6 @@
  
  #define CONFIG_MXC_UART_BASE           UART1_BASE
  
-/* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-#define CONFIG_SYS_MXC_I2C3_SPEED      400000
-
  /* MMC Configs */
  #define CONFIG_SYS_FSL_ESDHC_ADDR      0
  #define CONFIG_SYS_FSL_USDHC_NUM       3
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h

index 6e47b5b54456aab1f4c01cef95753d612d5d9180..51d18c5f108d4c17340dac69599e62f956b63851 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -30,10 +30,6 @@
  #define CONFIG_POWER_PFUZE3000
  #define CONFIG_POWER_PFUZE3000_I2C_ADDR        0x08
  
-/* I2C configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C2                /* Enable I2C bus 2 */
-
  #define CONFIG_PCA953X
  #define CONFIG_SYS_I2C_PCA953X_ADDR    0x20
  #define CONFIG_SYS_I2C_PCA953X_WIDTH   { {0x20, 16} }
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h

index 5e4c4472e13fffd5a5919bef517740763ba4692b..41ec15ff04e7754771eeafdaeff3e6b72f0ac98e 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -165,13 +165,6 @@
  #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
  
-/* I2C */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-#define CONFIG_SYS_MXC_I2C3_SPEED      400000
-
  /* SATA */
  #define CONFIG_SYS_SATA_MAX_DEVICE     1
  #define CONFIG_LBA48
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h

index 4601539be3b98c71f9188dc177856b1c9b0eb794..2b2ee95b70fdebf6165af22c42a75cc2e58b07c7 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -32,13 +32,6 @@
  
  #define CONFIG_MXC_UART_BASE           UART1_BASE
  
-/* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-#define CONFIG_SYS_MXC_I2C3_SPEED      400000
-
  /* MMC Configs */
  #define CONFIG_SYS_FSL_ESDHC_ADDR      0
  #define CONFIG_SYS_FSL_USDHC_NUM       2
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h

index 369048fbf5b3d594532abef723aa434b2a928278..5a7919e87c42f0ddb189a1f4cb92d6257bec1d36 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -24,9 +24,6 @@
  #define CONFIG_SYS_FSL_USDHC_NUM       2
  #endif
  
-/* I2C configs */
-#define CONFIG_SYS_I2C_MXC
-
  #define CONFIG_IPADDR                  192.168.10.2
  #define CONFIG_NETMASK                 255.255.255.0
  #define CONFIG_SERVERIP                        192.168.10.1
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h

index 04422ddf467bb7d1c457ae7266404ce4e93f7aa5..12ae1b7317744c3fc9c5e562d86485aa62fdd896 100644 (file)
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -47,10 +47,6 @@
  #define CONFIG_SUPPORT_EMMC_BOOT
  
  /* I2C configs */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#endif
  
  /* Miscellaneous configurable options */
  
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h

index 213d6d2acd403c701e6def9bff2a29d389f2d633..3b535e53864cfd42530b8999cf8b9a72a0987ab2 100644 (file)
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -25,12 +25,6 @@
  #define CONFIG_SYS_FSL_ESDHC_ADDR      0
  #define CONFIG_SYS_FSL_USDHC_NUM       2
  
-/* I2C config */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  /* PMIC */
  #define CONFIG_POWER
  #define CONFIG_POWER_I2C
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h

index 745fd092fb1d1047801b503bc3070995c1ef6c67..d8fa1497b00c93ae7132bb46d3dd737ebb76ccbc 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -20,12 +20,6 @@
  /* Size of malloc() pool */
  #define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)
  
-/* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  /* USB Configs */
  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
  #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/flea3.h b/include/configs/flea3.h

index b81a4c4164aeae8b4f8e8078a37635d9099acedd..b4b34fd1ce334709d0e80c1e0465dd4b3802c0fe 100644 (file)
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -36,12 +36,7 @@
  /*
   * Hardware drivers
   */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
  #define CONFIG_SYS_SPD_BUS_NUM         2 /* I2C3 */
-#define CONFIG_SYS_MXC_I2C3_SLAVE      0xfe
  
  /*
   * UART (console)
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h

index e51eef528c68db6acbd16e72f830aecbdce5e50b..8f0282d95b158b2cb60ad1dea73c369b7e910cad 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -42,10 +42,6 @@
  #define CONFIG_SYS_BOOTM_LEN           (64 << 20)
  
  /* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
  #define CONFIG_I2C_GSC                 0
  #define CONFIG_I2C_EDID
  
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h

index eff713f84a493ccd2ed8eafdb14f849bb87fe52c..54e0560406e890a07b9b474e6e88090200ee53f7 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -44,10 +44,6 @@
  #undef CONFIG_DM_PMIC
  #undef CONFIG_DM_PMIC_PFUZE100
  
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
  
  #define CONFIG_POWER
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h

index da59e12f654b7be11a26071efbb0f9168ae89738..7f86f2befc6a3e1b90077573d2e569c555a2c8bb 100644 (file)
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -41,10 +41,6 @@
  #undef CONFIG_DM_PMIC
  #undef CONFIG_DM_PMIC_PFUZE100
  
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
  
  #define CONFIG_POWER
diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h

index 87f4841af05cdd57bcaf921c0fbaf5fcd8f3abe5..a40e42842d2f200c8f9e0f0b1fc6a22b770f6364 100644 (file)
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -19,8 +19,6 @@
  #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
  #define CONFIG_MXC_USB_FLAGS   0
  
-#define CONFIG_SYS_I2C_MXC
-
  /* Command definition */
  #define CONFIG_LOADADDR                0x72000000      /* loadaddr env var */
  
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h

index 4ea9255aab0d9c34282aa78cfbaa3111bf50c76e..fd14ee4c8c62208ddca62b7bc330c0670c864a95 100644 (file)
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -103,10 +103,6 @@
  #define CONFIG_I2C_SET_DEFAULT_BUS_NUM
  #define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
  #endif
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
  
  /* EEPROM */
  #define CONFIG_SYS_I2C_EEPROM_NXID
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h

index f50cb98eaf69c9a815b07233972eac68f6510d9b..194cd695d107a4debfed40803746bcabce6fa9bf 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -335,10 +335,6 @@ unsigned long get_board_ddr_clk(void);
  #define CONFIG_I2C_SET_DEFAULT_BUS_NUM
  #define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
  #endif
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
  
  /* GPIO */
  #ifdef CONFIG_DM_GPIO
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h

index e15523318abaf35dbaddc4296645ef09f17ec442..2bf5b01e830ca4c2429042f5e3697a61cb6c496c 100644 (file)
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -109,10 +109,6 @@
  #define CONFIG_I2C_SET_DEFAULT_BUS_NUM
  #define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
  #endif
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
  
  /* EEPROM */
  #define CONFIG_SYS_I2C_EEPROM_NXID
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h

index 9fb0f802fa2ace76e7aad7e358f5a3ba8d53e6c9..38c31e897355590969c1705b9d0c092be614cf10 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -213,10 +213,6 @@
  #define CONFIG_I2C_SET_DEFAULT_BUS_NUM
  #define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
  #endif
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
  
  /* GPIO */
  #ifdef CONFIG_DM_GPIO
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h

index 5de34ad2a9d9ac5d873060527ebf9fda1523d34e..e516d8f2614e1511fea9e69e7977478aa5357110 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -150,10 +150,6 @@
  
  /* I2C */
  #if !CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_MXC_I2C4                /* enable I2C bus 4 */
  #else
  #define CONFIG_I2C_SET_DEFAULT_BUS_NUM
  #define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h

index 51e3acbadb6455fee06bf7216061a45cb8d42180..524d6390a4c15c2ea57377c33c57d0a977d7bff1 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -134,10 +134,6 @@
  
  /* I2C */
  #if !CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_MXC_I2C4                /* enable I2C bus 4 */
  #else
  #define CONFIG_I2C_SET_DEFAULT_BUS_NUM
  #define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h

index 305ffae66198de7bcdf0f02d2a25bac646e1446c..fcafea13dc96a099a39d5eb974acdbc884abaa0b 100644 (file)
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -24,8 +24,6 @@
  #define CONFIG_DDR_SPD
  #ifdef CONFIG_EMU
  #define CONFIG_SYS_FSL_DDR_EMU
-#define CONFIG_SYS_MXC_I2C1_SPEED      40000000
-#define CONFIG_SYS_MXC_I2C2_SPEED      40000000
  #else
  #define CONFIG_DDR_ECC
  #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h

index d709e5d575ffdacc18cdfa49cbfbd15535e04dd3..db601c03dacdbcb828547ee2c6c3c96ea0f291a1 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -84,16 +84,7 @@
  #define CONFIG_ETHPRIME                        "FEC0"
  #endif
  
-/*
- * I2C
- */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
  #define CONFIG_SYS_RTC_BUS_NUM         1 /* I2C2 */
-#endif
  
  /*
   * RTC
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h

index ece4ad7961f4728945bb54ea025117a9ce658530..574e647aadfd54bab8421d6042b2ad8cd8cec415 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -35,12 +35,6 @@
  #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
  #define CONFIG_MXC_USB_FLAGS   0
  
-/* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  /* PMIC Controller */
  #define CONFIG_POWER
  #define CONFIG_POWER_I2C
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h

index cefff470eacf6e63f04a5a9fcc72eb4309936930..f854ddd87b26ea502a1d397d827bac2c8c897f9d 100644 (file)
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -50,12 +50,6 @@
  
  #define CONFIG_SYS_FSL_USDHC_NUM       2
  
-/* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  /* NAND stuff */
  #define CONFIG_SYS_MAX_NAND_DEVICE     1
  #define CONFIG_SYS_NAND_BASE           0x40000000
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h

index 227c59b608694ac25a95e45010a7a6e712b0a0ab..73f48c6dae52f77c9d2d539a92b04c7219e8f5d1 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -37,12 +37,6 @@
  #define CONFIG_PCIE_IMX_POWER_GPIO     IMX_GPIO_NR(3, 19)
  #endif
  
-/* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  /* PMIC */
  #define CONFIG_POWER
  #define CONFIG_POWER_I2C
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h

index 6dabd71bd2e6401fb40143d71fcf0ec03ab9f958..92d63ebfcb449d6fcb4ff3abe0ade42e38c56f66 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -24,12 +24,6 @@
  /* MMC Configs */
  #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
  
-/* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  #define CONFIG_EXTRA_ENV_SETTINGS \
         "script=boot.scr\0" \
         "image=zImage\0" \
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h

index f4092056d06218573b11b0104b4a9e2aaf2bc5df..0befbff94dbcf72a4d73635f496656e072366c33 100644 (file)
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -15,14 +15,6 @@
  
  #define CONFIG_MXC_UART_BASE           UART1_BASE
  
-/* I2C Configs */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-#endif
-
  #define CONFIG_EXTRA_ENV_SETTINGS \
         "epdc_waveform=epdc_splash.bin\0" \
         "script=boot.scr\0" \
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h

index 1d47f6591f746edc940c2a4a634dc06ebaa5cb4a..d2a589af1a84cff5ee78da27db94e1ed2bd8ead9 100644 (file)
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -106,12 +106,6 @@
  /* MMC Configuration */
  #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC3_BASE_ADDR
  
-/* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  /* NAND stuff */
  #define CONFIG_SYS_MAX_NAND_DEVICE     1
  #define CONFIG_SYS_NAND_BASE           0x40000000
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h

index fa7025a82a794c37047a8ad56edac780817de37b..49f709cca58dd71981ef14dcf1de5c999492f80f 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -140,12 +140,6 @@
  /* MMC Configuration */
  #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC4_BASE_ADDR
  
-/* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  /* Network */
  #define CONFIG_FEC_MXC
  
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h

index 5fe004b0ee0a7d147c84d274bbb3287db68ff3b5..0065fdc157b64fb4fe109ce3644665b7fbb50cea 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -36,13 +36,6 @@
  
  #endif
  
-/* I2C configs */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#endif
-
  #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h

index d9d400f73f1627fb2c28cb3e9272e4feca7480cf..0a62ada31c30540718168d9a13e97070dfd71c45 100644 (file)
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -33,13 +33,6 @@
  #endif
  #endif
  
-/* I2C configs */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#endif
-
  #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h

index 4bdd05b34c19c0ebeaccb14fb082ef35da3d363d..4766721ba21e66e9fc61b22b14e50f904a4b5463 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -20,9 +20,6 @@
  /* MMC Config*/
  #define CONFIG_SYS_FSL_ESDHC_ADDR       0
  
-/* I2C configs */
-#define CONFIG_SYS_I2C_MXC
-
  #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
  
  #ifdef CONFIG_IMX_BOOTAUX
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h

index 15257753fbef9076eed96c606d6648680a06bae5..c82b4c735a4200dfd17f7cb4decffb946c22f872 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -21,10 +21,6 @@
  #define CONFIG_MXC_UART_BASE          UART2_BASE
  
  /* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
  #define CONFIG_I2C_EDID
  
  /* MMC Configs */
diff --git a/include/configs/novena.h b/include/configs/novena.h

index 4abc44e9d30ae62afd147da7a5d132bbb8a10ee1..011284ee5d84b625c5af685ab8cb523823492dce 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -52,10 +52,6 @@
  #endif
  
  /* I2C */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
  #define CONFIG_I2C_MULTI_BUS
  #define CONFIG_SYS_SPD_BUS_NUM         0
  
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h

index 2ba77edda9481bd605d0e6758e8779be823ad9f4..fee0c3d51030c88b7351de8212ab3bf94406b3ab 100644 (file)
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -36,9 +36,6 @@
  #define CONFIG_SUPPORT_EMMC_BOOT
  
  /* I2C configs */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#endif
  
  /* Miscellaneous configurable options */
  
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h

index 828c779d4e92de2539e2ad2addf3ef66cc8c0067..a0f7a3ddbec55b6e54f7dd6a3bc5f296b3e1d4d1 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -126,9 +126,6 @@
  #define CONFIG_SYS_INIT_SP_ADDR \
         (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
  
-/* I2C configs */
-#define CONFIG_SYS_I2C_MXC
-
  /* environment organization */
  /* Environment starts at 768k = 768 * 1024 = 786432 */
  /*
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h

index 528e48cdba49ff8921122f3a8bad59fde883004c..0b478cb02f93ca57d9e15b21cab71c6695c1455e 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -125,13 +125,6 @@
  #define CONFIG_SYS_INIT_SP_ADDR \
         (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
  
-/* I2C configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1
-#define CONFIG_SYS_I2C_MXC_I2C2
-#define CONFIG_SYS_I2C_MXC_I2C3
-#define CONFIG_SYS_I2C_MXC_I2C4
-
  /* PMIC */
  #define CONFIG_POWER
  #define CONFIG_POWER_I2C
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h

index 10956a202f2a4a2c8a1d60f72c53a64ee76c609c..a7bfcf8f0e861552fb6d91c06096d51a441c693d 100644 (file)
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -40,10 +40,6 @@
  #undef CONFIG_DM_MMC
  #undef CONFIG_DM_PMIC
  
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
  
  #define CONFIG_POWER
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h

index ca57258f6e07b3b808075fa73f8a387d5b1ed495..b76d924ea8de14c09c76515a9fc9d2791abb53d1 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -70,10 +70,6 @@
  #define CONFIG_SYS_INIT_SP_ADDR \
         (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
  
-/* I2C configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1
-
  /* PMIC */
  #define CONFIG_POWER
  #define CONFIG_POWER_I2C
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h

index 4fb487bdeb150e3042f2aec3cae1710c2061424c..a93a71850a863f943d5c70b420d7dfd1b0877382 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -31,11 +31,6 @@
  #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
  #define CONFIG_MXC_USB_FLAGS   0
  
-/* I2C */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-
  /* Fuse */
  #define CONFIG_FSL_IIM
  
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h

index a96d1c65cccb223bd074d7641cdea86f3d26bb78..ca3ae275c5b32b9250b611d957bc44b7aae2bd3a 100644 (file)
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -42,9 +42,6 @@
  #define CONFIG_FEC_MXC_PHYADDR          0
  
  /* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
  #define CONFIG_SYS_SPD_BUS_NUM         0
  
  
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h

index 09dbadba005800ff9962f00f98bbfd27b31c12dc..db5f5cfacceb500e604814ac0619b49a2b78cf89 100644 (file)
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -42,11 +42,6 @@
  /* MMC Configuration */
  #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC4_BASE_ADDR
  
-/* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-
  /* PMIC */
  #define CONFIG_POWER
  #define CONFIG_POWER_I2C
diff --git a/include/configs/warp.h b/include/configs/warp.h

index 466250648434b3149330ea82121fdccec9bbbf43..b34f0a53c764bf911a6e89a4b12ec4ff06458190 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -53,9 +53,6 @@
  #define DFU_DEFAULT_POLL_TIMEOUT 300
  
  /* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
  
  /* PMIC */
  #define CONFIG_POWER
diff --git a/include/configs/warp7.h b/include/configs/warp7.h

index 5f91332d98e756ad925ca362b47a1c133667ac4d..8ed7d1db5551acbc2383a40b89f86652c0b63dac 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -135,9 +135,6 @@
   */
  #define CONFIG_BOARD_SIZE_LIMIT                785408
  
-/* I2C configs */
-#define CONFIG_SYS_I2C_MXC
-
  /* environment organization */
  
  #define CONFIG_SYS_FSL_USDHC_NUM       1
diff --git a/include/configs/xpress.h b/include/configs/xpress.h

index f1de3abed72fbc9b96a9f4e4e2ac444b4af61ed9..495ed2ff541a004002cd91811fe6abf87d34f304 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -21,12 +21,6 @@
  /* MMC Configs */
  #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
  
-/* I2C configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C4                /* enable I2C bus 4 */
-
  /* Miscellaneous configurable options */
  
  #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
author	Tom Rini <trini@konsulko.com>
	Thu, 19 Aug 2021 03:12:33 +0000 (23:12 -0400)
committer	Tom Rini <trini@konsulko.com>
	Mon, 30 Aug 2021 18:10:07 +0000 (14:10 -0400)
README		patch \| blob \| history
arch/arm/Kconfig		patch \| blob \| history
arch/arm/cpu/armv7/ls102xa/Kconfig		patch \| blob \| history
configs/apalis_imx6_defconfig		patch \| blob \| history
configs/cl-som-imx7_defconfig		patch \| blob \| history
configs/cm_fx6_defconfig		patch \| blob \| history
configs/colibri_imx6_defconfig		patch \| blob \| history
configs/colibri_imx7_defconfig		patch \| blob \| history
configs/colibri_imx7_emmc_defconfig		patch \| blob \| history
configs/flea3_defconfig		patch \| blob \| history
configs/gwventana_emmc_defconfig		patch \| blob \| history
configs/gwventana_gw5904_defconfig		patch \| blob \| history
configs/gwventana_nand_defconfig		patch \| blob \| history
configs/imx8mm-cl-iot-gate_defconfig		patch \| blob \| history
configs/imx8mm-icore-mx8mm-ctouch2_defconfig		patch \| blob \| history
configs/imx8mm-icore-mx8mm-edimm2.2_defconfig		patch \| blob \| history
configs/imx8mm_beacon_defconfig		patch \| blob \| history
configs/imx8mm_evk_defconfig		patch \| blob \| history
configs/imx8mm_venice_defconfig		patch \| blob \| history
configs/imx8mn_beacon_2g_defconfig		patch \| blob \| history
configs/imx8mn_beacon_defconfig		patch \| blob \| history
configs/imx8mn_ddr4_evk_defconfig		patch \| blob \| history
configs/imx8mn_evk_defconfig		patch \| blob \| history
configs/imx8mp_evk_defconfig		patch \| blob \| history
configs/imx8mq_cm_defconfig		patch \| blob \| history
configs/imx8mq_evk_defconfig		patch \| blob \| history
configs/imx8mq_phanbell_defconfig		patch \| blob \| history
configs/kp_imx53_defconfig		patch \| blob \| history
configs/kp_imx6q_tpc_defconfig		patch \| blob \| history
configs/ls1021aiot_qspi_defconfig		patch \| blob \| history
configs/ls1021aiot_sdcard_defconfig		patch \| blob \| history
configs/ls1021aqds_ddr4_nor_defconfig		patch \| blob \| history
configs/ls1021aqds_ddr4_nor_lpuart_defconfig		patch \| blob \| history
configs/ls1021aqds_nand_defconfig		patch \| blob \| history
configs/ls1021aqds_nor_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1021aqds_nor_defconfig		patch \| blob \| history
configs/ls1021aqds_nor_lpuart_defconfig		patch \| blob \| history
configs/ls1021aqds_qspi_defconfig		patch \| blob \| history
configs/ls1021aqds_sdcard_ifc_defconfig		patch \| blob \| history
configs/ls1021aqds_sdcard_qspi_defconfig		patch \| blob \| history
configs/ls1021atsn_qspi_defconfig		patch \| blob \| history
configs/ls1021atsn_sdcard_defconfig		patch \| blob \| history
configs/ls1021atwr_nor_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1021atwr_nor_defconfig		patch \| blob \| history
configs/ls1021atwr_nor_lpuart_defconfig		patch \| blob \| history
configs/ls1021atwr_qspi_defconfig		patch \| blob \| history
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1021atwr_sdcard_ifc_defconfig		patch \| blob \| history
configs/ls1021atwr_sdcard_qspi_defconfig		patch \| blob \| history
configs/ls1043aqds_defconfig		patch \| blob \| history
configs/ls1043aqds_lpuart_defconfig		patch \| blob \| history
configs/ls1043aqds_nand_defconfig		patch \| blob \| history
configs/ls1043aqds_nor_ddr3_defconfig		patch \| blob \| history
configs/ls1043aqds_qspi_defconfig		patch \| blob \| history
configs/ls1043aqds_sdcard_ifc_defconfig		patch \| blob \| history
configs/ls1043aqds_sdcard_qspi_defconfig		patch \| blob \| history
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1043aqds_tfa_defconfig		patch \| blob \| history
configs/ls1043ardb_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1043ardb_defconfig		patch \| blob \| history
configs/ls1043ardb_nand_defconfig		patch \| blob \| history
configs/ls1043ardb_sdcard_defconfig		patch \| blob \| history
configs/ls1043ardb_tfa_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1043ardb_tfa_defconfig		patch \| blob \| history
configs/ls1046aqds_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1046aqds_defconfig		patch \| blob \| history
configs/ls1046aqds_lpuart_defconfig		patch \| blob \| history
configs/ls1046aqds_nand_defconfig		patch \| blob \| history
configs/ls1046aqds_qspi_defconfig		patch \| blob \| history
configs/ls1046aqds_sdcard_ifc_defconfig		patch \| blob \| history
configs/ls1046aqds_sdcard_qspi_defconfig		patch \| blob \| history
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1046aqds_tfa_defconfig		patch \| blob \| history
configs/ls1046ardb_emmc_defconfig		patch \| blob \| history
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1046ardb_qspi_defconfig		patch \| blob \| history
configs/ls1046ardb_qspi_spl_defconfig		patch \| blob \| history
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1046ardb_sdcard_defconfig		patch \| blob \| history
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1046ardb_tfa_defconfig		patch \| blob \| history
configs/ls1088ardb_qspi_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1088ardb_qspi_defconfig		patch \| blob \| history
configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig		patch \| blob \| history
configs/ls1088ardb_sdcard_qspi_defconfig		patch \| blob \| history
configs/m53menlo_defconfig		patch \| blob \| history
configs/marsboard_defconfig		patch \| blob \| history
configs/mccmon6_nor_defconfig		patch \| blob \| history
configs/mccmon6_sd_defconfig		patch \| blob \| history
configs/mx53loco_defconfig		patch \| blob \| history
configs/mx6qsabrelite_defconfig		patch \| blob \| history
configs/mx6sabreauto_defconfig		patch \| blob \| history
configs/mx6sabresd_defconfig		patch \| blob \| history
configs/mx6slevk_defconfig		patch \| blob \| history
configs/mx6slevk_spinor_defconfig		patch \| blob \| history
configs/mx6slevk_spl_defconfig		patch \| blob \| history
configs/mx6sllevk_defconfig		patch \| blob \| history
configs/mx6sllevk_plugin_defconfig		patch \| blob \| history
configs/mx6sxsabreauto_defconfig		patch \| blob \| history
configs/mx6sxsabresd_defconfig		patch \| blob \| history
configs/mx6ul_14x14_evk_defconfig		patch \| blob \| history
configs/mx6ul_9x9_evk_defconfig		patch \| blob \| history
configs/mx6ull_14x14_evk_defconfig		patch \| blob \| history
configs/mx6ull_14x14_evk_plugin_defconfig		patch \| blob \| history
configs/mx6ulz_14x14_evk_defconfig		patch \| blob \| history
configs/mx7dsabresd_defconfig		patch \| blob \| history
configs/mx7dsabresd_qspi_defconfig		patch \| blob \| history
configs/nitrogen6dl2g_defconfig		patch \| blob \| history
configs/nitrogen6dl_defconfig		patch \| blob \| history
configs/nitrogen6q2g_defconfig		patch \| blob \| history
configs/nitrogen6q_defconfig		patch \| blob \| history
configs/nitrogen6s1g_defconfig		patch \| blob \| history
configs/nitrogen6s_defconfig		patch \| blob \| history
configs/novena_defconfig		patch \| blob \| history
configs/pg_wcom_expu1_defconfig		patch \| blob \| history
configs/pg_wcom_seli8_defconfig		patch \| blob \| history
configs/phycore-imx8mm_defconfig		patch \| blob \| history
configs/phycore-imx8mp_defconfig		patch \| blob \| history
configs/pico-dwarf-imx6ul_defconfig		patch \| blob \| history
configs/pico-dwarf-imx7d_defconfig		patch \| blob \| history
configs/pico-hobbit-imx6ul_defconfig		patch \| blob \| history
configs/pico-hobbit-imx7d_defconfig		patch \| blob \| history
configs/pico-imx6ul_defconfig		patch \| blob \| history
configs/pico-imx7d_bl33_defconfig		patch \| blob \| history
configs/pico-imx7d_defconfig		patch \| blob \| history
configs/pico-imx8mq_defconfig		patch \| blob \| history
configs/pico-nymph-imx7d_defconfig		patch \| blob \| history
configs/pico-pi-imx6ul_defconfig		patch \| blob \| history
configs/pico-pi-imx7d_defconfig		patch \| blob \| history
configs/riotboard_defconfig		patch \| blob \| history
configs/udoo_neo_defconfig		patch \| blob \| history
configs/usbarmory_defconfig		patch \| blob \| history
configs/verdin-imx8mm_defconfig		patch \| blob \| history
configs/vf610twr_defconfig		patch \| blob \| history
configs/vf610twr_nand_defconfig		patch \| blob \| history
configs/vining_2000_defconfig		patch \| blob \| history
configs/warp7_bl33_defconfig		patch \| blob \| history
configs/warp7_defconfig		patch \| blob \| history
configs/warp_defconfig		patch \| blob \| history
drivers/i2c/Kconfig		patch \| blob \| history
drivers/i2c/mxc_i2c.c		patch \| blob \| history
include/configs/apalis_imx6.h		patch \| blob \| history
include/configs/cl-som-imx7.h		patch \| blob \| history
include/configs/cm_fx6.h		patch \| blob \| history
include/configs/colibri_imx6.h		patch \| blob \| history
include/configs/colibri_imx7.h		patch \| blob \| history
include/configs/dart_6ul.h		patch \| blob \| history
include/configs/el6x_common.h		patch \| blob \| history
include/configs/embestmx6boards.h		patch \| blob \| history
include/configs/flea3.h		patch \| blob \| history
include/configs/gw_ventana.h		patch \| blob \| history
include/configs/imx8mq_evk.h		patch \| blob \| history
include/configs/imx8mq_phanbell.h		patch \| blob \| history
include/configs/kp_imx53.h		patch \| blob \| history
include/configs/ls1021aiot.h		patch \| blob \| history
include/configs/ls1021aqds.h		patch \| blob \| history
include/configs/ls1021atsn.h		patch \| blob \| history
include/configs/ls1021atwr.h		patch \| blob \| history
include/configs/ls1043a_common.h		patch \| blob \| history
include/configs/ls1046a_common.h		patch \| blob \| history
include/configs/ls1088ardb.h		patch \| blob \| history
include/configs/m53menlo.h		patch \| blob \| history
include/configs/mx53loco.h		patch \| blob \| history
include/configs/mx6sabreauto.h		patch \| blob \| history
include/configs/mx6sabresd.h		patch \| blob \| history
include/configs/mx6slevk.h		patch \| blob \| history
include/configs/mx6sllevk.h		patch \| blob \| history
include/configs/mx6sxsabreauto.h		patch \| blob \| history
include/configs/mx6sxsabresd.h		patch \| blob \| history
include/configs/mx6ul_14x14_evk.h		patch \| blob \| history
include/configs/mx6ullevk.h		patch \| blob \| history
include/configs/mx7dsabresd.h		patch \| blob \| history
include/configs/nitrogen6x.h		patch \| blob \| history
include/configs/novena.h		patch \| blob \| history
include/configs/pcl063_ull.h		patch \| blob \| history
include/configs/pico-imx6ul.h		patch \| blob \| history
include/configs/pico-imx7d.h		patch \| blob \| history
include/configs/pico-imx8mq.h		patch \| blob \| history
include/configs/udoo_neo.h		patch \| blob \| history
include/configs/usbarmory.h		patch \| blob \| history
include/configs/vf610twr.h		patch \| blob \| history
include/configs/vining_2000.h		patch \| blob \| history
include/configs/warp.h		patch \| blob \| history
include/configs/warp7.h		patch \| blob \| history
include/configs/xpress.h		patch \| blob \| history