diff options
| author | Tom Rini <[email protected]> | 2023-09-05 09:05:16 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-09-05 09:05:16 -0400 |
| commit | 34056394ce75cfe02effca5e2127e5caab6df043 (patch) | |
| tree | 21d0c5f403042cad35f804203979a3adf517f013 /configs | |
| parent | e7b7dca28f57e9331388550597c0687d3bfaded0 (diff) | |
| parent | a79fca7b44d0dee96e14d31de5869b35b587283c (diff) | |
Merge tag 'u-boot-imx-20230905' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for release
-----------------
- imx9: fix DRAM calculation
- thermal: fixes
- fixed for DM, DH and Gateworks boards
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/17639
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/dh_imx6_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8mm_data_modul_edm_sbc_defconfig | 3 | ||||
| -rw-r--r-- | configs/imx8mm_evk_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8mm_venice_defconfig | 2 | ||||
| -rw-r--r-- | configs/imx8mp_data_modul_edm_sbc_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8mp_dhcom_pdk2_defconfig | 1 | ||||
| -rw-r--r-- | configs/imx8mp_dhcom_pdk3_defconfig | 1 |
7 files changed, 3 insertions, 7 deletions
diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index c1094b4eda9..5ea9e0b2164 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -37,7 +37,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SPL_FIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 -# CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SYS_SPL_MALLOC=y CONFIG_SPL_SPI_LOAD=y diff --git a/configs/imx8mm_data_modul_edm_sbc_defconfig b/configs/imx8mm_data_modul_edm_sbc_defconfig index f63eb4fd64c..7e8fb844415 100644 --- a/configs/imx8mm_data_modul_edm_sbc_defconfig +++ b/configs/imx8mm_data_modul_edm_sbc_defconfig @@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_NR_DRAM_BANKS=1 +CONFIG_NR_DRAM_BANKS=2 CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xFFFC0000 @@ -157,7 +157,6 @@ CONFIG_SPL_CLK_COMPOSITE_CCF=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_SPL_CLK_IMX8MM=y CONFIG_CLK_IMX8MM=y -CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DFU_TFTP=y CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig index ac9810fe1b7..822c2fbfab7 100644 --- a/configs/imx8mm_evk_defconfig +++ b/configs/imx8mm_evk_defconfig @@ -104,6 +104,7 @@ CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_PSCI=y CONFIG_SYSRESET_WATCHDOG=y CONFIG_DM_THERMAL=y +CONFIG_IMX_TMU=y CONFIG_USB=y CONFIG_SPL_USB_HOST=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig index a485910a529..4fba8eb2438 100644 --- a/configs/imx8mm_venice_defconfig +++ b/configs/imx8mm_venice_defconfig @@ -75,7 +75,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIST="imx8mm-venice imx8mm-venice-gw71xx-0x imx8mm-venice-gw72xx-0x imx8mm-venice-gw73xx-0x imx8mm-venice-gw7901 imx8mm-venice-gw7902 imx8mm-venice-gw7903" +CONFIG_OF_LIST="imx8mm-venice imx8mm-venice-gw71xx-0x imx8mm-venice-gw72xx-0x imx8mm-venice-gw73xx-0x imx8mm-venice-gw7901 imx8mm-venice-gw7902 imx8mm-venice-gw7903 imx8mm-venice-gw7904" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_MMC_ENV_DEV=2 diff --git a/configs/imx8mp_data_modul_edm_sbc_defconfig b/configs/imx8mp_data_modul_edm_sbc_defconfig index 2ff577f2d8a..8b9d4b6c089 100644 --- a/configs/imx8mp_data_modul_edm_sbc_defconfig +++ b/configs/imx8mp_data_modul_edm_sbc_defconfig @@ -164,7 +164,6 @@ CONFIG_SPL_CLK_COMPOSITE_CCF=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_SPL_CLK_IMX8MP=y CONFIG_CLK_IMX8MP=y -CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DFU_TFTP=y CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y diff --git a/configs/imx8mp_dhcom_pdk2_defconfig b/configs/imx8mp_dhcom_pdk2_defconfig index 14ac499e587..a920ffe09bf 100644 --- a/configs/imx8mp_dhcom_pdk2_defconfig +++ b/configs/imx8mp_dhcom_pdk2_defconfig @@ -160,7 +160,6 @@ CONFIG_SPL_CLK_COMPOSITE_CCF=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_SPL_CLK_IMX8MP=y CONFIG_CLK_IMX8MP=y -CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DFU_TFTP=y CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y diff --git a/configs/imx8mp_dhcom_pdk3_defconfig b/configs/imx8mp_dhcom_pdk3_defconfig index 3b26f315bba..9463456798e 100644 --- a/configs/imx8mp_dhcom_pdk3_defconfig +++ b/configs/imx8mp_dhcom_pdk3_defconfig @@ -161,7 +161,6 @@ CONFIG_SPL_CLK_COMPOSITE_CCF=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_SPL_CLK_IMX8MP=y CONFIG_CLK_IMX8MP=y -CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DFU_TFTP=y CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y |