From: Zhang Ying-22455 ying.zhang22455@nxp.com
Some CONFIG options that are not supported on SPL must be disabled because one .config is shared between SPL and U-Boot proper going forward.
Such as CONFIG_I2C_DM is not supported in SPL at this time, so we can only add a option CONFIG_I2C_DM in the image without SPL.
After supporting the option CONFIG_SPL_I2C_DM in the future, we can enable CONFIG_I2C_DM in all the image.
Signed-off-by: Zhang Ying-22455 ying.zhang22455@nxp.com --- configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 3 +++ configs/ls1088ardb_qspi_defconfig | 3 +++ include/configs/ls1088a_common.h | 2 -- include/configs/ls1088aqds.h | 2 ++ include/configs/ls1088ardb.h | 8 ++++++++ 5 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig index 120527c..3ecd56f 100644 --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig @@ -55,3 +55,6 @@ CONFIG_RSA_SOFTWARE_EXP=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y CONFIG_DM_GPIO=y CONFIG_MPC8XXX_GPIO=y +CONFIG_DM_I2C=y +CONFIG_DM_I2C_COMPAT=y +CONFIG_DM_EEPROM=y diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig index 0517b98..9d32261 100644 --- a/configs/ls1088ardb_qspi_defconfig +++ b/configs/ls1088ardb_qspi_defconfig @@ -53,3 +53,6 @@ CONFIG_USB_GADGET=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y CONFIG_DM_GPIO=y CONFIG_MPC8XXX_GPIO=y +CONFIG_DM_I2C=y +CONFIG_DM_I2C_COMPAT=y +CONFIG_DM_EEPROM=y diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 031c311..6ebae31 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -63,8 +63,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2048 * 1024)
-/* I2C */ -#define CONFIG_SYS_I2C
/* Serial Port */ #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index d2c80fc..a40054c 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -308,6 +308,8 @@ unsigned long get_board_ddr_clk(void);
#define PWM_CHANNEL0 0x0
+#define CONFIG_SYS_I2C + /* * RTC configuration */ diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 36243f9..c7eb3a8 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -263,11 +263,16 @@ * RTC configuration */ #define RTC +#define CONFIG_SYS_RTC_BUS_NUM 0 #define CONFIG_RTC_PCF8563 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x51 /* Channel 3*/ #define CONFIG_CMD_DATE #endif
+#ifdef CONFIG_SD_BOOT +#define CONFIG_SYS_I2C +#endif + /* EEPROM */ #define CONFIG_ID_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID @@ -276,6 +281,9 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 +#define FSL_I2C_EEPROM_DM_NAME "i2c@2300000" +#define CONFIG_I2C_SET_DEFAULT_BUS_NUM +#define CONFIG_I2C_DEFAULT_BUS_NUMBER 0
#ifndef SPL_NO_QSPI /* QSPI device */