diff options
| author | Tom Rini <[email protected]> | 2024-08-13 10:10:29 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-08-13 10:10:29 -0600 |
| commit | 90270e0f71c53cca9c0347ce3baedf26b8ec4cdb (patch) | |
| tree | 04d7399e03c1386f35a4ad5b0584d8388342429a /include | |
| parent | 06dceeba3d4515ccfbe37b8989ee047a7628aee3 (diff) | |
| parent | 72801d9971d09734f17056fd4836604d4ffd275f (diff) | |
Merge tag 'u-boot-imx-master-20240813' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22014
- Convert tqma6q_mba6 to watchdog DM to fix reset.
- Convert tqma6q_mba6 to PMIC and I2C DM.
- Convert tqma6q_mba6 to OF_UPSTREAM.
- Do not print the board name twice on tqma6.
- Enable CMD_ERASEENV for imx8mm/mp Phytec boards.
- Add imx8ulp binman support.
- Fix imx8 build when CONFIG_IMX_BOOTAUX is set.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/tqma6.h | 8 | ||||
| -rw-r--r-- | include/imx8image.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 2da76f15431..b4a06a75c53 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -26,14 +26,6 @@ #define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K -/* I2C Configs */ -#define CFG_I2C_MULTI_BUS - -#if !defined(CONFIG_DM_PMIC) -#define CFG_POWER_PFUZE100_I2C_ADDR 0x08 -#define TQMA6_PFUZE100_I2C_BUS 2 -#endif - /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/imx8image.h b/include/imx8image.h index 32064bfeeb8..85fb642ae39 100644 --- a/include/imx8image.h +++ b/include/imx8image.h @@ -162,6 +162,7 @@ enum imx8image_cmd { enum imx8image_core_type { CFG_CORE_INVALID, CFG_SCU, + CFG_PWR, CFG_M40, CFG_M41, CFG_A35, |