diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2022-07-21 15:27:35 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2022-07-25 16:12:00 +0200 |
commit | 25ab97986c0f96247e9911f6872f7dbc9c40a12e (patch) | |
tree | 0249524eaf72afb5bd3d9a4cd5dec1d74e950df2 /configs | |
parent | 2f96d4dd95f848c738eb08d7783e495a225191bf (diff) | |
download | u-boot-25ab97986c0f96247e9911f6872f7dbc9c40a12e.tar.gz |
colibri-imx7d/-emmc: synchronise device tree with linux
Synchronise device tree with linux-next next-20220708.
Please note that this also means that instead of the previous "generic"
U-Boot specific carrier board agnostic device trees we are now using the
regular ones for the Colibri Evaluation (carrier) board V3 (e.g.
imx7d-colibri-eval-v3.dtb rather than the previous
imx7-colibri-rawnand.dtb and imx7d-colibri-emmc-eval-v3.dtb rather than
the previous imx7-colibri-emmc.dtb).
Please further note that the PMIC node name got changed from rn5t567@33
to pmic@33 which required adjustment in resp. board file
board/toradex/colibri_imx7/colibri_imx7.c.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'configs')
-rw-r--r-- | configs/colibri_imx7_defconfig | 2 | ||||
-rw-r--r-- | configs/colibri_imx7_emmc_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 15dae6b3db9..fbc660eb4e9 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -5,7 +5,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x380000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand" +CONFIG_DEFAULT_DEVICE_TREE="imx7d-colibri-eval-v3" CONFIG_TARGET_COLIBRI_IMX7=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig index 361077ee84e..ea1aa4c3a64 100644 --- a/configs/colibri_imx7_emmc_defconfig +++ b/configs/colibri_imx7_emmc_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFDE00 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-emmc" +CONFIG_DEFAULT_DEVICE_TREE="imx7d-colibri-emmc-eval-v3" CONFIG_TARGET_COLIBRI_IMX7=y CONFIG_TARGET_COLIBRI_IMX7_EMMC=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y |