Message ID | 20210209115245.47288-3-igor.opaniuk@gmail.com |
---|---|
State | Accepted |
Commit | a907dce88e462251d96be9cdd72900543e4798df |
Delegated to: | Heiko Schocher |
Headers | show |
Series | Allow disabling driver model for I2C in SPL | expand |
On Tue, Feb 09, 2021 at 01:52:44PM +0200, Igor Opaniuk wrote: > From: Igor Opaniuk <igor.opaniuk@foundries.io> > > Drop CONFIG_DM_I2C undefs from board header files, and make them > disabled on these boards in defconfigs instead. > > Disabling on Kconfig symbol was done automatically with this script: > > cd configs > files=(*ls1046a*) > files2=(*T104*RDB*) > files3=(ls1021atwr_*) > files4=("imx8mp_evk_defconfig phycore-imx8mp_defconfig") > combine=("${files[@]}" "${files2[@]}" "${files3[@]}" "${files4[@]}") > cd .. > > for item in ${combine[*]} > do > echo "Adjusting $item" > echo "# CONFIG_SPL_DM_I2C is not set" >> configs/$item > make $item && make savedefconfig && cp defconfig configs/$item > done > > Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io> Reviewed-by: Tom Rini <trini@konsulko.com>
Hello Igor, On 09.02.21 12:52, Igor Opaniuk wrote: > From: Igor Opaniuk <igor.opaniuk@foundries.io> > > Drop CONFIG_DM_I2C undefs from board header files, and make them > disabled on these boards in defconfigs instead. > > Disabling on Kconfig symbol was done automatically with this script: > > cd configs > files=(*ls1046a*) > files2=(*T104*RDB*) > files3=(ls1021atwr_*) > files4=("imx8mp_evk_defconfig phycore-imx8mp_defconfig") > combine=("${files[@]}" "${files2[@]}" "${files3[@]}" "${files4[@]}") > cd .. > > for item in ${combine[*]} > do > echo "Adjusting $item" > echo "# CONFIG_SPL_DM_I2C is not set" >> configs/$item > make $item && make savedefconfig && cp defconfig configs/$item > done > > Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io> > --- > > Changes in v3: > - Drop CONFIG_DM_I2C undefs from board header files (instead of > replacing them with another undef for CONFIG_SPL_DM_I2C), and make them > disabled on these boards in defconfigs. > > configs/imx8mp_evk_defconfig | 1 + > configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + > configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 + > configs/phycore-imx8mp_defconfig | 1 + > include/configs/T104xRDB.h | 1 - > include/configs/imx8mp_evk.h | 1 - > include/configs/ls1021atwr.h | 1 - > include/configs/ls1046a_common.h | 1 - > include/configs/phycore_imx8mp.h | 1 - > 9 files changed, 4 insertions(+), 5 deletions(-) Applied to u-boot-i2c.git master Thanks! bye, Heiko
diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index e70c430616..47a52eedb9 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -69,6 +69,7 @@ CONFIG_CLK_IMX8MP=y CONFIG_MXC_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y +# CONFIG_SPL_DM_I2C is not set CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index e51dab0788..bce548d59c 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -52,6 +52,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SPL_DM=y CONFIG_DM_I2C=y +# CONFIG_SPL_DM_I2C is not set CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig index 0a2c71f919..21a144afe2 100644 --- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig @@ -50,6 +50,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SPL_DM=y CONFIG_DM_I2C=y +# CONFIG_SPL_DM_I2C is not set CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index 3d662e8b48..d09841a7f6 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -63,6 +63,7 @@ CONFIG_CLK_COMPOSITE_CCF=y CONFIG_CLK_IMX8MP=y CONFIG_MXC_GPIO=y CONFIG_DM_I2C=y +# CONFIG_SPL_DM_I2C is not set CONFIG_SYS_I2C_MXC=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index aee00a86cf..cf0f982375 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -30,7 +30,6 @@ #define CONFIG_SPL_SKIP_RELOCATE #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE -#undef CONFIG_DM_I2C #endif #define RESET_VECTOR_OFFSET 0x27FFC #define BOOT_PAGE_OFFSET 0x27000 diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 4850b1b934..61a5c6fb79 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -37,7 +37,6 @@ #define CONFIG_POWER_I2C #define CONFIG_POWER_PCA9450 -#undef CONFIG_DM_I2C #define CONFIG_SYS_I2C #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index dfb56437d9..068e744a61 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -442,7 +442,6 @@ #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#undef CONFIG_DM_I2C #else #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 32658cf641..0c32fceec2 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -16,7 +16,6 @@ #define SPL_NO_QSPI #define SPL_NO_USB #define SPL_NO_SATA -#undef CONFIG_DM_I2C #endif #if defined(CONFIG_SPL_BUILD) && \ (defined(CONFIG_NAND_BOOT) || defined(CONFIG_QSPI_BOOT)) diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index 889dd36e6e..0490049850 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -33,7 +33,6 @@ #define CONFIG_POWER_I2C #define CONFIG_POWER_PCA9450 -#undef CONFIG_DM_I2C #define CONFIG_SYS_I2C #endif