From: Baikal Electronics <support@baikalelectronics.ru>
Date: Thu, 19 Oct 2023 12:58:45 +0000 (+0300)
Subject: merge with testing_upstream
X-Git-Tag: baikal/mips/sdk6.2~2^2
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=5f41b8258b2b2e6a4de4f8a89b9c4e5e248bcdac;p=uboot.git

merge with testing_upstream
---

5f41b8258b2b2e6a4de4f8a89b9c4e5e248bcdac
diff --cc configs/baikal_bfk3_defconfig
index 67fd454255,6e851d9aff..27dfa5f678
--- a/configs/baikal_bfk3_defconfig
+++ b/configs/baikal_bfk3_defconfig
@@@ -114,5 -114,4 +114,6 @@@ CONFIG_SYS_BOOTM_LEN=0x0300000
  CONFIG_SYS_PBSIZE=256
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xBBF90000
 +CONFIG_SYSINFO=y
 +CONFIG_BAIKAL_SMBIOS=y
+ CONFIG_CMD_NFS=y