From: Tom Rini <trini@konsulko.com>
Date: Mon, 1 Jul 2024 19:17:56 +0000 (-0600)
Subject: Merge branch 'next'
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=65fbdab27224ee3943a89496b21862db83c34da2;p=u-boot.git

Merge branch 'next'
---

65fbdab27224ee3943a89496b21862db83c34da2
diff --cc configs/chromebook_link_defconfig
index 1a72fd178a,a9f91dd9b2..70c57aebab
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@@ -80,5 -78,5 +80,6 @@@ CONFIG_FRAMEBUFFER_VESA_MODE_11A=
  CONFIG_VIDEO_IVYBRIDGE_IGD=y
  CONFIG_CMD_DHRYSTONE=y
  CONFIG_TPM=y
++# CONFIG_SHA256 is not set
  # CONFIG_GZIP is not set
  # CONFIG_EFI_LOADER is not set
diff --cc configs/phycore-imx8mp_defconfig
index afd9cad8d4,7b16e8ef58..57e320af60
--- a/configs/phycore-imx8mp_defconfig
+++ b/configs/phycore-imx8mp_defconfig
@@@ -10,9 -9,10 +10,9 @@@ CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x3C0000
  CONFIG_SYS_I2C_MXC_I2C1=y
  CONFIG_DM_GPIO=y
- CONFIG_DEFAULT_DEVICE_TREE="imx8mp-phyboard-pollux-rdk"
+ CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mp-phyboard-pollux-rdk"
  CONFIG_SPL_TEXT_BASE=0x920000
  CONFIG_TARGET_PHYCORE_IMX8MP=y
 -CONFIG_PHYTEC_SOM_DETECTION=y
  CONFIG_SYS_MONITOR_LEN=524288
  CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y